X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2Fhandles%2FComponentHandle.java;h=63d922aee2d0493e891df6db8075c7cb3856dc42;hb=3a52b6bffe52db5dd5ca907b4b3dfd368a58e14f;hp=8712ca6ea73b40390c0c49d3c825a7cf3667faa4;hpb=8604106a28c3de0b93e46b406a74dc3611e7bca5;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java index 8712ca6e..63d922ae 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java @@ -10,19 +10,19 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.Editor.ComponentInfo; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.model.LogicModelModifiable; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.serializing.IdentifyParams; public class ComponentHandle extends Handle { - private final ViewModelModifiable model; - public final GUIComponent parent; + private final LogicModelModifiable model; + public final ModelComponent parent; private final static double POS_OFFSET = 2.0d; private final static double LENGTH_OFFSET = POS_OFFSET * 2; boolean selected = false; - public ComponentHandle(ViewModelModifiable model, GUIComponent parent) + public ComponentHandle(LogicModelModifiable model, ModelComponent parent) { super(4); this.model = model; @@ -90,7 +90,7 @@ public class ComponentHandle extends Handle public Optional reqCopy(Point refPoint) { return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, Editor.getIdentifier(parent), - parent.getParamsForSerializingJSON(new IdentifierGetter()))); + parent.getParamsForSerializingJSON(new IdentifyParams()))); } @Override