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

# Conflicts:
#	src/tests/PraktikumHolonsTestGlobalController.java

src/api/AbstractAlgorithmSuperClass.java

@@ -1,4 +1,4 @@
-package API;
+package api;
 
 /**
  * API Algorithm Super Class.

src/api/CpsAPI.java

@@ -1,4 +1,4 @@
-package API;
+package api;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/interfaces/CategoryListener.java

@@ -1,4 +1,4 @@
-package Interfaces;
+package interfaces;
 
 import java.util.ArrayList;
 

src/interfaces/ObjectListener.java

@@ -1,4 +1,4 @@
-package Interfaces;
+package interfaces;
 
 import java.util.ArrayList;
 

src/ui/controller/CanvasController.java

@@ -9,8 +9,8 @@ import classes.AbstractCpsObject;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.Position;
-import Interfaces.CategoryListener;
-import Interfaces.ObjectListener;
+import interfaces.CategoryListener;
+import interfaces.ObjectListener;
 import ui.model.Model;
 
 /**

src/ui/controller/CategoryController.java

@@ -8,7 +8,7 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.model.Model;
 
 /**

src/ui/controller/Control.java

@@ -2,7 +2,6 @@ package ui.controller;
 
 import java.awt.Color;
 import java.awt.Point;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,11 +12,9 @@ import classes.CpsNode;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
-import classes.Position;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.model.Model;
 import ui.view.MyCanvas;
-import ui.view.TimePanel;
 
 /**
  * The Class represents the controller in the model, controller view Pattern.

src/ui/model/Model.java

@@ -9,8 +9,8 @@ import classes.Category;
 import classes.CpsEdge;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
-import Interfaces.CategoryListener;
-import Interfaces.ObjectListener;
+import interfaces.CategoryListener;
+import interfaces.ObjectListener;
 import ui.view.Console;
 
 /**

src/ui/view/GUI.java

@@ -69,7 +69,7 @@ import classes.HolonSwitch;
 import classes.HolonTransformer;
 import classes.IdCounter;
 import classes.IdCounterElem;
-import Interfaces.CategoryListener;
+import interfaces.CategoryListener;
 import ui.controller.Control;
 import ui.model.Model;;
 

src/ui/view/MyCanvas.java

@@ -380,13 +380,14 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				}
 			}
 		}
+		
 		// Edge Selection
 		if (tempCps == null) {
 			edgeHighlight = mousePositionOnEdge(x, y);
 			controller.setSelecteEdge(edgeHighlight);
 			controller.setSelectedObjectID(0);
 			if (!e.isControlDown() && e.getButton() != MouseEvent.BUTTON3) {
-				model.getSelectedCpsObjects().clear();
+				model.	getSelectedCpsObjects().clear();
 			}
 		}
 
@@ -408,11 +409,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			drawEdge = false;
 			drawDeleteEdge();
 		}
-
-		if (!e.isControlDown() && e.getButton() != MouseEvent.BUTTON3 && dragged == false && tempCps != null) {
-			model.getSelectedCpsObjects().clear();
-			controller.addSelectedObject(tempCps);
-		}
 		
 		if (dragged == true) {
 			try {
@@ -422,8 +418,15 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				ex.printStackTrace();
 			}
 		}
-		dragged = false;
+		
 
+		if (!e.isControlDown() && dragged == false && tempCps != null) {
+			model.getSelectedCpsObjects().clear();
+			controller.addSelectedObject(tempCps);
+		}
+		
+		dragged = false;
+		
 		// Rightclick List
 		if (e.getButton() == MouseEvent.BUTTON3) {
 			if (e.getButton() == MouseEvent.BUTTON3 && tempCps != null) {