Removed ConnectionPoint causing confusion

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

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
index 8f21aa4..de61a8d 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
@@ -2,8 +2,9 @@ package net.mograsim.logic.ui.util;
 \r
 import net.mograsim.logic.ui.model.ViewModelModifiable;\r
 import net.mograsim.logic.ui.model.components.GUIComponent;\r
-import net.mograsim.logic.ui.model.wires.ConnectionPoint;\r
 import net.mograsim.logic.ui.model.wires.GUIWire;\r
+import net.mograsim.logic.ui.model.wires.Pin;\r
+import net.mograsim.logic.ui.model.wires.WireCrossPoint;\r
 \r
 public class ModellingTool\r
 {\r
@@ -19,12 +20,42 @@ public class ModellingTool
                return connect(a.getPin(pinA), b.getPin(pinB));\r
        }\r
 \r
-       public GUIWire connect(ConnectionPoint a, GUIComponent b, String pinB)\r
+       public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB)\r
+       {\r
+               return connect(a.getPin(), b.getPin(pinB));\r
+       }\r
+\r
+       public GUIWire connect(Pin a, GUIComponent b, String pinB)\r
        {\r
                return connect(a, b.getPin(pinB));\r
        }\r
 \r
-       public GUIWire connect(ConnectionPoint a, ConnectionPoint b)\r
+       public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA)\r
+       {\r
+               return connect(a.getPin(pinA), b.getPin());\r
+       }\r
+\r
+       public GUIWire connect(WireCrossPoint a, WireCrossPoint b)\r
+       {\r
+               return connect(a.getPin(), b.getPin());\r
+       }\r
+\r
+       public GUIWire connect(Pin a, WireCrossPoint b)\r
+       {\r
+               return connect(a, b.getPin());\r
+       }\r
+\r
+       public GUIWire connect(GUIComponent a, Pin b, String pinA)\r
+       {\r
+               return connect(a.getPin(pinA), b);\r
+       }\r
+\r
+       public GUIWire connect(WireCrossPoint a, Pin b)\r
+       {\r
+               return connect(a.getPin(), b);\r
+       }\r
+\r
+       public GUIWire connect(Pin a, Pin b)\r
        {\r
                return new GUIWire(model, a, b);\r
        }\r