Change JSON location

Author: edominia

org.sofproject.gst.topo/META-INF/MANIFEST.MF

@@ -15,3 +15,4 @@ Bundle-ClassPath: lib/jackson-annotations-2.10.1.jar,
  lib/jackson-databind-2.10.1.jar,
  .
 Export-Package: org.sofproject.gst.json
+Import-Package: org.eclipse.ui

org.sofproject.gst.topo/src/org/sofproject/gst/json/JsonCustomOptionPane.java

@@ -29,9 +29,6 @@
 
 package org.sofproject.gst.json;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 
 import org.eclipse.core.runtime.CoreException;
@@ -51,9 +48,6 @@
 import org.eclipse.swt.widgets.Text;
 import org.sofproject.topo.ui.graph.ITopoGraph;
 import org.sofproject.gst.json.JsonUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.sofproject.gst.topo.model.GstTopoGraph;
 
 public class JsonCustomOptionPane {
 

org.sofproject.gst.topo/src/org/sofproject/gst/json/JsonUtils.java

@@ -33,16 +33,33 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Paths;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class JsonUtils {
 
 	public void serializeJson(JsonProperty jsonProperty, String pipelineString) throws CoreException, IOException {
 		try {
-			File file = new File(jsonProperty.getName() + ".json");
+			String projectPath = getProjectPath();
+			File file;
+			if (projectPath != null) {
+				String path = Paths.get(projectPath, jsonProperty.getName(), jsonProperty.getVersion()).toString();
+				new File(path).mkdirs();
+				file = new File(Paths.get(path, "pipeline.json").toString());
+			} else {
+				file = new File(jsonProperty.getName() + ".json");
+			}
 			jsonProperty.setTemplate(pipelineString);
 			BufferedWriter writer = new BufferedWriter(new FileWriter(file));
 			ObjectMapper obj = new ObjectMapper();
@@ -54,4 +71,27 @@ public void serializeJson(JsonProperty jsonProperty, String pipelineString) thro
 		}
 	}
 
+	public String getProjectPath() {
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		IWorkbenchPage activePage = window.getActivePage();
+
+		IEditorPart activeEditor = activePage.getActiveEditor();
+
+		if (activeEditor != null) {
+			IEditorInput input = activeEditor.getEditorInput();
+
+			IProject project = input.getAdapter(IProject.class);
+			if (project == null) {
+				IResource resource = input.getAdapter(IResource.class);
+				if (resource != null) {
+					project = resource.getProject();
+					IPath path = project.getLocation();
+					return path.toString();
+				}
+			}
+		}
+
+		return null;
+	}
+
 }

org.sofproject.gst.topo/src/org/sofproject/gst/topo/model/GstTopoGraph.java

@@ -51,7 +51,6 @@
 import org.eclipse.jface.window.Window;
 import org.sofproject.core.binfile.BinFile;
 import org.sofproject.core.ops.IRemoteOpsProvider;
-import org.sofproject.gst.json.JsonProperty;
 import org.sofproject.gst.topo.ops.GstGraphOpsProvider;
 import org.sofproject.gst.topo.plugins.GstElement;
 import org.sofproject.gst.topo.plugins.GstPlugin;
@@ -62,8 +61,6 @@
 import org.sofproject.topo.ui.graph.ITopoGraph;
 import org.sofproject.topo.ui.graph.ITopoNode;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class GstTopoGraph implements ITopoGraph {
 
 	public static final String[] NODE_TYPE_IDS = { "org.sofproject.gst.topo.element" };

org.sofproject.topo.ui/src/org/sofproject/topo/ui/editor/policies/TopoEditorOnClickHandler.java

@@ -29,7 +29,6 @@
 
 package org.sofproject.topo.ui.editor.policies;
 
-import java.awt.Frame;
 import java.io.IOException;
 
 import org.eclipse.core.runtime.CoreException;
@@ -131,18 +130,15 @@ public void handle(ActionEvent event) {
 					}
 				});
 				menu.getItems().add(miSerialize);
-				
 				MenuItem miSerializeJson = new MenuItem("Serialize Topology to Json");
 				miSerializeJson.setOnAction(new EventHandler<ActionEvent>() {
 					@Override
 					public void handle(ActionEvent event) {
-						
 						menu.hide();
 						new JsonCustomOptionPane(Display.getCurrent(), getGraphFromHost());
 					}
 				});
 				menu.getItems().add(miSerializeJson);
-				
 				menu.show(((InfiniteCanvasViewer) viewer).getScene().getWindow(), e.getScreenX(), e.getScreenY());
 			}
 		}