Wires now can have a name

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / wires / Wire.java

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
index 404aacd..6e4e50a 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
@@ -21,18 +21,25 @@ import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
  */\r
 public class Wire\r
 {\r
+       public final String name;\r
        private BitVector values;\r
        public final int travelTime;\r
-       private List<ReadEnd> attached = new ArrayList<ReadEnd>();\r
+       private List<ReadEnd> attached = new ArrayList<>();\r
        public final int length;\r
-       private List<ReadWriteEnd> inputs = new ArrayList<ReadWriteEnd>();\r
-       private Timeline timeline;\r
+       List<ReadWriteEnd> inputs = new ArrayList<>();\r
+       Timeline timeline;\r
 \r
        public Wire(Timeline timeline, int length, int travelTime)\r
+       {\r
+               this(timeline, length, travelTime, null);\r
+       }\r
+\r
+       public Wire(Timeline timeline, int length, int travelTime, String name)\r
        {\r
                if (length < 1)\r
                        throw new IllegalArgumentException(\r
                                        String.format("Tried to create an array of wires with length %d, but a length of less than 1 makes no sense.", length));\r
+               this.name = name;\r
                this.timeline = timeline;\r
                this.length = length;\r
                this.travelTime = travelTime;\r
@@ -61,12 +68,12 @@ public class Wire
        {\r
                if (values.equals(newValues))\r
                        return;\r
-               BitVector oldValues = values;\r
+//             BitVector oldValues = values;\r
                values = newValues;\r
-               notifyObservers(oldValues);\r
+               notifyObservers();\r
        }\r
 \r
-       private void recalculate()\r
+       void recalculate()\r
        {\r
                switch (inputs.size())\r
                {\r
@@ -174,20 +181,19 @@ public class Wire
         * \r
         * @author Fabian Stemmler\r
         */\r
-       private void attachEnd(ReadEnd end)\r
+       void attachEnd(ReadEnd end)\r
        {\r
                attached.add(end);\r
        }\r
 \r
-       private void detachEnd(ReadEnd end)\r
+       void detachEnd(ReadEnd end)\r
        {\r
                attached.remove(end);\r
        }\r
 \r
-       private void notifyObservers(BitVector oldValues)\r
+       private void notifyObservers()\r
        {\r
-               for (ReadEnd o : attached)\r
-                       o.update(oldValues);\r
+               attached.forEach(r -> r.update());\r
        }\r
 \r
        /**\r
@@ -206,7 +212,7 @@ public class Wire
                return new ReadEnd();\r
        }\r
 \r
-       private void registerInput(ReadWriteEnd toRegister)\r
+       void registerInput(ReadWriteEnd toRegister)\r
        {\r
                inputs.add(toRegister);\r
        }\r
@@ -220,15 +226,15 @@ public class Wire
         */\r
        public class ReadEnd implements LogicObservable\r
        {\r
-               private List<LogicObserver> observers = new ArrayList<LogicObserver>();\r
+               private List<LogicObserver> observers = new ArrayList<>();\r
 \r
-               private ReadEnd()\r
+               ReadEnd()\r
                {\r
                        super();\r
                        Wire.this.attachEnd(this);\r
                }\r
 \r
-               public void update(BitVector oldValues)\r
+               public void update()\r
                {\r
                        notifyObservers();\r
                }\r
@@ -345,11 +351,16 @@ public class Wire
                        observers.add(ob);\r
                }\r
 \r
+               @Override\r
+               public void deregisterObserver(LogicObserver ob)\r
+               {\r
+                       observers.remove(ob);\r
+               }\r
+\r
                @Override\r
                public void notifyObservers()\r
                {\r
-                       for (LogicObserver ob : observers)\r
-                               ob.update(this);\r
+                       observers.forEach(ob -> ob.update(this));\r
                }\r
        }\r
 \r
@@ -358,7 +369,7 @@ public class Wire
                private boolean open;\r
                private BitVector inputValues;\r
 \r
-               private ReadWriteEnd()\r
+               ReadWriteEnd()\r
                {\r
                        super();\r
                        open = true;\r
@@ -487,7 +498,8 @@ public class Wire
        @Override\r
        public String toString()\r
        {\r
-               return String.format("wire 0x%08x value: %s inputs: %s", hashCode(), values, inputs);\r
+               String name = this.name == null ? String.format("0x%08x", hashCode()) : this.name;\r
+               return String.format("wire %s value: %s inputs: %s", name, values, inputs);\r
        }\r
 \r
        public static ReadEnd[] extractEnds(Wire[] w)\r