X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FDeserializedSubmodelComponent.java;h=b23ab483cd17ceb14b4ea0ca53c43340243bc388;hb=62467eaf4814d04961cca4ec7a88ddc5530a4ac4;hp=8db85a1d3575b612501d7115e5583c9e01a64552;hpb=a3f31d6bf39eb747172a6db329de72c803903c2e;p=Mograsim.git

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 8db85a1d..b23ab483 100644
--- 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
@@ -2,8 +2,6 @@ package net.mograsim.logic.model.serializing;
 
 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;
@@ -27,11 +25,8 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 	 */
 	public final JsonElement paramsForSerializingOverride;
 
-	private Renderer outlineRenderer;
-	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,44 +34,21 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 	}
 
 	@Override
-	public void setHighLevelState(String stateID, Object newState)
-	{
-		highLevelStateHandler.setHighLevelState(stateID, newState);
-	}
-
-	@Override
-	public Object getHighLevelState(String stateID)
-	{
-		return highLevelStateHandler.getHighLevelState(stateID);
-	}
-
-	@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;
-	}
-
-	public void setSymbolRenderer(Renderer symbolRenderer)
-	{
-		this.symbolRenderer = symbolRenderer;
+		super.setOutlineRenderer(outlineRenderer);
 	}
 
-	public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
+	@Override
+	public void setHighLevelStateHandler(HighLevelStateHandler handler)
 	{
-		this.highLevelStateHandler = highLevelStateHandler;
+		super.setHighLevelStateHandler(handler);
 	}
 
 	public ViewModelModifiable getSubmodelModifiable()
@@ -102,5 +74,11 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 		return super.addSubmodelInterface(supermodelPin);
 	}
 
-	// TODO static initializer
+	@Override
+	public void removeSubmodelInterface(String name)
+	{
+		super.removeSubmodelInterface(name);
+	}
+
+	// TODO static initializer?
 }
\ No newline at end of file