Made formatting uniform - commit for logicui

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

diff --git a/LogicUI/src/era/mi/gui/LogicUI.java b/LogicUI/src/era/mi/gui/LogicUI.java
index 42b07d3..ac14c23 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUI.java
+++ b/LogicUI/src/era/mi/gui/LogicUI.java
@@ -29,12 +29,12 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInpu
  */\r
 public class LogicUI\r
 {\r
-       private final Display                                           display;\r
-       private final Shell                                                     shell;\r
-       private final ZoomableCanvas                            canvas;\r
-       private final Set<BasicGUIComponent>            components;\r
-       private final Map<BasicGUIComponent, Point>     componentPositions;\r
-       private final Set<GUIWire>                                      wires;\r
+       private final Display display;\r
+       private final Shell shell;\r
+       private final ZoomableCanvas canvas;\r
+       private final Set<BasicGUIComponent> components;\r
+       private final Map<BasicGUIComponent, Point> componentPositions;\r
+       private final Set<GUIWire> wires;\r
 \r
        public LogicUI()\r
        {\r
@@ -56,9 +56,9 @@ public class LogicUI
                new ZoomableCanvasOverlay(canvas, null).enableScale();\r
                canvas.addListener(SWT.MouseDown, this::mouseDown);\r
        }\r
+\r
        /**\r
-        * Add a component to be drawn.\r
-        * Returns the given component for convenience.\r
+        * Add a component to be drawn. Returns the given component for convenience.\r
         * \r
         * @author Daniel Kirschten\r
         */\r
@@ -68,31 +68,36 @@ public class LogicUI
                componentPositions.put(component, new Point(x, y));\r
                return component;\r
        }\r
+\r
        /**\r
-        * Add a graphical wire between the given connection points of the given components.\r
-        * The given components have to be added and the given connection points have to be connected logically first.\r
+        * Add a graphical wire between the given connection points of the given components. The given components have to be added and the given\r
+        * connection points have to be connected logically first.\r
         * \r
         * @author Daniel Kirschten\r
         */\r
-       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2, int component2ConnectionIndex, Point... path)\r
+       public void addWire(BasicGUIComponent component1, int component1ConnectionIndex, BasicGUIComponent component2,\r
+                       int component2ConnectionIndex, Point... path)\r
        {\r
-               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1), component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
+               wires.add(new GUIWire(canvas::redrawThreadsafe, component1, component1ConnectionIndex, componentPositions.get(component1),\r
+                               component2, component2ConnectionIndex, componentPositions.get(component2), path));\r
        }\r
+\r
        private void drawComponent(GeneralGC gc, BasicGUIComponent component)\r
        {\r
                TranslatedGC tgc = new TranslatedGC(gc, componentPositions.get(component));\r
                component.render(tgc);\r
                tgc.setBackground(display.getSystemColor(SWT.COLOR_BLUE));\r
        }\r
+\r
        private void mouseDown(Event e)\r
        {\r
-               if(e.button == 1)\r
+               if (e.button == 1)\r
                {\r
                        Point click = canvas.displayToWorldCoords(e.x, e.y);\r
-                       for(BasicGUIComponent component : components)\r
-                               if(component.getBounds().translate(componentPositions.get(component)).contains(click))\r
+                       for (BasicGUIComponent component : components)\r
+                               if (component.getBounds().translate(componentPositions.get(component)).contains(click))\r
                                {\r
-                                       if(component.clicked(click.x, click.y))\r
+                                       if (component.clicked(click.x, click.y))\r
                                                canvas.redraw();\r
                                        break;\r
                                }\r
@@ -100,41 +105,42 @@ public class LogicUI
        }\r
 \r
        /**\r
-        * Start the simulation timeline, and open the UI shell.\r
-        * Returns when the shell is closed.\r
+        * Start the simulation timeline, and open the UI shell. Returns when the shell is closed.\r
         */\r
        public void run()\r
        {\r
                AtomicBoolean running = new AtomicBoolean(true);\r
                Thread simulationThread = new Thread(() ->\r
                {\r
-                       while(running.get())\r
+                       while (running.get())\r
                        {\r
-                               //always execute to keep timeline from "hanging behind" for too long\r
+                               // always execute to keep timeline from "hanging behind" for too long\r
                                Simulation.TIMELINE.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);\r
                                long sleepTime;\r
-                               if(Simulation.TIMELINE.hasNext())\r
+                               if (Simulation.TIMELINE.hasNext())\r
                                        sleepTime = Simulation.TIMELINE.nextEventTime() - System.currentTimeMillis();\r
                                else\r
                                        sleepTime = 10;\r
                                try\r
                                {\r
-                                       if(sleepTime > 0)\r
+                                       if (sleepTime > 0)\r
                                                Thread.sleep(sleepTime);\r
-                               } catch(InterruptedException e)\r
-                               {} //it is normal execution flow to be interrupted\r
+                               }\r
+                               catch (InterruptedException e)\r
+                               {\r
+                               } // it is normal execution flow to be interrupted\r
                        }\r
                });\r
                simulationThread.start();\r
                Simulation.TIMELINE.addEventAddedListener(event ->\r
                {\r
-                       if(event.getTiming() <= System.currentTimeMillis())\r
+                       if (event.getTiming() <= System.currentTimeMillis())\r
                                simulationThread.interrupt();\r
                });\r
 \r
                shell.open();\r
-               while(!shell.isDisposed())\r
-                       if(!display.readAndDispatch())\r
+               while (!shell.isDisposed())\r
+                       if (!display.readAndDispatch())\r
                                display.sleep();\r
                running.set(false);\r
                simulationThread.interrupt();\r