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=1e3d271535dd5cd187dffbbfc372c623e66d1a2c;hb=500d5825bb557014eed80819f59a58b43ff71b05;hp=5b19d3d639362d0df6152b20426f2e038ca1cd28;hpb=f87464acdb28197031f7235e60ed7de1ac206723;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 5b19d3d6..1e3d2715 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
@@ -1,11 +1,20 @@
 package net.mograsim.logic.model.editor;
 
 import java.io.IOException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Shell;
 
-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.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
+import net.mograsim.logic.model.snippets.SubmodelComponentSnippetSuppliers;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandlerSnippetSuppliers;
 
 public class SaveLoadManager
 {
@@ -27,10 +36,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 +53,21 @@ 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)
+			IdentifierGetter idGetter = new IdentifierGetter();
+			idGetter.componentIDs = c -> getStandardID(c, IndirectGUIComponentCreator.getStandardComponentIDs(), true);
+			idGetter.symbolRendererIDs = h -> getStandardID(h,
+					SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getStandardSnippetIDs());
+			idGetter.outlineRendererIDs = h -> getStandardID(h,
+					SubmodelComponentSnippetSuppliers.outlineRendererSupplier.getStandardSnippetIDs());
+			idGetter.highLevelStateHandlerIDs = h -> getStandardID(h,
+					SubmodelComponentSnippetSuppliers.highLevelStateHandlerSupplier.getStandardSnippetIDs());
+			idGetter.atomicHighLevelStateHandlerIDs = h -> getStandardID(h,
+					StandardHighLevelStateHandlerSnippetSuppliers.atomicHandlerSupplier.getStandardSnippetIDs());
+			idGetter.subcomponentHighLevelStateHandlerIDs = h -> getStandardID(h,
+					StandardHighLevelStateHandlerSnippetSuppliers.subcomponentHandlerSupplier.getStandardSnippetIDs());
+			SubmodelComponentSerializer.serialize(editor.toBeEdited, idGetter, savePath);
+		}
+		catch (IOException e)
 		{
 			savePath = null;
 			System.err.println("Failed to save component!");
@@ -53,12 +75,30 @@ public class SaveLoadManager
 		}
 	}
 
+	private static String getStandardID(Object o, Map<String, String> standardIDs)
+	{
+		return getStandardID(o, standardIDs, false);
+	}
+
+	private static String getStandardID(Object o, Map<String, String> standardIDs, boolean standardIDsHaveClassConcatenated)
+	{
+		String verboseID = (standardIDsHaveClassConcatenated ? "class:" : "") + o.getClass().getCanonicalName();
+		return standardIDs.entrySet().stream().filter(e -> e.getValue().equals(verboseID)).map(Entry::getKey).findAny()
+				.orElseGet(() -> (standardIDsHaveClassConcatenated ? "" : "class:") + verboseID);
+	}
+
 	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) IndirectGUIComponentCreator.createComponent(new ViewModelModifiable(),
+					"file:" + result));
 		}
 	}
 }