removes unnecessary imports and updates Tests for drag&drop

src/tests/PraktikumHolonsTestCanvasController.java

@@ -48,11 +48,17 @@ public class PraktikumHolonsTestCanvasController {
 	public void testAddingObjects() {
 		// just adding a few things
 		assertTrue("Number of Objects does not Match", model.getObjectsOnCanvas().size() == 0);
-		controller.addNewObject(new HolonObject(mp.searchCatObj(mp.searchCat("Energy"), "Power Plant")));
+		HolonObject a = new HolonObject(mp.searchCatObj(mp.searchCat("Energy"), "Power Plant"));
+		a.setPosition(100, 100);
+		controller.addNewObject(a);
 		assertTrue("ID of the Object does not Match", mp.searchByID(1).getName().equals("Power Plant"));
 		assertTrue("Type of the Object does not Match", mp.searchByID(1) instanceof HolonObject);
 		assertTrue("Number of Objects does not Match", model.getObjectsOnCanvas().size() == 1);
 		controller.addNewObject(new HolonObject(mp.searchCatObj(mp.searchCat("Energy"), "Power Plant")));
+		/* trick drag&drop replace by moving a to 100 100 and then back to a, so
+		 * the rest of new objects won't know which one to replace
+		 */
+		a.setPosition(0, 0);
 		assertTrue("ID of the Object does not Match", mp.searchByID(2).getName().equals("Power Plant"));
 		assertTrue("Type of the Object does not Match", mp.searchByID(2) instanceof HolonObject);
 		assertTrue("Number of Objects does not Match", model.getObjectsOnCanvas().size() == 2);
@@ -124,7 +130,9 @@ public class PraktikumHolonsTestCanvasController {
 		for (int i = 2; i < 27; i++) {
 			// adds Object on canvas
 			HolonObject temp = new HolonObject(adapter.generate(i));
-			controller.addNewObject(new HolonObject(temp));
+			HolonObject temp2 = new HolonObject(temp);
+			temp2.setPosition(50+180 * (i-2)%5,50+ 180 * (i-2)/5);
+			controller.addNewObject(temp2);
 			// connect current vertice with all other vertices
 			for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
 				if (!cps.equals(mp.searchByID(i)))
@@ -132,15 +140,15 @@ public class PraktikumHolonsTestCanvasController {
 			}
 
 			// test how many connections current vertice got
-			assertTrue("Number of Connections does not Match", mp.searchByID(i).getConnectedTo().size() == i - 1);
+			assertTrue("Number of Connections does not Match: " + mp.searchByID(i).getConnectedTo().size()+ " != " + (i - 1), mp.searchByID(i).getConnectedTo().size() == i - 1);
 			// actually just means if its a
 			// complete graph -> all vertices connected all other vertices
 			n = model.getObjectsOnCanvas().size();
-			assertTrue("Number of Edges does not Match", model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
+			assertTrue("Number of Edges does not Match: "+model.getEdgesOnCanvas().size()+ " != "+ (n * (n - 1)) / 2, model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
 		}
 		// same as above
 		n = model.getObjectsOnCanvas().size();
-		assertTrue("Number of Edges does not Match", model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
+		assertTrue("Number of Edges does not Match: "+model.getEdgesOnCanvas().size()+ " != "+ (n * (n - 1)) / 2, model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
 
 		// here starts the deleting
 		controller.removeEdgesOnCanvas(mp.searchEdge(13, 14));

src/tests/PraktikumHolonsTestCategoryController.java

@@ -2,6 +2,7 @@ package tests;
 
 import static org.junit.Assert.*;
 
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -146,9 +147,9 @@ public class PraktikumHolonsTestCategoryController {
 	public void testAddingAndDeletingObjectsExtended() {
 
 		for (int i = 1; i <= 25; i++) {
-			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i), null, null);
+			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i),null, null);
 			//creating duplicates
-			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i), null, null);
+			controller.addNewHolonObject(mp.searchCat("Energy"), adapter.generate(i),null, null);
 
 			assertTrue("Objects were not added", mp.searchCat("Energy").getObjects().size() == i * 2 + 1);
 

src/ui/controller/CategoryController.java

@@ -132,7 +132,7 @@ public class CategoryController {
 			object.setName(name);
 			i++;
 		}
-		if(updateElementSaves && object instanceof HolonObject){
+		if(updateElementSaves && object instanceof HolonObject &&((HolonObject)object).getElements()!=null){
 			for(HolonElement e: ((HolonObject)object).getElements()){
 				e.setSaving(new Pair<String,String>(e.getSaving().getKey(), name));
 			}

src/ui/controller/SimulationManager.java

@@ -3,7 +3,6 @@ package ui.controller;
 import classes.*;
 import classes.comparator.EnergyMinToMaxComparator;
 import classes.comparator.MinEnergyComparator;
-import classes.comparator.TotalEnergyComparator;
 import classes.comparator.WeakestBattery;
 import ui.model.Model;
 import ui.view.FlexiblePane;
@@ -13,8 +12,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.sun.xml.internal.ws.util.xml.XMLReaderComposite.State;
-
 /**
  * Controller for Simulation.
  *