Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[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 b44f1cf..14868e9 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
@@ -6,23 +6,26 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
+import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 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.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
 {
-       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(GUIComponent parent)
+       public ComponentHandle(LogicModelModifiable model, ModelComponent parent)
        {
                super(4);
+               this.model = model;
                this.parent = parent;
                Rectangle bounds = parent.getBounds();
                setSize(bounds.width, bounds.height);
@@ -54,6 +57,11 @@ public class ComponentHandle extends Handle
                        bounds.width += LENGTH_OFFSET;
                        bounds.height += LENGTH_OFFSET;
                        gc.drawRectangle(bounds);
+                       Font oldFont = gc.getFont();
+                       gc.setFont(new Font(oldFont.getName(), 5, oldFont.getStyle()));
+                       gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
+                       gc.drawText(parent.getName(), bounds.x, bounds.y, true);
+                       gc.setFont(oldFont);
                }
        }
 
@@ -80,14 +88,15 @@ public class ComponentHandle extends Handle
        @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(new IdentifierGetter())));
+               IdentifyParams idParams = new IdentifyParams();
+               return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
+                               parent.getIDForSerializing(idParams), parent.getParamsForSerializingJSON(idParams)));
        }
 
        @Override