tests and load

src/tests/praktikumHolonsTestCanvasController.java

@@ -132,5 +132,18 @@ public class praktikumHolonsTestCanvasController {
 		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);
 
+		controller.deleteObjectOnCanvas(mp.searchByID(13));
+		assertTrue("Object:13 was not deleted", mp.searchByID(13) == null);
+		assertTrue("Edge-A-M was not deleted", mp.searchCpsEdge(1, 13) == null);
+		assertTrue("Edge-B-M was not deleted", mp.searchCpsEdge(2, 13) == null);
+		assertTrue("Edge-C-M was not deleted", mp.searchCpsEdge(3, 13) == null);
+		assertTrue("Edge-D-M was not deleted", mp.searchCpsEdge(4, 13) == null);
+		assertTrue("Edge-E-M was not deleted", mp.searchCpsEdge(5, 13) == null);
+		assertTrue("Edge-F-M was not deleted", mp.searchCpsEdge(6, 13) == null);
+		assertTrue("Edge-M-O was not deleted", mp.searchCpsEdge(13, 16) == null);
+		assertTrue("Edge-M-P was not deleted", mp.searchCpsEdge(13, 17) == null);
+		assertTrue("Edge-M-Q was not deleted", mp.searchCpsEdge(13, 18) == null);
+		assertTrue("Edge-M-R was not deleted", mp.searchCpsEdge(13, 19) == null);
+		assertTrue("Edge-M-S was not deleted", mp.searchCpsEdge(13, 20) == null);
 	}
 }

src/ui/controller/LoadController.java

@@ -72,11 +72,11 @@ public class LoadController {
 		if (mode.equals(MODE.ALL) || mode.equals(MODE.CATEGORY)) {
 			MODEL.setCgIdx(new HashMap<String, Integer>());
 			MODEL.setCategories(new ArrayList<Category>());
-			MODEL.setEdgesOnCanvas(new ArrayList<CpsEdge>());
 		}
-		if (mode.equals(MODE.ALL) || mode.equals(MODE.CATEGORY)) {
+		if (mode.equals(MODE.ALL) || mode.equals(MODE.CANVAS)) {
 			MODEL.setCvsObjIdx(new HashMap<Integer, Integer>());
 			MODEL.setObjectsOnCanvas(new ArrayList<CpsObject>());
+			MODEL.setEdgesOnCanvas(new ArrayList<CpsEdge>());
 		}
 
 		for (Object key : json.keySet()) {