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=8281501d46c62cd0d24e5517d7ae6a5629248fb3;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=04b925d13a9a4255146bd9ac5fabd3154ada47f5;hpb=c5c0d07286a29994a11ba8b01eaffb21964b6c1b;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 04b925d1..8281501d 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,17 +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.components.GUIComponent;
+import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 
 public class ComponentHandle extends Handle
 {
-	public final GUIComponent parent;
+	private final ViewModelModifiable 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(GUIComponent parent)
+	public ComponentHandle(ViewModelModifiable model, ModelComponent parent)
 	{
+		super(4);
+		this.model = model;
 		this.parent = parent;
 		Rectangle bounds = parent.getBounds();
 		setSize(bounds.width, bounds.height);
@@ -31,7 +36,7 @@ public class ComponentHandle extends Handle
 		});
 		moveTo(parent.getPosX(), parent.getPosY());
 	}
-	
+
 	@Override
 	protected void moveTo(double x, double y)
 	{
@@ -74,20 +79,20 @@ public class ComponentHandle extends Handle
 		selected = false;
 		callRedrawListeners();
 	}
-	
+
 	@Override
 	public void reqDelete()
 	{
-		parent.destroy();
+		model.destroyComponent(parent);
 	}
 
 	@Override
 	public Optional<ComponentInfo> reqCopy(Point refPoint)
 	{
-		return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
-				Editor.getIdentifier(parent), parent.getParamsForSerializing()));
+		return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, Editor.getIdentifier(parent),
+				parent.getParamsForSerializingJSON(new IdentifyParams())));
 	}
-	
+
 	@Override
 	public HandleType getType()
 	{