Editor settings updated

[Mograsim.git] / net.mograsim.logic.model.editor / src / net / mograsim / logic / model / editor / SaveLoadManager.java

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 f4a2eca..fa2c8a1 100644 (file)
--- 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]));
                }
        }
 }