Made formatting uniform - commit for logicui

[Mograsim.git] / LogicUI / src / era / mi / gui / components / GUIMerger.java

diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java
index cc23ceb..1bf8c80 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -13,10 +13,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIMerger extends Merger implements BasicGUIComponent\r
 {\r
-       private final int                               inputCount;\r
-       private final double                    height;\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final int inputCount;\r
+       private final double height;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIMerger(WireArray union, WireArray... inputs)\r
        {\r
@@ -31,7 +31,7 @@ public class GUIMerger extends Merger implements BasicGUIComponent
                {\r
                        connectedWireArraysModifiable.addAll(Arrays.asList(inputs));\r
                        double inputHeight = 0;\r
-                       for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                       for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                                wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
@@ -47,11 +47,12 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, height);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
                double inputHeight = 0;\r
-               for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+               for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
                        gc.drawLine(0, inputHeight, 10, inputHeight);\r
                gc.drawLine(10, 0, 10, height);\r
                gc.drawLine(10, height / 2, 20, height / 2);\r
@@ -62,11 +63,13 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r