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

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / util / ModellingTool.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
index f3b9424..58a86ea 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java
@@ -1,66 +1,111 @@
 package net.mograsim.logic.model.util;
 
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.wires.ModelWire;
 import net.mograsim.logic.model.model.wires.Pin;
-import net.mograsim.logic.model.model.wires.WireCrossPoint;
+import net.mograsim.logic.model.model.wires.ModelWireCrossPoint;
 
 public class ModellingTool
 {
-       private ViewModelModifiable model;
+       private LogicModelModifiable model;
 
-       ModellingTool(ViewModelModifiable model)
+       ModellingTool(LogicModelModifiable model)
        {
                this.model = model;
        }
 
-       public GUIWire connect(GUIComponent a, GUIComponent b, String pinA, String pinB)
+       public ModelWire connect(ModelComponent a, ModelComponent b, String pinA, String pinB)
        {
-               return connect(a.getPin(pinA), b.getPin(pinB));
+               return connect(null, a, b, pinA, pinB);
        }
 
-       public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB)
+       public ModelWire connect(ModelWireCrossPoint a, ModelComponent b, String pinB)
        {
-               return connect(a.getPin(), b.getPin(pinB));
+               return connect(null, a, b, pinB);
        }
 
-       public GUIWire connect(Pin a, GUIComponent b, String pinB)
+       public ModelWire connect(Pin a, ModelComponent b, String pinB)
        {
-               return connect(a, b.getPin(pinB));
+               return connect(null, a, b, pinB);
        }
 
-       public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA)
+       public ModelWire connect(ModelComponent a, ModelWireCrossPoint b, String pinA)
        {
-               return connect(a.getPin(pinA), b.getPin());
+               return connect(null, a, b, pinA);
        }
 
-       public GUIWire connect(WireCrossPoint a, WireCrossPoint b)
+       public ModelWire connect(ModelWireCrossPoint a, ModelWireCrossPoint b)
        {
-               return connect(a.getPin(), b.getPin());
+               return connect(null, a, b);
        }
 
-       public GUIWire connect(Pin a, WireCrossPoint b)
+       public ModelWire connect(Pin a, ModelWireCrossPoint b)
        {
-               return connect(a, b.getPin());
+               return connect(null, a, b);
        }
 
-       public GUIWire connect(GUIComponent a, Pin b, String pinA)
+       public ModelWire connect(ModelComponent a, Pin b, String pinA)
        {
-               return connect(a.getPin(pinA), b);
+               return connect(null, a, b, pinA);
        }
 
-       public GUIWire connect(WireCrossPoint a, Pin b)
+       public ModelWire connect(ModelWireCrossPoint a, Pin b)
        {
-               return connect(a.getPin(), b);
+               return connect(null, a, b);
        }
 
-       public GUIWire connect(Pin a, Pin b)
+       public ModelWire connect(Pin a, Pin b)
        {
-               return new GUIWire(model, a, b);
+               return connect(null, a, b);
        }
 
-       public static ModellingTool createFor(ViewModelModifiable model)
+       public ModelWire connect(String name, ModelComponent a, ModelComponent b, String pinA, String pinB)
+       {
+               return connect(name, a.getPin(pinA), b.getPin(pinB));
+       }
+
+       public ModelWire connect(String name, ModelWireCrossPoint a, ModelComponent b, String pinB)
+       {
+               return connect(name, a.getPin(), b.getPin(pinB));
+       }
+
+       public ModelWire connect(String name, Pin a, ModelComponent b, String pinB)
+       {
+               return connect(name, a, b.getPin(pinB));
+       }
+
+       public ModelWire connect(String name, ModelComponent a, ModelWireCrossPoint b, String pinA)
+       {
+               return connect(name, a.getPin(pinA), b.getPin());
+       }
+
+       public ModelWire connect(String name, ModelWireCrossPoint a, ModelWireCrossPoint b)
+       {
+               return connect(name, a.getPin(), b.getPin());
+       }
+
+       public ModelWire connect(String name, Pin a, ModelWireCrossPoint b)
+       {
+               return connect(name, a, b.getPin());
+       }
+
+       public ModelWire connect(String name, ModelComponent a, Pin b, String pinA)
+       {
+               return connect(name, a.getPin(pinA), b);
+       }
+
+       public ModelWire connect(String name, ModelWireCrossPoint a, Pin b)
+       {
+               return connect(name, a.getPin(), b);
+       }
+
+       public ModelWire connect(String name, Pin a, Pin b)
+       {
+               return new ModelWire(model, name, a, b);
+       }
+
+       public static ModellingTool createFor(LogicModelModifiable model)
        {
                return new ModellingTool(model);
        }