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;
+import com.google.gson.JsonObject;
import net.mograsim.logic.model.model.ViewModelModifiable;
import net.mograsim.logic.model.model.components.GUIComponent;
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");
standardComponentIDs.put(standardComponentID, associatedComponentID);
}
- public static Set<String> getStandardComponentIDs()
+ public static Map<String, String> getStandardComponentIDs()
{
- return standardComponentIDSetUnmodifiable;
+ return standardComponentIDsUnmodifiable;
}
public static void setComponentSupplier(String className, ComponentSupplier componentSupplier)
{
if (id != null)
{
- String resolvedID;
- if (id.startsWith("class:") || id.startsWith("file:"))
- resolvedID = id;
- else
- resolvedID = standardComponentIDs.get(id);
+ String resolvedID = resolveID(id);
if (resolvedID != null)
{
if (resolvedID.startsWith("class:"))
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:"
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);
+ String filename = resolvedID.substring(5);
+ JsonObject jsonContents = JsonHandler.readJson(filename, JsonObject.class);
+ SerializablePojo jsonContentsAsSerializablePojo = JsonHandler.parser.fromJson(jsonContents, SerializablePojo.class);
+ if (jsonContentsAsSerializablePojo.version == null)
+ return LegacySubmodelComponentSerializer.deserialize(model,
+ JsonHandler.parser.fromJson(jsonContents, LegacySubmodelComponentParams.class), name, id, null);
+ return SubmodelComponentSerializer.deserialize(model,
+ JsonHandler.parser.fromJson(jsonContents, SubmodelComponentParams.class), name, id, null);
}
catch (IOException 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");