Move components to an actual resource folder (that will remain in jar)

[Mograsim.git] / net.mograsim.logic.model.editor / src / net / mograsim / logic / model / editor / handles / ComponentHandle.java

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 04b925d..8712ca6 100644 (file)
--- 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.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);
@@ -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 IdentifierGetter())));
        }
-       
+
        @Override
        public HandleType getType()
        {