A proposal for resolving the loading problem of json files

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index adf2433..c52fe29 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
@@ -1,47 +1,54 @@
 package net.mograsim.logic.model.serializing;
 
-import java.util.Map;
+import com.google.gson.JsonElement;
 
-import net.haspamelodica.swt.helper.gcs.GeneralGC;
-import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.serializing.snippets.Renderer;
+import net.mograsim.logic.model.snippets.HighLevelStateHandler;
+import net.mograsim.logic.model.snippets.Renderer;
 
 public class DeserializedSubmodelComponent extends SubmodelComponent
 {
-       public Renderer outlineRenderer;
-       public Renderer symbolRenderer;
+       /**
+        * If a DeserializedSubmodelComponent is part of another SubmodelComponent, when it it serialized, it should not return its internal
+        * structure, but rather the component ID used to create it.
+        * 
+        * @see SubmodelComponentSerializer#deserialize(ViewModelModifiable, SubmodelComponentParams, String, String, JsonElement)
+        *      SubmodelComponentSerializer.deserialize(...)
+        * @see SubmodelComponentSerializer#serialize(SubmodelComponent, java.util.function.Function) SubmodelComponentSerializer.serialize(...)
+        */
+       public final String idForSerializingOverride;
+       /**
+        * See {@link #idForSerializingOverride}
+        */
+       public final JsonElement paramsForSerializingOverride;
 
-       public DeserializedSubmodelComponent(ViewModelModifiable model, String name)
+       public DeserializedSubmodelComponent(ViewModelModifiable model, String name, String idForSerializingOverride,
+                       JsonElement paramsForSerializingOverride)
        {
                super(model, name);
+               this.idForSerializingOverride = idForSerializingOverride;
+               this.paramsForSerializingOverride = paramsForSerializingOverride;
        }
 
        @Override
-       protected void renderOutline(GeneralGC gc, Rectangle visibleRegion)
+       public void setSymbolRenderer(Renderer symbolRenderer)
        {
-               if (outlineRenderer != null)
-                       outlineRenderer.render(gc, visibleRegion);
+               super.setSymbolRenderer(symbolRenderer);
        }
 
        @Override
-       protected void renderSymbol(GeneralGC gc, Rectangle visibleRegion)
-       {
-               if (symbolRenderer != null)
-                       symbolRenderer.render(gc, visibleRegion);
-       }
-
        public void setOutlineRenderer(Renderer outlineRenderer)
        {
-               this.outlineRenderer = outlineRenderer;
+               super.setOutlineRenderer(outlineRenderer);
        }
 
-       public void setSymbolRenderer(Renderer symbolRenderer)
+       @Override
+       public void setHighLevelStateHandler(HighLevelStateHandler handler)
        {
-               this.symbolRenderer = symbolRenderer;
+               super.setHighLevelStateHandler(handler);
        }
 
        public ViewModelModifiable getSubmodelModifiable()
@@ -67,18 +74,6 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
                return super.addSubmodelInterface(supermodelPin);
        }
 
-       @Override
-       public double getSubmodelScale()
-       {
-               return super.getSubmodelScale();
-       }
-
-       @Override
-       public Map<String, MovablePin> getSubmodelMovablePins()
-       {
-               return super.getSubmodelMovablePins();
-       }
-
        @Override
        public void removeSubmodelInterface(String name)
        {