Method removed and checkstyle in canvas

src/ui/view/GUI.java

@@ -223,7 +223,6 @@ public class GUI<E> implements CategoryListener {
 	private int yProThis;
 	private int xProThis;
 	private AbstractCpsObject temp = null;
-	private final JButton btnTest = new JButton("test");
 	private final JMenuItem mntmUndo = new JMenuItem("Undo");
 	private final JMenuItem mntmRedo = new JMenuItem("Redo");
 	private final JMenuItem mntmEditEdges = new JMenuItem("Edit Edges");
@@ -541,7 +540,6 @@ public class GUI<E> implements CategoryListener {
 			public void stateChanged(ChangeEvent e) {
 				controller.setScale(sizeSlider.getValue());
 				tree.setRowHeight(50);
-				canvas.objectSelectionHighlighting();
 				canvas.repaint();
 			}
 		});
@@ -1316,7 +1314,6 @@ public class GUI<E> implements CategoryListener {
 				unitGraph.empty();
 				elementGraph.setText("None ");
 				canvas.tempCps = null;
-				canvas.objectSelectionHighlighting();
 				canvas.repaint();
 				IdCounter.resetCounter();
 				IdCounterElem.resetCounter();

src/ui/view/Main.java

@@ -9,27 +9,39 @@ import javax.swing.UnsupportedLookAndFeelException;
 import ui.controller.*;
 import ui.model.*;
 
+/**
+ * The main Class in this Program. The GUI is created in this Class.
+ * 
+ * @author Gruppe14
+ * 
+ */
 public class Main {
 
+	/**
+	 * main method of this program.
+	 * 
+	 * @param args
+	 *            standard
+	 */
 	public static void main(String[] args) {
 
 		// *Design
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
-				| UnsupportedLookAndFeelException e1) {
+				| UnsupportedLookAndFeelException e) {
 			// TODO Auto-generated catch block
-			e1.printStackTrace();
+			e.printStackTrace();
 		}
 
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-					Model MODEL = new Model();
-					Control CONTROL = new Control(MODEL);
-					GUI VIEW = new GUI(CONTROL);
+					Model model = new Model();
+					Control control = new Control(model);
+					GUI view = new GUI(control);
 
-					VIEW.getFrmCyberPhysical().setVisible(true);
+					view.getFrmCyberPhysical().setVisible(true);
 
 				} catch (Exception e) {
 					e.printStackTrace();

src/ui/view/MyCanvas.java

@@ -35,10 +35,13 @@ import classes.HolonSwitch;
 import ui.controller.Control;
 import ui.model.Model;
 
+/**
+ * This Class is the Canvas. All Objects will be visualized here
+ * 
+ * @author Gruppe14
+ */
 public class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
-	/**
-	 * 
-	 */
+
 	private static final long serialVersionUID = 1L;
 	private Image img = null; // Contains the image to draw on MyCanvas
 	private int x = 0;
@@ -52,7 +55,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	private float scalediv20;
 
 	ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
-	ArrayList<AbstractCpsObject> TempSelected = new ArrayList<AbstractCpsObject>();
+	ArrayList<AbstractCpsObject> tempSelected = new ArrayList<AbstractCpsObject>();
 
 	private boolean[] showedInformation = new boolean[3];
 	private boolean dragging = false; // for dragging
@@ -61,7 +64,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	private boolean click = false; // for double click
 	private boolean doMark = false; // for double click
 	public AbstractCpsObject tempCps = null;
-	private Rectangle selectRect = new Rectangle();
 	private CpsEdge edgeHighlight = null;
 
 	// PopUpMenu
@@ -78,6 +80,14 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	// contains the value of the Capacity for new created Edges
 	private float edgeCapacity;
 
+	/**
+	 * Constructor.
+	 * 
+	 * @param mod
+	 *            the Model
+	 * @param control
+	 *            the Controller
+	 */
 	public MyCanvas(Model mod, Control control) {
 		this.add(objectTT);
 		this.controller = control;
@@ -108,7 +118,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				}
 				model.getSelectedCpsObjects().clear();
 				tempCps = null;
-				selectRect.setRect(0, 0, 0, 0);
 				repaint();
 			}
 		});
