From bffb2558641e2986e57801a5983276e5c34d8fb1 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Wed, 28 Aug 2019 18:08:24 +0200
Subject: [PATCH] Fixed Editor duplication of deserialized components

---
 .../src/net/mograsim/logic/model/editor/Editor.java        | 4 +++-
 .../net/mograsim/logic/model/editor/SaveLoadManager.java   | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

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..e2dee42c 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
@@ -175,7 +175,9 @@ public final class Editor
 
 	public static String getIdentifier(GUIComponent c)
 	{
-		return identifierPerComponent.get(c);
+		if (identifierPerComponent.containsKey(c))
+			return identifierPerComponent.get(c);
+		return "class:" + c.getClass().getCanonicalName();
 	}
 
 	public void duplicate()
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 6d951aff..412313e9 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
@@ -54,12 +54,7 @@ public class SaveLoadManager
 		try
 		{
 			IdentifierGetter idGetter = new IdentifierGetter();
-			idGetter.componentIDs = c ->
-			{
-				if (Editor.identifierPerComponent.containsKey(c))
-					return Editor.identifierPerComponent.get(c);
-				return getStandardID(c, IndirectGUIComponentCreator.getStandardComponentIDs(), true);
-			};
+			idGetter.componentIDs = c -> getStandardID(c, IndirectGUIComponentCreator.getStandardComponentIDs(), true);
 			idGetter.symbolRendererIDs = h -> getStandardID(h,
 					SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getStandardSnippetIDs());
 			idGetter.outlineRendererIDs = h -> getStandardID(h,
-- 
2.17.1