Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[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 848227b..bbe202b 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
@@ -2,11 +2,14 @@ package net.mograsim.logic.model.editor;
 
 import java.io.IOException;
 
-import net.mograsim.logic.model.editor.DialogManager.InteractiveDialog;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Shell;
+
+import net.mograsim.logic.model.model.LogicModelModifiable;
 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.IndirectModelComponentCreator;
+import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
 
 public class SaveLoadManager
 {
@@ -28,12 +31,15 @@ public class SaveLoadManager
 
        public void openSaveAsDialog()
        {
-               InteractiveDialog d = new InteractiveDialog("Save as...", "Save", "Cancel", "Path");
-               d.open();
-               
-               if(InteractiveDialog.InteractiveDialogState.ACCEPTED.equals(d.getState()))
+               Shell fdShell = new Shell();
+               FileDialog fd = new FileDialog(fdShell, SWT.SAVE);
+               fd.setText("Save as...");
+               fd.setFilterExtensions(new String[] { "*.json" });
+               String result = fd.open();
+               fdShell.dispose();
+               if (result != null)
                {
-                       savePath = d.getText();
+                       savePath = result;
                        innerSave();
                }
        }
@@ -42,13 +48,9 @@ public class SaveLoadManager
        {
                try
                {
-                       JsonHandler.writeJson(editor.toBeEdited.calculateParams(c ->
-                       {
-                               if (Editor.identifierPerComponent.containsKey(c))
-                                       return Editor.identifierPerComponent.get(c);
-                               return "class:" + c.getClass().getCanonicalName();
-                       }), savePath);
-               } catch (IOException e)
+                       SubmodelComponentSerializer.serialize(editor.toBeEdited, savePath);
+               }
+               catch (IOException e)
                {
                        savePath = null;
                        System.err.println("Failed to save component!");
@@ -56,14 +58,18 @@ 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()))
+               Shell fdShell = new Shell();
+               FileDialog fd = new FileDialog(fdShell, SWT.OPEN);
+               fd.setText("Load component...");
+               fd.setFilterExtensions(new String[] { "*.json" });
+               String result = fd.open();
+               fdShell.dispose();
+               if (result != null)
                {
-                       new Editor((DeserializedSubmodelComponent) SubmodelComponentDeserializer
-                                       .create(new ViewModelModifiable(), load.getText()));
+                       new Editor((DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(new LogicModelModifiable(),
+                                       "jsonfile:" + result));
                }
        }
 }