Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

src/ui/view/GUI.java

@@ -320,17 +320,15 @@ public class GUI<E> implements CategoryListener {
 					controller.delCanvasObject(cps);
 				}
 				model.getSelectedCpsObjects().clear();
-				/* controller.setSelectedObjectID(0);
-				for (int i = tableModelHolonElementMulti.getRowCount() - 1; i > -1; i--) {
-					tableModelHolonElementMulti.removeRow(i);
-				}
-				for (int i = tableModelHolonElementSingle.getRowCount() - 1; i > -1; i--) {
-					tableModelHolonElementSingle.removeRow(i);
-				}
-				for (int i = tableModelProperties.getRowCount() - 1; i > -1; i--) {
-					tableModelProperties.removeRow(i);
-				}
-				*/
+				/*
+				 * controller.setSelectedObjectID(0); for (int i =
+				 * tableModelHolonElementMulti.getRowCount() - 1; i > -1; i--) {
+				 * tableModelHolonElementMulti.removeRow(i); } for (int i =
+				 * tableModelHolonElementSingle.getRowCount() - 1; i > -1; i--)
+				 * { tableModelHolonElementSingle.removeRow(i); } for (int i =
+				 * tableModelProperties.getRowCount() - 1; i > -1; i--) {
+				 * tableModelProperties.removeRow(i); }
+				 */
 				canvas.repaint();
 				unitGraph.empty();
 			}

src/ui/view/UnitGraph.java

@@ -360,7 +360,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 						// double p1, p2 um location der points zu bestimmen
 						double p1 = pointList.get(i - 1).getX();
 						double p2 = pointList.get(i).getX();
-						// Punkte hinzufügen, je nachdem ob true oder false
+						// Punkte hinzuf�gen, je nachdem ob true oder false
 						if (pointList.get(i - 1).getY() != 0 && pointList.get(i).getY() != 0) {
 							pointList.add(i, new Point((int) ((x + p2) / 2 + dist), (int) height - 1));
 							pointList.add(i, new Point((int) ((x + p2) / 2 + dist), 0));
@@ -501,7 +501,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 		isSwitch = false;
 		isElement = true;
 		MAXIMUM = selectedElement.get(selectedElement.size() - 1).getEnergy();
-		// First time clicked on the Element
+  		// First time clicked on the Element
 		if (pointList.isEmpty()) {
 			pointList.addFirst(new Point(0, 0));
 			pointList.addLast(new Point((int) (this.getWidth() / scaleX), 0));