Browse Source

move PseudoCodeNode back

Eren Yilmaz 6 years ago
parent
commit
0c78735105

+ 2 - 1
doc/chapter/2architecture.tex

@@ -184,7 +184,8 @@ This works the following:
 \begin{figure}[htp]
     \centering
     \includegraphics[width=\linewidth,trim=0 11cm 0 0,clip]{img/animation_and_bk.pdf}
-    \caption{Class diagram of the packages \code{bk} and \code{animation}.}
+    \caption{Class diagram of the packages \code{bk} and \code{animation}.
+    For better readability the class \code{PseudoCodeNode} has been omitted.}
     \label{fig:animation_and_bk}
 \end{figure}
 

BIN
doc/img/view.pdf


BIN
doc/vpp/animation_and_bk.vpp


BIN
doc/vpp/view.vpp


+ 0 - 1
src/animation/AlgorithmStage.java

@@ -3,7 +3,6 @@ package animation;
 import javax.swing.JTree;
 
 import bk.BlockCalc;
-import view.PseudoCodeNode;
 
 /**
  * Represents a specific stage of the algorithm.

+ 0 - 1
src/animation/AnimatedAlgorithm.java

@@ -8,7 +8,6 @@ import javax.swing.JTree;
 import javax.swing.SwingUtilities;
 
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 public abstract class AnimatedAlgorithm extends Thread implements AlgorithmStage {
 

+ 1 - 3
src/view/PseudoCodeNode.java → src/animation/PseudoCodeNode.java

@@ -1,12 +1,10 @@
-package view;
+package animation;
 
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 
-import animation.AnimationController;
-
 /**
  * represents a line of pseudocode
  * @author kolja

+ 1 - 1
src/bk/BKNodePlacement.java

@@ -7,8 +7,8 @@ import javax.swing.JTree;
 
 import animation.AnimatedAlgorithm;
 import animation.AnimationController;
+import animation.PseudoCodeNode;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 /**
  * The main stage of the BK node placement algorithm.

+ 1 - 1
src/bk/BlockCalc.java

@@ -8,10 +8,10 @@ import javax.swing.JTree;
 
 import animation.AlgorithmStage;
 import animation.BackwardAction;
+import animation.PseudoCodeNode;
 import bk.ExtremalLayoutCalc.LayoutType;
 import graph.LayeredGraphEdge;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 /**
  * The stage of the BK node placement algorithm where the blocks are computed.

+ 1 - 1
src/bk/Combine.java

@@ -8,9 +8,9 @@ import javax.swing.JTree;
 
 import animation.AlgorithmStage;
 import animation.BackwardAction;
+import animation.PseudoCodeNode;
 import bk.ExtremalLayoutCalc.LayoutType;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 /**
  * The stage of the combination of the four extremal layouts.

+ 1 - 1
src/bk/Compaction.java

@@ -6,9 +6,9 @@ import javax.swing.JTree;
 
 import animation.AlgorithmStage;
 import animation.BackwardAction;
+import animation.PseudoCodeNode;
 import bk.ExtremalLayoutCalc.LayoutType;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 /**
  * The stage of compacting the layout.

+ 1 - 1
src/bk/ConflictDetection.java

@@ -6,9 +6,9 @@ import javax.swing.JTree;
 
 import animation.AlgorithmStage;
 import animation.BackwardAction;
+import animation.PseudoCodeNode;
 import graph.LayeredGraphEdge;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 public class ConflictDetection implements AlgorithmStage {
 

+ 1 - 1
src/bk/ExtremalLayoutCalc.java

@@ -5,8 +5,8 @@ import java.lang.reflect.InvocationTargetException;
 import javax.swing.JTree;
 
 import animation.AlgorithmStage;
+import animation.PseudoCodeNode;
 import graph.LayeredGraphNode;
-import view.PseudoCodeNode;
 
 /**
  * The stage where the for extremal layouts are computed.

+ 1 - 0
src/view/MainView.java

@@ -39,6 +39,7 @@ import org.eclipse.elk.graph.ElkNode;
 
 import animation.Action;
 import animation.AnimationController;
+import animation.PseudoCodeNode;
 import bk.BKNodePlacement;
 import bk.ExtremalLayoutCalc.LayoutType;
 import graph.InitializeNodePositions;

+ 2 - 0
src/view/PseudoCodeRenderer.java

@@ -10,6 +10,8 @@ import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.TreeNode;
 
+import animation.PseudoCodeNode;
+
 /**
  * A tree-like display of pseudocode.
  * Extends {@link DefaultTreeCellRenderer}