Completely changed the structure and switched to Eclipse Plugin.

[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 a1361b0..86add62 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
@@ -61,7 +61,7 @@ public class Wire
                BitVectorMutator mutator = BitVectorMutator.empty();\r
                for (ReadWriteEnd wireArrayEnd : inputs)\r
                        mutator.join(wireArrayEnd.getInputValues());\r
-               setNewValues(mutator.get());\r
+               setNewValues(mutator.toBitVector());\r
        }\r
 \r
        private void setNewValues(BitVector newValues)\r
@@ -495,7 +495,7 @@ public class Wire
                                        continue;\r
                                mutator.join(wireEnd.inputValues);\r
                        }\r
-                       return mutator.get();\r
+                       return mutator.toBitVector();\r
                }\r
 \r
                @Override\r
@@ -556,7 +556,7 @@ public class Wire
         * @param fromB  The first bit of {@link Wire} b to be fused\r
         * @param length The amount of bits to fuse\r
         */\r
-       private static void fuse(Wire a, Wire b, int fromA, int fromB, int length)\r
+       public static void fuse(Wire a, Wire b, int fromA, int fromB, int length)\r
        {\r
                ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd();\r
                rA.setWriting(false);\r