Made get/setHighLevelState ordering uniform: get... comes before set...

[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 8db85a1..0e9be47 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,5 +1,7 @@
 package net.mograsim.logic.model.serializing;
 
+import java.util.Map;
+
 import com.google.gson.JsonElement;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
@@ -11,6 +13,7 @@ import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.snippets.HighLevelStateHandler;
 import net.mograsim.logic.model.snippets.Renderer;
 
+//TODO serialize handlers
 public class DeserializedSubmodelComponent extends SubmodelComponent
 {
        /**
@@ -31,7 +34,8 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
        private Renderer symbolRenderer;
        private HighLevelStateHandler highLevelStateHandler;
 
-       public DeserializedSubmodelComponent(ViewModelModifiable model, String name, String idForSerializingOverride, JsonElement paramsForSerializingOverride)
+       public DeserializedSubmodelComponent(ViewModelModifiable model, String name, String idForSerializingOverride,
+                       JsonElement paramsForSerializingOverride)
        {
                super(model, name);
                this.idForSerializingOverride = idForSerializingOverride;
@@ -39,15 +43,15 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
        }
 
        @Override
-       public void setHighLevelState(String stateID, Object newState)
+       public Object getHighLevelState(String stateID)
        {
-               highLevelStateHandler.setHighLevelState(stateID, newState);
+               return highLevelStateHandler.getHighLevelState(stateID);
        }
 
        @Override
-       public Object getHighLevelState(String stateID)
+       public void setHighLevelState(String stateID, Object newState)
        {
-               return highLevelStateHandler.getHighLevelState(stateID);
+               highLevelStateHandler.setHighLevelState(stateID, newState);
        }
 
        @Override
@@ -69,21 +73,42 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
                this.outlineRenderer = outlineRenderer;
        }
 
+       public Renderer getOutlineRenderer()
+       {
+               return outlineRenderer;
+       }
+
        public void setSymbolRenderer(Renderer symbolRenderer)
        {
                this.symbolRenderer = symbolRenderer;
        }
 
+       public Renderer getSymbolRenderer()
+       {
+               return symbolRenderer;
+       }
+
        public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
        {
                this.highLevelStateHandler = highLevelStateHandler;
        }
 
+       public HighLevelStateHandler getHighLevelStateHandler()
+       {
+               return highLevelStateHandler;
+       }
+
        public ViewModelModifiable getSubmodelModifiable()
        {
                return submodelModifiable;
        }
 
+       @Override
+       public double getSubmodelScale()
+       {
+               return super.getSubmodelScale();
+       }
+
        @Override
        public void setSubmodelScale(double submodelScale)
        {
@@ -96,11 +121,23 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
                super.setSize(width, height);
        }
 
+       @Override
+       public Map<String, MovablePin> getSubmodelMovablePins()
+       {
+               return super.getSubmodelMovablePins();
+       }
+
        @Override
        public Pin addSubmodelInterface(MovablePin supermodelPin)
        {
                return super.addSubmodelInterface(supermodelPin);
        }
 
+       @Override
+       public void removeSubmodelInterface(String name)
+       {
+               super.removeSubmodelInterface(name);
+       }
+
        // TODO static initializer
 }
\ No newline at end of file