Refactors Visualisation->Visualization

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/MainFrame.java

@@ -29,7 +29,7 @@ public class MainFrame extends JFrame {
 	/**
 	 * Panel which visualizes the devices, connections and links
 	 */
-	public final VisualisationPanel panel; 
+	public final VisualizationPanel panel; 
 	/**
 	 * Creates a new Frame for the program, which is the most outer frame of the application
 	 * @param c Controller which handles the user interaction
@@ -54,7 +54,7 @@ public class MainFrame extends JFrame {
 		 * Add Visualization Panel
 		 */
 		//Could be a more complex panel later on (TabbedPanel, ScrollPanel, SplitPanel
-		panel = new VisualisationPanel(controller);
+		panel = new VisualizationPanel(controller);
 		this.setContentPane(panel);
 		c.addObserver(panel);
 		

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationInteractor.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualizationInteractor.java

@@ -36,13 +36,13 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.LinkToolTip;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
 
 /**
- * Listener which detects User Interaction with the {@link VisualisationPanel},
+ * Listener which detects User Interaction with the {@link VisualizationPanel},
  * stores interaction information, triggers the controller and helps
  * visualization of the interaction
  * 
  * @author Andreas T. Meyer-Berg
  */
-public class VisualisationInteractor implements MouseInputListener,
+public class VisualizationInteractor implements MouseInputListener,
 		MouseMotionListener, ActionListener, KeyListener {
 	/**
 	 * Controller to notify when the model changes
@@ -62,7 +62,7 @@ public class VisualisationInteractor implements MouseInputListener,
 	/**
 	 * Panel which is observed
 	 */
-	private VisualisationPanel panel;
+	private VisualizationPanel panel;
 
 	/**
 	 * Menu which is shown on right clicks
@@ -215,8 +215,8 @@ public class VisualisationInteractor implements MouseInputListener,
 	 * @param panel
 	 *            which should visualize the interactions
 	 */
-	public VisualisationInteractor(Controller controller,
-			VisualisationPanel panel) {
+	public VisualizationInteractor(Controller controller,
+			VisualizationPanel panel) {
 		// Initialize the values
 		this.controller = controller;
 		this.panel = panel;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationPanel.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualizationPanel.java

@@ -25,7 +25,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualisationInteractor;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualizationInteractor;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.LinkToolTip;
 
 /**
@@ -35,7 +35,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.LinkToolTip;
  * @author Andreas T. Meyer-Berg
  */
 @SuppressWarnings("serial")
-public class VisualisationPanel extends JPanel implements Observer {
+public class VisualizationPanel extends JPanel implements Observer {
 
 	/**
 	 * Controller to notify when the model changes
@@ -55,7 +55,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 	/**
 	 * Listener which processes the GUI Interactions
 	 */
-	private VisualisationInteractor interactor;
+	private VisualizationInteractor interactor;
 	
 	/**
 	 * Initializes the Visualization Panel
@@ -63,14 +63,14 @@ public class VisualisationPanel extends JPanel implements Observer {
 	 * @param control
 	 *            Control, which changes the model
 	 */
-	public VisualisationPanel(Controller control) {
+	public VisualizationPanel(Controller control) {
 		super();
 
 		this.control = control;
 		this.config = control.getSettingsController();
 		this.network = control.getNetworkController();
 		
-		this.interactor = new VisualisationInteractor(control, this);
+		this.interactor = new VisualizationInteractor(control, this);
 		this.addMouseMotionListener(interactor);
 		this.addMouseListener(interactor);
 		this.addKeyListener(interactor);
@@ -158,22 +158,22 @@ public class VisualisationPanel extends JPanel implements Observer {
 		g.setColor(Color.RED);
 		String modus;
 		switch (interactor.mode) {
-		case VisualisationInteractor.DRAG_CONNECTION:
+		case VisualizationInteractor.DRAG_CONNECTION:
 			modus="Drag Connection";
 			break;
-		case VisualisationInteractor.SELECTED_DRAG:
+		case VisualizationInteractor.SELECTED_DRAG:
 			modus="Drag Device";
 			break;
-		case VisualisationInteractor.DRAG_SELECT:
+		case VisualizationInteractor.DRAG_SELECT:
 			modus="Drag Select";
 			break;
-		case VisualisationInteractor.NOTHING:
+		case VisualizationInteractor.NOTHING:
 			modus="Nothing";
 			break;
-		case VisualisationInteractor.RIGHTCLICK_MENU:
+		case VisualizationInteractor.RIGHTCLICK_MENU:
 			modus="RightClick Menu";
 			break;
-		case VisualisationInteractor.SELECTED:
+		case VisualizationInteractor.SELECTED:
 			modus="Selected";
 			break;
 		default:
@@ -248,7 +248,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 		 * Pixel offset of dragged devices on the y axis
 		 */
 		int y_offset = 0;
-		if(interactor.mode == VisualisationInteractor.SELECTED_DRAG && !control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.isEmpty()){
+		if(interactor.mode == VisualizationInteractor.SELECTED_DRAG && !control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.isEmpty()){
 			x_offset = interactor.dragged_x-interactor.dragged.getX();
 			y_offset = interactor.dragged_y-interactor.dragged.getY();
 		}
@@ -262,7 +262,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 			 * y Position of the device
 			 */
 			int y = s.getY();
-			if(interactor.mode==VisualisationInteractor.SELECTED_DRAG && control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.contains(s)) {
+			if(interactor.mode==VisualizationInteractor.SELECTED_DRAG && control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.contains(s)) {
 				// Update visualization of dragged object
 				x += x_offset;
 				y += y_offset;
@@ -322,7 +322,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 		//Values for dragging of multiple Devices
 		int x_offset = 0;
 		int y_offset = 0;
-		if(interactor.mode == VisualisationInteractor.SELECTED_DRAG && !control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.isEmpty()){
+		if(interactor.mode == VisualizationInteractor.SELECTED_DRAG && !control.getSettingsController().getConfigurationManager().getSelectionModel().selectedDevices.isEmpty()){
 			x_offset = interactor.dragged_x-interactor.dragged.getX();
 			y_offset = interactor.dragged_y-interactor.dragged.getY();
 		}
@@ -417,7 +417,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 		}
 		// paint new in progress connection, if a connection or link is in
 		// creation
-		if (interactor.mode == VisualisationInteractor.DRAG_CONNECTION && interactor.connectionFrom != null){
+		if (interactor.mode == VisualizationInteractor.DRAG_CONNECTION && interactor.connectionFrom != null){
 			g.setColor(Color.ORANGE);
 			g.drawLine(interactor.connectionFrom.getX(),
 					interactor.connectionFrom.getY(), interactor.dragged_x,
@@ -430,7 +430,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 	 * @param g graphics of this panel
 	 */
 	protected void paintDrag(Graphics g){
-		if(interactor.mode!=VisualisationInteractor.DRAG_SELECT)
+		if(interactor.mode!=VisualizationInteractor.DRAG_SELECT)
 			return;	
 		int low_x = Math.min(interactor.dragged_x, interactor.dragged_x_start);
 		int low_y = Math.min(interactor.dragged_y, interactor.dragged_y_start);

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/util/LinkToolTip.java

@@ -1,10 +1,10 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualisationPanel;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualizationPanel;
 
 /**
- * Class to store information of ToolTips on the {@link VisualisationPanel}
+ * Class to store information of ToolTips on the {@link VisualizationPanel}
  *
  * @author Andreas T. Meyer-Berg
  */

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/util/Utility.java

@@ -7,7 +7,7 @@ import java.io.InputStream;
 
 import javax.imageio.ImageIO;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualisationPanel;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualizationPanel;
 
 /**
  * Class for various helper methods.
@@ -17,7 +17,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualisationPanel;
 public class Utility {
 
 	/**
-	 * Multiple distinct colors for various purposes, like {@link VisualisationPanel}'s link coloring.
+	 * Multiple distinct colors for various purposes, like {@link VisualizationPanel}'s link coloring.
 	 * This array is taken from <a href="https://stackoverflow.com/questions/2328339/how-to-generate-n-different-colors-for-any-natural-number-n">https://stackoverflow.com/questions/2328339/how-to-generate-n-different-colors-for-any-natural-number-n</a>
 	 */
 	public static final String[] indexcolors = new String[]{