Merge pull request #22 from jackoson/master

fixed propagate bug

Author: jackoson

src/com/modsim/Main.java

@@ -36,6 +36,7 @@ public void run() {
 				ui.showUI(true);
 
 				// Start sim ticking - sim is initialized below *before* this is called
+				sim.newSim();
 				sim.start();
 			}
 		});

src/com/modsim/modules/SplitMerge.java

@@ -81,10 +81,10 @@ public SplitMerge() {
 
         parts.add(new SSText(A-10, 24, "DCBA", 7, Colors.labelText));
         parts.add(new SSText(B-10, 24, "XXDC", 7, Colors.labelText));
-        parts.add(new SSText(a+10, -24, "XXBA", -7, Colors.labelText));
-        parts.add(new SSText(b+10, -24, "XXXB", -7, Colors.labelText));
-        parts.add(new SSText(c+10, -24, "XXDC", -7, Colors.labelText));
-        parts.add(new SSText(d+10, -24, "XXXD", -7, Colors.labelText));
+        parts.add(new SSText(a+10, -24, "ABXX", -7, Colors.labelText));
+        parts.add(new SSText(b+10, -24, "BXXX", -7, Colors.labelText));
+        parts.add(new SSText(c+10, -24, "CDXX", -7, Colors.labelText));
+        parts.add(new SSText(d+10, -24, "DXXX", -7, Colors.labelText));
 
     }
 

src/com/modsim/simulator/Sim.java

@@ -107,7 +107,7 @@ public void newSim() {
             filePath = "";
             Main.ui.updateTitle();
         }
-        propagationQueue = new LinkedList<QueueItem>();
+		propagationQueue = new LinkedList<QueueItem>();
         Main.ui.view.flagStaticRedraw();
     }