@@ -144,10 +153,10 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	}
 
 	/**
-	 * Paints all Components on the Canvas
-	 * 
-	 * @param Graphics
+	 * Paints all Components on the Canvas.
 	 * 
+	 * @param g
+	 *            Graphics
 	 */
 	public void paintComponent(Graphics g) {
 		String maxCap;
@@ -196,7 +205,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		}
 
 		// Highlighted Edge
-		if (model.getSelectedObjectID() > 0 || !model.getSelectedCpsObjects().isEmpty() || !TempSelected.isEmpty()) {
+		if (model.getSelectedObjectID() > 0 || !model.getSelectedCpsObjects().isEmpty() || !tempSelected.isEmpty()) {
 			g2.setColor(Color.BLUE);
 			for (CpsEdge con : model.getEdgesOnCanvas()) {
 				if (con.getFlow() <= con.getCapacity()) {
@@ -205,10 +214,10 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					g2.setStroke(new BasicStroke(2));
 				}
 				if (con.getA().getID() == model.getSelectedObjectID()
-						|| model.getSelectedCpsObjects().contains(con.getA()) || TempSelected.contains(con.getA())
+						|| model.getSelectedCpsObjects().contains(con.getA()) || tempSelected.contains(con.getA())
 						|| con.getB().getID() == model.getSelectedObjectID()
 						|| model.getSelectedCpsObjects().contains(con.getB())
-						|| TempSelected.contains(con.getB()) && con != edgeHighlight) {
+						|| tempSelected.contains(con.getB()) && con != edgeHighlight) {
 					g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
 							con.getA().getPosition().y + controller.getScaleDiv2(),
 							con.getB().getPosition().x + controller.getScaleDiv2(),
@@ -266,7 +275,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 			// node image
 			if (cps instanceof CpsNode && (cps == tempCps || model.getSelectedCpsObject() == cps
-					|| model.getSelectedCpsObjects().contains(cps) || TempSelected.contains(cps))) {
+					|| model.getSelectedCpsObjects().contains(cps) || tempSelected.contains(cps))) {
 				img = new ImageIcon(this.getClass().getResource("/Images/node_selected.png")).getImage();
 			} else {
 				if (cps instanceof HolonSwitch) {
@@ -277,8 +286,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					}
 				}
 				// Highlighting
-				if ((cps == tempCps && model.getSelectedCpsObjects().size() == 0 && TempSelected.size() == 0)
-						|| model.getSelectedCpsObjects().contains(cps) || TempSelected.contains(cps)) {
+				if ((cps == tempCps && model.getSelectedCpsObjects().size() == 0 && tempSelected.size() == 0)
+						|| model.getSelectedCpsObjects().contains(cps) || tempSelected.contains(cps)) {
 					g2.setColor(Color.BLUE);
 					g2.fillRect((int) (cps.getPosition().x - scalediv20), (int) (cps.getPosition().y - scalediv20),
 							(int) (controller.getScale() + (scalediv20 * 2)),
@@ -383,9 +392,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			sx = e.getX();
 			sy = e.getY();
 			doMark = true;
-		}		
-		// Object Selection Highlighting (selectRect)
-		objectSelectionHighlighting();
+		}
+
 
 		repaint();
 	}
@@ -403,12 +411,12 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			model.getSelectedCpsObjects().clear();
 			controller.addSelectedObject(tempCps);
 		}
-		if(dragged == true){
+		if (dragged == true) {
 			try {
 				controller.autoSave();
-			} catch (IOException e1) {
+			} catch (IOException ex) {
 				// TODO Auto-generated catch block
-				e1.printStackTrace();
+				ex.printStackTrace();
 			}
 		}
 		dragged = false;
@@ -433,16 +441,16 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 		if (doMark) {
 			doMark = false;
-			for (AbstractCpsObject cps : TempSelected) {
+			for (AbstractCpsObject cps : tempSelected) {
 				if (!model.getSelectedCpsObjects().contains(cps)) {
 					controller.addSelectedObject(cps);
 				}
 			}
-			TempSelected.clear();
+			tempSelected.clear();
 		}
-		
+
 		if (doubleClick() && tempCps != null && tempCps instanceof HolonSwitch) {
-			((HolonSwitch)tempCps).switchState();
+			((HolonSwitch) tempCps).switchState();
 		}
 
 		controller.calculateStateForTimeStep(model.getCurIteration());
@@ -485,7 +493,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				yDist = y - tempCps.getPosition().y;
 
 				tempCps.setPosition(x, y); // Drag Position
-				selectRect.setLocation(x - (controller.getScale() / 20), y - (controller.getScale() / 20)); // Highlighting-Position
 				// TipText Position and name
 				objectTT.setTipText(tempCps.getName() + ", " + tempCps.getID());
 				objectTT.setLocation(x, y + controller.getScale());
@@ -510,14 +517,14 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					}
 				}
 				repaint();
-			} catch (Exception e2) {
+			} catch (Exception eex) {
 
 			}
 		}
 
 		// Mark Objects
 		if (doMark) {
-			TempSelected.clear();
+			tempSelected.clear();
 			for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
 				int x1 = sx, x2 = x, y1 = sy, y2 = y;
 
@@ -532,7 +539,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				if (x1 <= cps.getPosition().x + model.getScaleDiv2() && y1 <= cps.getPosition().y + model.getScaleDiv2()
 						&& x2 >= cps.getPosition().x + model.getScaleDiv2()
 						&& y2 >= cps.getPosition().y + model.getScaleDiv2()) {
-					TempSelected.add(cps);
+					tempSelected.add(cps);
 
 				}
 			}
