small changes

src/tests/praktikumHolonsTestCanvasController.java

@@ -127,10 +127,8 @@ public class praktikumHolonsTestCanvasController {
 		n = model.getObjectsOnCanvas().size();
 		assertTrue("Number of Edges does not Match", model.getEdgesOnCanvas().size() == (n * (n - 1)) / 2);
 		
-		//here starts the deleting FUNKTIONIERT NICHT WEIL ES NICHT IM CONTROLLER GEMACHT WIRD
-		//EDGES AUF DEM CVS WERDEN GELÖSCHT JEDOCH DIE CONNECTIONS IN DEN OBJEKTEN NICHT AKTUALISIERT
+		//here starts the deleting
 		controller.removeEdgesOnCanvas(mp.searchCpsEdge(13, 14));
-		System.out.println(mp.searchByID(13).getConnections().size() + ":" + model.getObjectsOnCanvas().size());
 		assertTrue("Number of Connection of Vertice M does not Match", mp.searchByID(13).getConnections().size() == model.getObjectsOnCanvas().size() - 2);
 		assertTrue("Edge-M-N was not deleted", mp.searchCpsEdge(13, 14) == null);
 

src/ui/controller/LoadController.java

@@ -208,8 +208,6 @@ public class LoadController {
 		HolonElement ele = new HolonElement(next(i), Integer.parseInt(next(i)), Float.parseFloat(next(i)));
 
 		if (sav.equals("CVS")) {
-			ele.setSav(sav);
-			ele.setObj(obj);
 			ele.setActive(convert(Integer.parseInt(next(i))));
 			objC.addElementIntoCanvasObject((HolonObject) mpC.searchByID(Integer.parseInt(obj)), ele);
 		} else

src/ui/controller/MultiPurposeController.java

@@ -29,7 +29,7 @@ public class MultiPurposeController {
 
 		Integer idx;
 
-		if ((idx = MODEL.getCgIdx().get(category)) == null || MODEL.getCgIdx().size() < 1 )
+		if ((idx = MODEL.getCgIdx().get(category)) == null || MODEL.getCgIdx().size() < 1)
 			return null;
 		else
 			return MODEL.getCategories().get(idx);
@@ -85,15 +85,18 @@ public class MultiPurposeController {
 		else
 			return object.getElements().get(idx);
 	}
-	
+
 	public CpsEdge searchCpsEdge(int a, int b) {
-		
+
 		CpsObject A = searchByID(a);
 		CpsObject B = searchByID(b);
-		
+
 		for (CpsEdge edge : MODEL.getEdgesOnCanvas()) {
-			if(edge.getA().getObjName().equals(A.getObjName()) && (edge.getB().getObjName().equals(B.getObjName())))
-					return edge;
+//			if (edge.getA().getObjName().equals(A.getObjName()) && (edge.getB().getObjName().equals(B.getObjName()))
+//					|| edge.getB().getObjName().equals(A.getObjName())
+//							&& (edge.getA().getObjName().equals(B.getObjName())))
+			if( (edge.getA().equals(A) && edge.getB().equals(B)) || (edge.getB().equals(A)) && edge.getA().equals(B))
+				return edge;
 		}
 		return null;
 	}
@@ -110,7 +113,7 @@ public class MultiPurposeController {
 			if (i.getValue() > map.get(key))
 				i.setValue(i.getValue() - 1);
 		}
-	}	
+	}
 
 	/**
 	 * Copies a HashMap into a new One