restructure packages

src/bk/BKNodePlacement.java

@@ -2,12 +2,12 @@ package bk;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
-import codelines.DeclareVariable;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.Comment;
-import codelines.SetVariable;
+import codeline.CodeLine;
+import codeline.DeclareVariable;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.Comment;
+import codeline.SetVariable;
 import graph.LayeredGraphNode;
 import lib.TextLayoutHelper;
 import processor.ControlFlow;

src/bk/Balancing.java

@@ -7,14 +7,14 @@ import java.util.List;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
-import codelines.Comment;
-import codelines.DeclareVariable;
-import codelines.ForEachLoop;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.IfLoop;
-import codelines.SetVariable;
+import codeline.CodeLine;
+import codeline.Comment;
+import codeline.DeclareVariable;
+import codeline.ForEachLoop;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.IfLoop;
+import codeline.SetVariable;
 import graph.LayeredGraphNode;
 import processor.ControlFlow;
 import processor.Memory;

src/bk/ConflictDetection.java

@@ -5,17 +5,17 @@ import java.util.List;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
 import bk.LayoutType;
-import codelines.DeclareVariable;
-import codelines.ForEachLoop;
-import codelines.ForLoop;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.IfLoop;
-import codelines.Comment;
-import codelines.SetVariable;
-import codelines.WhileLoop;
+import codeline.CodeLine;
+import codeline.Comment;
+import codeline.DeclareVariable;
+import codeline.ForEachLoop;
+import codeline.ForLoop;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.IfLoop;
+import codeline.SetVariable;
+import codeline.WhileLoop;
 import graph.LayeredGraphEdge;
 import graph.LayeredGraphNode;
 import lib.TextLayoutHelper;

src/bk/HorizontalCompaction.java

@@ -5,13 +5,13 @@ import java.util.List;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
-import codelines.AbstractForLoop;
-import codelines.DeclareVariable;
-import codelines.ForEachLoop;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.IfLoop;
+import codeline.AbstractForLoop;
+import codeline.CodeLine;
+import codeline.DeclareVariable;
+import codeline.ForEachLoop;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.IfLoop;
 import graph.LayeredGraphNode;
 import processor.ControlFlow;
 import processor.Memory;

src/bk/PlaceBlock.java

@@ -2,13 +2,13 @@ package bk;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
-import codelines.DeclareVariable;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.IfLoop;
-import codelines.SetVariable;
-import codelines.WhileLoop;
+import codeline.CodeLine;
+import codeline.DeclareVariable;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.IfLoop;
+import codeline.SetVariable;
+import codeline.WhileLoop;
 import graph.LayeredGraphNode;
 import graph.LayeredNode;
 import processor.ControlFlow;

src/bk/VerticalAligment.java

@@ -5,14 +5,14 @@ import java.util.List;
 
 import javax.swing.JTree;
 
-import algorithm.CodeLine;
-import codelines.AbstractForLoop;
-import codelines.DeclareVariable;
-import codelines.ForEachLoop;
-import codelines.FunctionCall;
-import codelines.FunctionDefinition;
-import codelines.IfLoop;
-import codelines.SetVariable;
+import codeline.AbstractForLoop;
+import codeline.CodeLine;
+import codeline.DeclareVariable;
+import codeline.ForEachLoop;
+import codeline.FunctionCall;
+import codeline.FunctionDefinition;
+import codeline.IfLoop;
+import codeline.SetVariable;
 import graph.LayeredGraphEdge;
 import graph.LayeredGraphNode;
 import processor.ControlFlow;

src/codelines/AbstractForLoop.java → src/codeline/AbstractForLoop.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/algorithm/CodeLine.java → src/codeline/CodeLine.java

@@ -1,4 +1,4 @@
-package algorithm;
+package codeline;
 
 import java.util.Stack;
 

src/codelines/Comment.java → src/codeline/Comment.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 

src/codelines/DeclareVariable.java → src/codeline/DeclareVariable.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.Memory.ReadOnlyMemory;

src/codelines/ForEachLoop.java → src/codeline/ForEachLoop.java

@@ -1,8 +1,7 @@
-package codelines;
+package codeline;
 
 import java.util.List;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/codelines/ForLoop.java → src/codeline/ForLoop.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/codelines/FunctionCall.java → src/codeline/FunctionCall.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.PseudoCodeNode;

src/codelines/FunctionDefinition.java → src/codeline/FunctionDefinition.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/codelines/IfLoop.java → src/codeline/IfLoop.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/codelines/SetVariable.java → src/codeline/SetVariable.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.Memory.ReadOnlyMemory;

src/codelines/WhileLoop.java → src/codeline/WhileLoop.java

@@ -1,6 +1,5 @@
-package codelines;
+package codeline;
 
-import algorithm.CodeLine;
 import processor.ControlFlow;
 import processor.Memory;
 import processor.StackFrame;

src/algorithm/Action.java → src/processor/Action.java

