minor changes

src/ui/controller/LoadController.java

@@ -219,7 +219,7 @@ public class LoadController {
 			while (i.hasNext())
 				ele.getGraphPoints().add(new Point(Integer.parseInt(next(i)), Integer.parseInt(next(i))));
 		} else {
-			ele = sC.searchHolonElement((HolonObject) sC.searchHolonObject(next(i), objC.searchCategory(sav).getObjects()),
+			ele = sC.searchHolonElement((HolonObject) sC.searchHolonObject(next(i), sC.searchCategory(sav).getObjects()),
 					next(i));
 			while (i.hasNext())
 				ele.getGraphPoints().add(new Point(Integer.parseInt(next(i)), Integer.parseInt(next(i))));

src/ui/controller/ObjectController.java

@@ -45,8 +45,6 @@ public class ObjectController {
 	 * @param type
 	 */
 	public void addElementIntoCanvasObject(HolonObject object, HolonElement element) {
-		element.setSav("Canvas");
-		element.setObj(object.getObjName());
 		addElement(object, element);
 	}
 
@@ -59,8 +57,11 @@ public class ObjectController {
 	 * @param energy
 	 * @param type
 	 */
-	public void addNewElementIntoCanvasObject(int id, String eleName, int amount, float energy) {
-		addElementIntoCanvasObject((HolonObject) sC.searchByID(id), new HolonElement(eleName, amount, energy));
+	public void addNewElementIntoCanvasObject(int id, String element, int amount, float energy) {
+		HolonElement ele = new HolonElement(element, amount, energy);
+		ele.setSav("Canvas");
+		ele.setObj(sC.searchByID(id).getObjName());
+		addElementIntoCanvasObject((HolonObject) sC.searchByID(id), ele);
 	}
 
 	/**
@@ -68,21 +69,9 @@ public class ObjectController {
 	 * 
 	 * @param object
 	 * @param element
-	 * @param type
 	 */
 	public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
-		Category cat = null;
-
-		for (Category cats : MODEL.getCategories()) {
-			if (cats.getName().equals(category)) {
-				cat = cats;
-				break;
-			}
-		}
-		element.setSav(cat.getName());
-		element.setObj(object);
-
-		addElement((HolonObject) sC.searchHolonObject(object, cat.getObjects()), element);
+		addElement((HolonObject) sC.searchHolonObject(object, sC.searchCategory(category).getObjects()), element);
 	}
 
 	/**
@@ -93,11 +82,14 @@ public class ObjectController {
 	 * @param eleName
 	 * @param amount
 	 * @param energy
-	 * @param type
 	 */
-	public void addNewElementIntoCategoryObject(String category, String object, String eleName, int amount,
+	public void addNewElementIntoCategoryObject(String category, String object, String element, int amount,
 			float energy) {
-		addElementIntoCategoryObject(category, object, new HolonElement(eleName, amount, energy));
+		HolonElement ele = new HolonElement(element, amount, energy);
+		ele.setSav(category);
+		ele.setObj(object);
+
+		addElementIntoCategoryObject(category, object, ele);
 	}
 
 	/**
@@ -120,7 +112,7 @@ public class ObjectController {
 	public void deleteElementInCanvas(int ID, String ele) {
 		HolonObject object = (HolonObject) sC.searchByID(ID);
 		HolonElement element = sC.searchHolonElement(object, ele);
-		
+
 		deleteElement(object, element);
 
 	}
@@ -134,28 +126,13 @@ public class ObjectController {
 	 * @param amount
 	 */
 	public void deleteElementInCategory(String cat, String obj, String ele, int amount) {
-		Category category = searchCategory(cat);
+		Category category = sC.searchCategory(cat);
 		HolonObject object = (HolonObject) sC.searchHolonObject(obj, category.getObjects());
 		HolonElement element = sC.searchHolonElement(object, ele);
 
 		deleteElement(object, element);
 	}
 
-	/**
-	 * search for Category
-	 * @param category
-	 * @return
-	 */
-	public Category searchCategory(String category) {
-		for (Category cats : MODEL.getCategories()) {
-			if (cats.getName().equals(category))
-				return cats;
-		}
-		return null;
-	}
-
-
-
 	/**
 	 * Returns the ID of the selected Object 0 = no Object is selected
 	 * 

src/ui/view/GUI.java

@@ -640,6 +640,7 @@ public class GUI<E> implements CategoryListener {
 					addObjectAction(selectedOption, selectedNode);
 					break;
 				}
+				tree.repaint();
 			}
 		});
 		/**
@@ -772,7 +773,7 @@ public class GUI<E> implements CategoryListener {
 					JOptionPane.showMessageDialog(new JFrame(),
 							"Please select a Category or an Object in order to delete something.");
 				}
-
+				tree.repaint();
 			}
 		});
 		toolBar.add(btnDel);