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=8712ca6ea73b40390c0c49d3c825a7cf3667faa4;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=b44f1cf04cb48a63e6944ee968f8b2fd3d64c1de;hpb=452b5630f12a4ffa8b15012980f2e6b8469c571b;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 b44f1cf0..8712ca6e 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,22 @@ 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; public class ComponentHandle extends Handle { + private final ViewModelModifiable model; public final GUIComponent parent; private final static double POS_OFFSET = 2.0d; private final static double LENGTH_OFFSET = POS_OFFSET * 2; boolean selected = false; - public ComponentHandle(GUIComponent parent) + public ComponentHandle(ViewModelModifiable model, GUIComponent parent) { super(4); + this.model = model; this.parent = parent; Rectangle bounds = parent.getBounds(); setSize(bounds.width, bounds.height); @@ -80,14 +83,14 @@ public class ComponentHandle extends Handle @Override public void reqDelete() { - parent.destroy(); + model.destroyComponent(parent); } @Override public Optional reqCopy(Point refPoint) { return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, Editor.getIdentifier(parent), - parent.getParamsForSerializing(new IdentifierGetter()))); + parent.getParamsForSerializingJSON(new IdentifierGetter()))); } @Override