X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FIndirectGUIComponentCreator.java;h=090ca86d6888651e9292daaea9c550293e97da7f;hb=026db85f46b6ea58e765ecff069545728eebdcac;hp=f97b9019dcd596a9d4da4476d0c88dce8db67031;hpb=3977f16649531ca3ba345c9cd5ec365e0b804783;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
index f97b9019..090ca86d 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
@@ -25,7 +25,7 @@ public class IndirectGUIComponentCreator
 
 	static
 	{
-		try (InputStream s = IndirectGUIComponentCreator.class.getResourceAsStream("./standardComponentIDMapping.json"))
+		try (InputStream s = IndirectGUIComponentCreator.class.getResourceAsStream("standardComponentIDMapping.json"))
 		{
 			if (s == null)
 				throw new IOException("Resource not found");
@@ -90,25 +90,29 @@ public class IndirectGUIComponentCreator
 				resolvedID = id;
 			else
 				resolvedID = standardComponentIDs.get(id);
-			if (resolvedID.startsWith("class:"))
+			if (resolvedID != null)
 			{
-				String className = resolvedID.substring(6);
-				tryLoadComponentClass(className);
-				ComponentSupplier componentSupplier = componentSuppliers.get(className);
-				if (componentSupplier != null)
-					return componentSupplier.create(model, params, name);
-			} else
-			// we know id has to start with "file:" here
-			// because standardComponentIDs only contains strings starting with "class:" or "file:"
-			if (params != null && !JsonNull.INSTANCE.equals(params))
-				throw new IllegalArgumentException("Can't give params to a component deserialized from a JSON file");
-			try
-			{
-				return SubmodelComponentSerializer.deserialize(model, resolvedID.substring(5), name, id, null);
-			}
-			catch (IOException e)
-			{
-				throw new UncheckedIOException(e);
+				if (resolvedID.startsWith("class:"))
+				{
+					String className = resolvedID.substring(6);
+					tryLoadComponentClass(className);
+					ComponentSupplier componentSupplier = componentSuppliers.get(className);
+					if (componentSupplier != null)
+						return componentSupplier.create(model, params, name);
+					throw new IllegalArgumentException("Component supplier not found for ID " + id + " (resolved: " + resolvedID + ")");
+				} else
+				// we know id has to start with "file:" here
+				// because standardComponentIDs only contains strings starting with "class:" or "file:"
+				if (params != null && !JsonNull.INSTANCE.equals(params))
+					throw new IllegalArgumentException("Can't give params to a component deserialized from a JSON file");
+				try
+				{
+					return SubmodelComponentSerializer.deserialize(model, resolvedID.substring(5), name, id, null);
+				}
+				catch (IOException e)
+				{
+					throw new UncheckedIOException(e);
+				}
 			}
 		}
 		throw new RuntimeException("Could not get component supplier for ID " + id);