X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FDeserializedSubmodelComponent.java;h=33f00e15716a7146ac81ba8218bfbdeb39cc834e;hb=92862c4723c5eff22257e8de06166a124efb5d77;hp=8d0016cc7be6bc5b113b1c5e2f5cabfbd3b84e19;hpb=020445ceb5c54ee5ff384a7e6b529ee350575b12;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 8d0016cc..33f00e15 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,7 +2,7 @@ package net.mograsim.logic.model.serializing; import com.google.gson.JsonElement; -import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.model.LogicModelModifiable; 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; @@ -15,7 +15,7 @@ public class DeserializedSubmodelComponent extends SubmodelComponent * 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) + * @see SubmodelComponentSerializer#deserialize(LogicModelModifiable, SubmodelComponentParams, String, String, JsonElement) * SubmodelComponentSerializer.deserialize(...) * @see SubmodelComponentSerializer#serialize(SubmodelComponent, java.util.function.Function) SubmodelComponentSerializer.serialize(...) */ @@ -25,12 +25,13 @@ public class DeserializedSubmodelComponent extends SubmodelComponent */ public final JsonElement paramsForSerializingOverride; - public DeserializedSubmodelComponent(ViewModelModifiable model, String name, String idForSerializingOverride, + public DeserializedSubmodelComponent(LogicModelModifiable model, String name, String idForSerializingOverride, JsonElement paramsForSerializingOverride) { - super(model, name); + super(model, name, false); this.idForSerializingOverride = idForSerializingOverride; this.paramsForSerializingOverride = paramsForSerializingOverride; + init(); } @Override @@ -43,7 +44,6 @@ public class DeserializedSubmodelComponent extends SubmodelComponent public void setOutlineRenderer(Renderer outlineRenderer) { super.setOutlineRenderer(outlineRenderer); - requestRedraw(); } @Override @@ -52,7 +52,7 @@ public class DeserializedSubmodelComponent extends SubmodelComponent super.setHighLevelStateHandler(handler); } - public ViewModelModifiable getSubmodelModifiable() + public LogicModelModifiable getSubmodelModifiable() { return submodelModifiable; } @@ -80,13 +80,4 @@ public class DeserializedSubmodelComponent extends SubmodelComponent { super.removeSubmodelInterface(name); } - - // TODO only used in EditorCanvas. Replace with setting maxVisibleRegionFillRatioForAlpha0 / min...1. - @Override - public Renderer getOutlineRenderer() - { - return super.getOutlineRenderer(); - } - - // TODO static initializer? } \ No newline at end of file