Made finding the ID of a JsonSerializable less ugly

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
index 9611967..84e9fdb 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
@@ -1,6 +1,8 @@
 package net.mograsim.logic.model.serializing;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Comparator;
 
 import com.google.gson.JsonElement;
 
@@ -24,11 +26,9 @@ import net.mograsim.logic.model.util.Version;
  */
 public final class SubmodelComponentSerializer
 {
-       // TODO serialize pin usage
-       // TODO set pin usages of existing components
-       public static final Version JSON_VERSION_CURRENT_SERIALIZING = Version.parseSemver("0.1.4");
+       public static final Version JSON_VERSION_CURRENT_SERIALIZING = Version.parseSemver("0.1.5");
        public static final Version JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING = Version.parseSemver("0.1.5");
-       public static final Version JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED = Version.parseSemver("0.1.4");
+       public static final Version JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED = Version.parseSemver("0.1.5");
        // convenience methods
 
        /**
@@ -129,9 +129,9 @@ public final class SubmodelComponentSerializer
         * 
         * @author Daniel Kirschten
         */
-       public static void serialize(SubmodelComponent comp, IdentifierGetter idGetter, String targetPath) throws IOException
+       public static void serialize(SubmodelComponent comp, IdentifyParams idParams, String targetPath) throws IOException
        {
-               JsonHandler.writeJson(serialize(comp, idGetter), targetPath);
+               JsonHandler.writeJson(serialize(comp, idParams), targetPath);
        }
 
        /**
@@ -142,7 +142,7 @@ public final class SubmodelComponentSerializer
         */
        public static SubmodelComponentParams serialize(SubmodelComponent comp)
        {
-               return serialize(comp, new IdentifierGetter());
+               return serialize(comp, new IdentifyParams());
        }
 
        // "core" methods
@@ -165,12 +165,13 @@ public final class SubmodelComponentSerializer
                Version version = params.version;
                if (version.compareTo(JSON_VERSION_LATEST_SUPPORTED_DESERIALIZING) > 0)
                        throw new IllegalArgumentException("JSON version " + version + " not supported yet");
-               boolean hasUsageSerialized = version.compareTo(JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED) > 0;
+               boolean hasUsageSerialized = version.compareTo(JSON_VERSION_EARLIEST_WITH_USAGE_SERIALIZED) >= 0;
                DeserializedSubmodelComponent comp = new DeserializedSubmodelComponent(model, name, idForSerializingOverride,
                                paramsForSerializingOverride);
                comp.setSubmodelScale(params.innerScale);
                comp.setSize(params.width, params.height);
                for (InterfacePinParams iPinParams : params.interfacePins)
+                       // TRISTATE because we don't have a better choice
                        comp.addSubmodelInterface(new MovablePin(comp, iPinParams.name, iPinParams.logicWidth,
                                        hasUsageSerialized ? iPinParams.usage : PinUsage.TRISTATE, iPinParams.location.x, iPinParams.location.y));
                ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable();
@@ -194,11 +195,11 @@ public final class SubmodelComponentSerializer
         * @author Fabian Stemmler
         * @author Daniel Kirschten
         */
-       public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifierGetter idGetter)
+       public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifyParams idParams)
        {
                SubmodelComponentParams params = new SubmodelComponentParams(JSON_VERSION_CURRENT_SERIALIZING);
                params.innerScale = comp.getSubmodelScale();
-               params.submodel = ViewModelSerializer.serialize(comp.submodel, idGetter);
+               params.submodel = ViewModelSerializer.serialize(comp.submodel, idParams);
 
                params.width = comp.getWidth();
                params.height = comp.getHeight();
@@ -212,29 +213,31 @@ public final class SubmodelComponentSerializer
                        iPinParams.location = p.getRelPos();
                        iPinParams.name = p.name;
                        iPinParams.logicWidth = p.logicWidth;
+                       iPinParams.usage = p.usage;
                        i++;
                }
                params.interfacePins = iPins;
+               Arrays.sort(params.interfacePins, Comparator.comparing(p -> p.name));
 
                Renderer symbolRenderer = comp.getSymbolRenderer();
                if (symbolRenderer != null)
                {
-                       params.symbolRendererSnippetID = idGetter.symbolRendererIDs.apply(symbolRenderer);
-                       params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idGetter);
+                       params.symbolRendererSnippetID = symbolRenderer.getIDForSerializing(idParams);
+                       params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idParams);
                }
 
                Renderer outlineRenderer = comp.getOutlineRenderer();
                if (outlineRenderer != null)
                {
-                       params.outlineRendererSnippetID = idGetter.outlineRendererIDs.apply(outlineRenderer);
-                       params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idGetter);
+                       params.outlineRendererSnippetID = outlineRenderer.getIDForSerializing(idParams);
+                       params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idParams);
                }
 
                HighLevelStateHandler highLevelStateHandler = comp.getHighLevelStateHandler();
                if (highLevelStateHandler != null)
                {
-                       params.highLevelStateHandlerSnippetID = idGetter.highLevelStateHandlerIDs.apply(highLevelStateHandler);
-                       params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idGetter);
+                       params.highLevelStateHandlerSnippetID = highLevelStateHandler.getIDForSerializing(idParams);
+                       params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idParams);
                }
 
                return params;