X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2FEditor.java;h=c0a504aff2499fa88ad2ea61ce791790d0a08ff6;hb=95a225aed8eae0fc080440dba779abfdf867ff3d;hp=e3279150e4710f780cebd3302fa066f1698c07f3;hpb=f9eeb6f0746ed17665fdeafefb5b7e11afd22278;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
index e3279150..c0a504af 100644
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
@@ -13,6 +13,7 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.model.am2900.Am2900Loader;
 import net.mograsim.logic.model.editor.handles.ComponentHandle;
 import net.mograsim.logic.model.editor.handles.Handle;
 import net.mograsim.logic.model.editor.handles.HandleManager;
@@ -24,6 +25,7 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.GUIWire;
 import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 
 public final class Editor
@@ -175,7 +177,9 @@ public final class Editor
 
 	public static String getIdentifier(GUIComponent c)
 	{
-		return identifierPerComponent.get(c);
+		if (identifierPerComponent.containsKey(c))
+			return identifierPerComponent.get(c);
+		return new IdentifierGetter().componentIDs.apply(c);
 	}
 
 	public void duplicate()
@@ -234,6 +238,7 @@ public final class Editor
 
 	public static void main(String[] args) throws IOException
 	{
+		Am2900Loader.setup();
 		SaveLoadManager.openLoadDialog();
 	}