fix

src/tests/praktikumHolonsTestObjectController.java

@@ -1,8 +1,13 @@
 package tests;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Before;
 import org.junit.Test;
 
+import classes.HolonObject;
 import ui.controller.CategoryController;
 import ui.controller.MultiPurposeController;
 import ui.controller.ObjectController;
@@ -28,6 +33,12 @@ public class praktikumHolonsTestObjectController {
 	
 	@Test
 	public void testInitialHolonElements() {
-		
+		assertTrue("Number of Elements does not Match", model.getCategories().size() == 5);
+		assertTrue("Second Category is not Building", model.getCategories().get(1).getName().equals("Building"));
+		assertTrue("Category Building is Empty", !model.getCategories().get(1).getObjects().isEmpty());
+		assertEquals("Object is not a Power Plant", mp.searchCategory("Energy").getObjects().get(0).getObjName(),
+				"Power Plant");
+		assertFalse("A Switch should not be a Holon Object",
+				mp.searchCategoryObject(mp.searchCategory("Component"), "Switch") instanceof HolonObject);
 	}
 }

src/ui/controller/LoadController.java

@@ -208,8 +208,9 @@ 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))));
-			System.out.println(ele.getActive());
 			objC.addElementIntoCanvasObject((HolonObject) mpC.searchByID(Integer.parseInt(obj)), ele);
 		} else
 			objC.addElementIntoCategoryObject(sav, obj, ele);

src/ui/controller/ObjectController.java

@@ -23,11 +23,13 @@ public class ObjectController {
 	 * init default Power supply of the Power Plant
 	 */
 	public void initHolonElements() {
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 100);
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "Zero", 10, 100);
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "Rehab", 10, 100);
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "The Doctor", 40, 100);
-		addNewElementIntoCategoryObject("Energy", "Power Plant", "Original", 1, 100);
+		addNewElementIntoCategoryObject("Energy", "Power Plant", "Power", 1, 10000);
+		addNewElementIntoCategoryObject("Building", "House", "TV", 2, -250);
+		addNewElementIntoCategoryObject("Building", "House", "Fridge", 1, -500);
+		addNewElementIntoCategoryObject("Building", "House", "Radio", 1, -100);
+		addNewElementIntoCategoryObject("Building", "House", "PC", 3, -250);
+		addNewElementIntoCategoryObject("Building", "House", "Light", 5, -50);
+		addNewElementIntoCategoryObject("Building", "House", "Solar Panels", 1, 300);
 	}
 
 	/**
@@ -46,6 +48,8 @@ public class ObjectController {
 	 * @param type
 	 */
 	public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
+		element.setSav("CVS");
+		element.setObj(Integer.toString(object.getID()));
 		addElement(object, element);
 	}
 
@@ -60,8 +64,6 @@ public class ObjectController {
 	 */
 	public void addNewElementIntoCanvasObject(int id, String element, int amount, float energy) {
 		HolonElement ele = new HolonElement(element, amount, energy);
-		ele.setSav("CVS");
-		ele.setObj(Integer.toString(id));
 		addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
 	}
 
@@ -72,6 +74,8 @@ public class ObjectController {
 	 * @param element
 	 */
 	public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
+		element.setSav(category);
+		element.setObj(object);
 		addElement((HolonObject) mpC.searchCategoryObject(mpC.searchCategory(category), object), element);
 	}
 
@@ -88,9 +92,6 @@ public class ObjectController {
 			float energy) {
 
 		HolonElement ele = new HolonElement(element, amount, energy);
-		ele.setSav(category);
-		ele.setObj(object);
-
 		addElementIntoCategoryObject(category, object, ele);
 	}