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=b94e3e190f44595019e31094b02ccedceba0ea97;hp=f4a2eca47480c07806dc30d82a2d6bd7b86964b4;hpb=806d306e9c0b422dd7f19e08f5c3d09215f6365d;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..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
@@ -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
 {
@@ -40,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;
@@ -54,13 +53,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)
 		{
-			new Editor((DeserializedSubmodelComponent) SubmodelComponentDeserializer
-					.create(new ViewModelModifiable(), result[0]));
+			new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
 		}
 	}
 }