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=96aad40a98b02baae493becb6b73dff74d4cdfb0;hpb=f6f8d801593a0a4a108334247eebef302d636e9f;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 96aad40a..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,6 +1,8 @@
 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;
@@ -8,7 +10,11 @@ import org.eclipse.swt.widgets.Shell;
 
 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
 {
@@ -47,12 +53,19 @@ 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);
+			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)
 		{
@@ -62,6 +75,18 @@ 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
 	{
 		Shell fdShell = new Shell();
@@ -72,7 +97,8 @@ public class SaveLoadManager
 		fdShell.dispose();
 		if (result != null)
 		{
-			new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result));
+			new Editor((DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(new ViewModelModifiable(),
+					"file:" + result));
 		}
 	}
 }