@@ -1,7 +1,7 @@
-package algorithm;
+package processor;
 
 /**
- * An action some kind of command that can be send to the {@link Algorithm} from the {@link AnimationController}.
+ * An action some kind of command that can be send to the {@link Algorithm} from the {@link ProcessController}.
  * {@code FORWARD} tells the {@link Algorithm} to perform one more step in the layout process.
  * {@code BACKWARD} tells the {@link Algorithm} to undo the last step in the layout process.
  * 

src/processor/ControlFlow.java

@@ -1,6 +1,6 @@
 package processor;
 
-import algorithm.CodeLine.BackwardAction;
+import codeline.CodeLine.BackwardAction;
 
 public class ControlFlow {
     public static final int STEP_INTO = 0;

src/processor/Memory.java

@@ -34,19 +34,19 @@ public class Memory {
      */
     public class ReadOnlyMemory
     {
-        public <T> T read( String name, Visibility type )
+        public <T> T read( String name, Visibility visibility )
         {
-            return Memory.this.read( name, type );
+            return Memory.this.read( name, visibility );
         }
         
-        public boolean isSomewhereDefined( String name, Visibility type )
+        public boolean isSomewhereDefined( String name, Visibility visibility )
         {
-            return Memory.this.isSomewhereDefined( name, type );
+            return Memory.this.isSomewhereDefined( name, visibility );
         }
         
-        public boolean isDefined( String name, Visibility type )
+        public boolean isDefined( String name, Visibility visibility )
         {
-            return Memory.this.isDefined( name, type );
+            return Memory.this.isDefined( name, visibility );
         }
     }
     

src/algorithm/AnimationController.java → src/processor/ProcessController.java

@@ -1,4 +1,4 @@
-package algorithm;
+package processor;
 
 /**
  * controls the execution of an {@link Algorithm}.
@@ -6,7 +6,7 @@ package algorithm;
  * @author kolja
  *
  */
-public class AnimationController {
+public class ProcessController {
     public static final int DEFAULT_DELAY = 100;
 
     private Action next;
@@ -16,9 +16,9 @@ public class AnimationController {
     private int stepOption;
 
     /**
-     * creates a new {@link AnimationController} that can be used to control an {@link Algorithm}
+     * creates a new {@link ProcessController} that can be used to control an {@link Algorithm}
      */
-    public AnimationController()
+    public ProcessController()
     {
         stepOption = 0;
         next = null;

src/processor/PseudoCodeNode.java

@@ -8,8 +8,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 
-import algorithm.AnimationController;
-import algorithm.CodeLine;
+import codeline.CodeLine;
 import lib.TextLayoutHelper;
 
 /**
@@ -29,7 +28,7 @@ public class PseudoCodeNode extends DefaultMutableTreeNode {
 
     private static int nextNodeId = 0;
     private final int nodeId;
-    private AnimationController controller;
+    private ProcessController controller;
     private JTree tree;
     private CodeLine code;
     private boolean selected;
@@ -53,7 +52,7 @@ public class PseudoCodeNode extends DefaultMutableTreeNode {
         return nodeId;
     }
     
-    public void setController( AnimationController c )
+    public void setController( ProcessController c )
     {
         if( children != null )
         {

src/processor/PseudoCodeProcessor.java

@@ -7,8 +7,8 @@ import java.util.Stack;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
-import algorithm.Action;
-import algorithm.AnimationController;
+import processor.Action;
+import processor.ProcessController;
 import graph.LayeredGraphNode;
 import processor.Memory.Visibility;
 import processor.StackFrame.FrameType;
@@ -30,7 +30,7 @@ public class PseudoCodeProcessor extends Thread {
     private boolean skip = false;
     private boolean renderImage = true;
     private JFrame view;
-    private AnimationController controller;
+    private ProcessController controller;
     
     public PseudoCodeProcessor( PseudoCodeNode start, LayeredGraphNode graph, JFrame view )
     {
@@ -41,11 +41,11 @@ public class PseudoCodeProcessor extends Thread {
         currentDebugOutput = "";
         controlStack = new Stack<>();
         this.graph = graph;
-        controller = new AnimationController();
+        controller = new ProcessController();
         this.view = view;
     }
     
-    public AnimationController getController()
+    public ProcessController getController()
     {
     	return controller;
     }

src/view/MainView.java

@@ -36,8 +36,6 @@ import javax.swing.tree.TreePath;
 
 import org.eclipse.elk.graph.ElkNode;
 
-import algorithm.Action;
-import algorithm.AnimationController;
 import bk.BKNodePlacement;
 import bk.BKNodePlacement.Stage;
 import bk.LayoutType;
@@ -48,6 +46,8 @@ import graph.io.Reader;
 import graph.io.Writer;
 import lib.SimpleNodePlacement;
 import lib.TextLayoutHelper;
+import processor.Action;
+import processor.ProcessController;
 import processor.PseudoCodeNode;
 import processor.PseudoCodeProcessor;
 
@@ -69,7 +69,7 @@ public class MainView {
      */
     private static final RandomGraphDialog randomDialog = new RandomGraphDialog();
     private JFrame frame;
-    private AnimationController controller;
+    private ProcessController controller;
     private JButton stepForward;
     private JButton stepForwardInto;
     private JButton stepForwardOut;
@@ -342,7 +342,7 @@ public class MainView {
         });
         delayText = new JLabel( "Delay (ms)" );
         delayText.setBounds( 260, 10, 80, 20 );
-        delay = new JTextField( String.valueOf(AnimationController.DEFAULT_DELAY) );
+        delay = new JTextField( String.valueOf(ProcessController.DEFAULT_DELAY) );
         delay.setBounds( 260, 30, 90, 20 );
         delay.getDocument().addDocumentListener( new NumberDocumentListener( new NumberDocumentListener.Action() {
             @Override
@@ -392,7 +392,7 @@ public class MainView {
             }
             
         });
-        pseudoTree.setBackground(RenderHelper.BACKGROUND_COLOR);        
+        pseudoTree.setBackground(RenderHelper.BACKGROUND_COLOR);
         tree.setController( controller );
         pseudoTree.setModel( new DefaultTreeModel( tree ) );
         pseudoTree.setCellRenderer( new PseudoCodeRenderer() );