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

src/tests/PraktikumHolonsTestAutoSaveController.java

@@ -1,18 +1,10 @@
 package tests;
 
-import java.io.File;
-
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 import ui.controller.AutoSaveController;
-import ui.controller.CanvasController;
-import ui.controller.CategoryController;
-import ui.controller.LoadController;
-import ui.controller.MultiPurposeController;
-import ui.controller.ObjectController;
-import ui.controller.StoreController;
 import ui.model.Model;
 
 public class PraktikumHolonsTestAutoSaveController {

src/ui/controller/Control.java

@@ -19,6 +19,7 @@ import ui.model.Model;
 import ui.view.MyCanvas;
 import ui.view.TimePanel;
 
+
 public class Control {
 
 	private Model MODEL;

src/ui/view/MyCanvas.java

@@ -411,6 +411,16 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 			model.getSelectedCpsObjects().clear();
 			controller.addSelectedObject(tempCps);
 		}
+		if (e.isControlDown()) {
+			if (model.getSelectedCpsObjects().contains(tempCps)) {
+				model.getSelectedCpsObjects().remove(tempCps);
+				if (model.getSelectedCpsObjects().isEmpty()) {
+					tempCps = null;
+				}
+			} else {
+				controller.addSelectedObject(tempCps);
+			}
+		}
 		if (dragged == true) {
 			try {
 				controller.autoSave();