Fix wegen scheiße Merge

src/ui/controller/ObjectControl.java

@@ -79,12 +79,7 @@ public class ObjectControl {
 	 * @param type
 	 */
 	public void addNewElementIntoCanvasObject(String object, String eleName, int amount, float energy, Type type) {
-<<<<<<< HEAD
-		addElementIntoCanvasObject(object, new HolonElement(eleName, amount, energy), type);
-=======
-		addElementIntoCanvasObject(searchHolonObject(object, M.getObjectsOnCanvas()),
-				new HolonElement(eleName, energy, amount), type);
->>>>>>> f71b104b4003141ade3fc9002252a0ad1706422d
+		addElementIntoCanvasObject(object, new HolonElement(eleName, energy, amount), type);
 	}
 
 	/**
@@ -120,18 +115,9 @@ public class ObjectControl {
 	public void addNewElementIntoCategoryObject(String category, String object, String eleName, int amount,
 			float energy, Type type) {
 
-<<<<<<< HEAD
-		addElementIntoCategoryObject(category, object, new HolonElement(eleName, amount, energy), type);
-=======
-		for (Category cats : M.getCategories()) {
-			if (cats.getName().equals(category)) {
-				cat = cats;
-				break;
-			}
-		}
-		addElementIntoCategoryObject(searchHolonObject(object, cat.getObjects()),
-				new HolonElement(eleName, energy, amount), type);
->>>>>>> f71b104b4003141ade3fc9002252a0ad1706422d
+		addElementIntoCategoryObject(category, object, new HolonElement(eleName, energy, amount), type);
+
+
 	}
 
 	/**
@@ -153,14 +139,13 @@ public class ObjectControl {
 
 		return obj;
 	}
-	
+
 	/**
-	 * Returns the ID of the selected Object
-	 * 0 = no Object is selected
+	 * Returns the ID of the selected Object 0 = no Object is selected
 	 * 
 	 * @return ID
 	 */
-	public void setSelectedObjectID(int id){
+	public void setSelectedObjectID(int id) {
 		M.setSelectedObjectID(id);
 	}
 }