Merge branch 'bugfix' into HEAD

Author: sr14978

src/com/modsim/gui/view/View.java

@@ -130,16 +130,6 @@ public void paintStatic() {
             drawGrid(staticG);
             staticG.setTransform(oldStatic);
 
-            // Draw links
-            staticG.transform(wToV);
-            for (Link l : Main.sim.getLinks()) {
-                if (l == null) {
-                    System.err.println("Warning: Null link encountered while drawing");
-                    continue;
-                }
-                l.draw(staticG);
-            }
-
             // Draw modules - static
             staticG.setTransform(oldStatic);
             for (BaseModule m : Main.sim.getModules()) {
@@ -149,6 +139,16 @@ public void paintStatic() {
                 staticG.setTransform(oldStatic);
             }
 
+            // Draw links
+            staticG.transform(wToV);
+            for (Link l : Main.sim.getLinks()) {
+                if (l == null) {
+                    System.err.println("Warning: Null link encountered while drawing");
+                    continue;
+                }
+                l.draw(staticG);
+            }
+            
             staticG.setTransform(oldStatic);
 
             // Static canvas is now up-to-date