Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / serializing / IndirectGUIComponentCreator.java

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 6513f3d..2b747b2 100644 (file)
--- 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
@@ -3,11 +3,9 @@ package net.mograsim.logic.model.serializing;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
@@ -20,13 +18,13 @@ import net.mograsim.logic.model.util.JsonHandler;
 public class IndirectGUIComponentCreator
 {
        private static final Map<String, String> standardComponentIDs = new HashMap<>();
-       private static final Set<String> standardComponentIDSetUnmodifiable = Collections.unmodifiableSet(standardComponentIDs.keySet());
+       private static final Map<String, String> standardComponentIDsUnmodifiable = Collections.unmodifiableMap(standardComponentIDs);
 
        private static final Map<String, ComponentSupplier> componentSuppliers = new HashMap<>();
 
        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");
@@ -57,9 +55,9 @@ public class IndirectGUIComponentCreator
                standardComponentIDs.put(standardComponentID, associatedComponentID);
        }
 
-       public static Collection<String> getStandardComponentIDs()
+       public static Map<String, String> getStandardComponentIDs()
        {
-               return standardComponentIDSetUnmodifiable;
+               return standardComponentIDsUnmodifiable;
        }
 
        public static void setComponentSupplier(String className, ComponentSupplier componentSupplier)
@@ -86,35 +84,42 @@ public class IndirectGUIComponentCreator
        {
                if (id != null)
                {
-                       String resolvedID;
-                       if (id.startsWith("class:") || id.startsWith("file:"))
-                               resolvedID = id;
-                       else
-                               resolvedID = standardComponentIDs.get(id);
-                       if (resolvedID.startsWith("class:"))
+                       String resolvedID = resolveID(id);
+                       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);
        }
 
+       public static String resolveID(String id)
+       {
+               if (id.startsWith("class:") || id.startsWith("file:"))
+                       return id;
+               return standardComponentIDs.get(id);
+       }
+
        private static void tryLoadComponentClass(String componentClassName)
        {
                CodeSnippetSupplier.tryInvokeStaticInitializer(componentClassName, "Error loading component class %s: %s\n");