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 5b19d3d..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,9 +2,13 @@ package net.mograsim.logic.model.editor;
 
 import java.io.IOException;
 
-import net.mograsim.logic.model.editor.ui.DialogManager;
-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.IndirectModelComponentCreator;
 import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
 
 public class SaveLoadManager
@@ -27,10 +31,15 @@ public class SaveLoadManager
 
        public void openSaveAsDialog()
        {
-               String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path");
-               if(result != null)
+               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 = result[0];
+                       savePath = result;
                        innerSave();
                }
        }
@@ -39,13 +48,9 @@ public class SaveLoadManager
        {
                try
                {
-                       SubmodelComponentSerializer.serialize(editor.toBeEdited,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!");
@@ -55,10 +60,16 @@ public class SaveLoadManager
 
        public static void openLoadDialog() throws IOException
        {
-               String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
-               if(result != null)
+               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) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
+                       new Editor((DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(new LogicModelModifiable(),
+                                       "jsonfile:" + result));
                }
        }
 }