X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FDeserializedSubmodelComponent.java;h=c52fe2944abc0ace1f04fde0c8d2b88685a267a8;hb=8e8d5776ccc95a08885789834abd55cc50e18a24;hp=5f7b084f8f63975c4f461ae0bc40b1946416293c;hpb=c5c0d07286a29994a11ba8b01eaffb21964b6c1b;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 5f7b084f..c52fe294 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
@@ -1,11 +1,7 @@
 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;
@@ -13,7 +9,6 @@ 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
 {
 	/**
@@ -30,10 +25,6 @@ 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)
 	{
@@ -43,59 +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;
+		super.setOutlineRenderer(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()
+	@Override
+	public void setHighLevelStateHandler(HighLevelStateHandler handler)
 	{
-		return highLevelStateHandler;
+		super.setHighLevelStateHandler(handler);
 	}
 
 	public ViewModelModifiable getSubmodelModifiable()
@@ -103,12 +56,6 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 		return submodelModifiable;
 	}
 
-	@Override
-	public double getSubmodelScale()
-	{
-		return super.getSubmodelScale();
-	}
-
 	@Override
 	public void setSubmodelScale(double submodelScale)
 	{
@@ -121,12 +68,6 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 		super.setSize(width, height);
 	}
 
-	@Override
-	public Map<String, MovablePin> getSubmodelMovablePins()
-	{
-		return super.getSubmodelMovablePins();
-	}
-
 	@Override
 	public Pin addSubmodelInterface(MovablePin supermodelPin)
 	{
@@ -138,6 +79,4 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 	{
 		super.removeSubmodelInterface(name);
 	}
-
-	// TODO static initializer
 }
\ No newline at end of file