@@ -566,24 +573,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	}
 
 	/**
-	 * Sets the Highlighting of the Selected Object
-	 */
-	public void objectSelectionHighlighting() {
-		if (tempCps != null) {
-			selectRect.setBounds(tempCps.getPosition().x - (controller.getScale() / 20),
-					tempCps.getPosition().y - (controller.getScale() / 20),
-					controller.getScale() + ((controller.getScale() / 20) * 2),
-					controller.getScale() + ((controller.getScale() / 20) * 2));
-
-			controller.setSelectedObjectID(tempCps.getID());
-		} else {
-			controller.setSelectedObjectID(0);
-			selectRect.setRect(0, 0, 0, 0);
-		}
-	}
-
-	/**
-	 * Draws or Deletes an Edge
+	 * Draws or Deletes an Edge.
 	 */
 	private void drawDeleteEdge() {
 		boolean node = true;
@@ -673,12 +663,11 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			controller.delCanvasObject(tempCPS);
 			tempCPS = null;
 			tempCps = null;
-			objectSelectionHighlighting();
 		}
 	}
 
 	/**
-	 * Checks if the mouse is on an Edge
+	 * Checks if the mouse is on an Edge.
 	 * 
 	 * @param x
 	 *            Position of the Mouse
@@ -717,7 +706,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	}
 
 	/**
-	 * Checks if a double click was made
+	 * Checks if a double click was made.
 	 * 
 	 * @return true if doublecklick, false if not
 	 */
@@ -738,15 +727,34 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		return false;
 	}
 
+	/**
+	 * sets the Edge Capacity.
+	 * 
+	 * @param cap
+	 *            capacity
+	 */
 	public void setEdgeCapacity(float cap) {
 		edgeCapacity = cap;
 	}
 
+	/**
+	 * Set if Information should be shown.
+	 * 
+	 * @param connection
+	 *            boolean for conecction
+	 * @param object
+	 *            boolean for objects
+	 */
 	public void setShowedInformation(boolean connection, boolean object) {
 		showedInformation[0] = connection;
 		showedInformation[1] = object;
 	}
 
+	/**
+	 * Returns if Information should be shown.
+	 * 
+	 * @return Array of boolean [0] = connection, [1] = objects
+	 */
 	public boolean[] getShowedInformation() {
 		return showedInformation;
 	}

src/ui/view/SearchPopUp.java

@@ -162,7 +162,7 @@ public class SearchPopUp extends JDialog {
 		btnReplaceAll.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				canvas.tempCps = null;
-				canvas.TempSelected = new ArrayList<>();
+				canvas.tempSelected = new ArrayList<>();
 				controller.getModel().getSelectedCpsObjects().clear();
 
 				for (AbstractCpsObject cps : controller.getModel().getObjectsOnCanvas()) {