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=fa2c8a1d4bd7510fcc157550d73a6b9fc1e289d6;hb=878d036669f4aa9d0c332ced43da3a08b94655e9;hp=f4a2eca47480c07806dc30d82a2d6bd7b86964b4;hpb=a00663c79d0e26b494ff79eee4b6c049f086c7e0;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 f4a2eca4..fa2c8a1d 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
@@ -5,8 +5,7 @@ import java.io.IOException;
 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
 {
@@ -29,7 +28,7 @@ public class SaveLoadManager
 	public void openSaveAsDialog()
 	{
 		String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path");
-		if(result != null)
+		if (result != null)
 		{
 			savePath = result[0];
 			innerSave();
@@ -40,13 +39,14 @@ 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);
-		} catch (IOException e)
+			}, savePath);
+		}
+		catch (IOException e)
 		{
 			savePath = null;
 			System.err.println("Failed to save component!");
@@ -54,13 +54,12 @@ public class SaveLoadManager
 		}
 	}
 
-	public static void openLoadDialog()
+	public static void openLoadDialog() throws IOException
 	{
 		String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
-		if(result != null)
+		if (result != null)
 		{
-			new Editor((DeserializedSubmodelComponent) SubmodelComponentDeserializer
-					.create(new ViewModelModifiable(), result[0]));
+			new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
 		}
 	}
 }