X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FSaveLoadManager.java;h=5b19d3d639362d0df6152b20426f2e038ca1cd28;hb=9e9a77976efe36de6ae82e74a013cd07a17dd352;hp=1ba1d252bfd4e048a66cbf6bbec677cc263e40ed;hpb=6ff37062ffff3ee3499e15b8d8bf532b4eaa6608;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
index 1ba1d252..5b19d3d6 100644
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
@@ -2,11 +2,10 @@ package net.mograsim.logic.model.editor;
 
 import java.io.IOException;
 
-import net.mograsim.logic.model.editor.ui.DialogManager.InteractiveDialog;
+import net.mograsim.logic.model.editor.ui.DialogManager;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
-import net.mograsim.logic.model.serializing.SubmodelComponentDeserializer;
-import net.mograsim.logic.model.util.JsonHandler;
+import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
 
 public class SaveLoadManager
 {
@@ -28,12 +27,10 @@ public class SaveLoadManager
 
 	public void openSaveAsDialog()
 	{
-		InteractiveDialog d = new InteractiveDialog("Save as...", "Save", "Cancel", "Path");
-		d.open();
-		
-		if(InteractiveDialog.InteractiveDialogState.ACCEPTED.equals(d.getState()))
+		String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path");
+		if(result != null)
 		{
-			savePath = d.getText();
+			savePath = result[0];
 			innerSave();
 		}
 	}
@@ -42,12 +39,12 @@ public class SaveLoadManager
 	{
 		try
 		{
-			JsonHandler.writeJson(editor.toBeEdited.calculateParams(c ->
+			SubmodelComponentSerializer.serialize(editor.toBeEdited,c ->
 			{
 				if (Editor.identifierPerComponent.containsKey(c))
 					return Editor.identifierPerComponent.get(c);
 				return "class:" + c.getClass().getCanonicalName();
-			}), savePath);
+			}, savePath);
 		} catch (IOException e)
 		{
 			savePath = null;
@@ -56,14 +53,12 @@ public class SaveLoadManager
 		}
 	}
 
-	public static void openLoadDialog()
+	public static void openLoadDialog() throws IOException
 	{
-		InteractiveDialog load = new InteractiveDialog("Load Component...", "Load", "Cancel", "Path");
-		load.open();
-		if(InteractiveDialog.InteractiveDialogState.ACCEPTED.equals(load.getState()))
+		String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
+		if(result != null)
 		{
-			new Editor((DeserializedSubmodelComponent) SubmodelComponentDeserializer
-					.create(new ViewModelModifiable(), load.getText()));
+			new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
 		}
 	}
 }