Adjusted LogicUI to new Wire / WireEnd concept

[Mograsim.git] / LogicUI / src / era / mi / gui / examples / RSLatchGUIExample.java

diff --git a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
index e5890d7..df4ff0c 100644 (file)
--- a/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
+++ b/LogicUI/src/era/mi/gui/examples/RSLatchGUIExample.java
@@ -6,7 +6,7 @@ import era.mi.gui.components.GUINotGate;
 import era.mi.gui.components.GUIOrGate;\r
 import era.mi.gui.wires.WireConnectionPoint;\r
 import era.mi.logic.Simulation;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.wires.Wire;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
 \r
 public class RSLatchGUIExample\r
@@ -25,19 +25,19 @@ public class RSLatchGUIExample
        private static void initComponents(LogicUI ui)\r
        {\r
                Simulation.TIMELINE.reset();\r
-               WireArray r = new WireArray(1, WIRE_DELAY);\r
-               WireArray s = new WireArray(1, WIRE_DELAY);\r
-               WireArray t2 = new WireArray(1, WIRE_DELAY);\r
-               WireArray t1 = new WireArray(1, WIRE_DELAY);\r
-               WireArray q = new WireArray(1, WIRE_DELAY);\r
-               WireArray nq = new WireArray(1, WIRE_DELAY);\r
+               Wire r = new Wire(1, WIRE_DELAY);\r
+               Wire s = new Wire(1, WIRE_DELAY);\r
+               Wire t2 = new Wire(1, WIRE_DELAY);\r
+               Wire t1 = new Wire(1, WIRE_DELAY);\r
+               Wire q = new Wire(1, WIRE_DELAY);\r
+               Wire nq = new Wire(1, WIRE_DELAY);\r
 \r
-               GUIManualSwitch rIn = ui.addComponent(new GUIManualSwitch(r), 100, 100);\r
-               GUIManualSwitch sIn = ui.addComponent(new GUIManualSwitch(s), 100, 200);\r
-               GUIOrGate or1 = ui.addComponent(new GUIOrGate(OR_DELAY, t1, r, nq), 160, 102.5);\r
-               GUIOrGate or2 = ui.addComponent(new GUIOrGate(OR_DELAY, t2, q, s), 160, 192.5);\r
-               GUINotGate not1 = ui.addComponent(new GUINotGate(NOT_DELAY, t1, q), 200, 107.5);\r
-               GUINotGate not2 = ui.addComponent(new GUINotGate(NOT_DELAY, t2, nq), 200, 197.5);\r
+               GUIManualSwitch rIn = ui.addComponent(new GUIManualSwitch(r.createEnd()), 100, 100);\r
+               GUIManualSwitch sIn = ui.addComponent(new GUIManualSwitch(s.createEnd()), 100, 200);\r
+               GUIOrGate or1 = ui.addComponent(new GUIOrGate(OR_DELAY, t1.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd()), 160, 102.5);\r
+               GUIOrGate or2 = ui.addComponent(new GUIOrGate(OR_DELAY, t2.createEnd(), q.createReadOnlyEnd(), s.createReadOnlyEnd()), 160, 192.5);\r
+               GUINotGate not1 = ui.addComponent(new GUINotGate(NOT_DELAY, t1.createReadOnlyEnd(), q.createEnd()), 200, 107.5);\r
+               GUINotGate not2 = ui.addComponent(new GUINotGate(NOT_DELAY, t2.createReadOnlyEnd(), nq.createEnd()), 200, 197.5);\r
 \r
                WireConnectionPoint p1 = ui.addComponent(new WireConnectionPoint(q, 3), 250, 112.5);\r
                WireConnectionPoint p2 = ui.addComponent(new WireConnectionPoint(nq, 3), 250, 202.5);\r