addObject bearbeitet

src/ui/controller/CategoryController.java

@@ -5,6 +5,7 @@ import java.util.LinkedList;
 
 import classes.Category;
 import classes.CpsObject;
+import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
@@ -36,7 +37,7 @@ public class CategoryController {
 		powerp.setImage("/Images/power-plant.png");
 		HolonObject house = new HolonObject("House");
 		house.setImage("/Images/home.png");
-		
+
 		System.out.println(house.toString());
 		HolonTransformer transformer = new HolonTransformer("Transformer");
 		transformer.setImage("/Images/transformer.png");
@@ -128,8 +129,11 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonObject(Category cat, String obj, String objType) {
-		addObject(cat, new HolonObject(objType, obj));
+	public void addNewHolonObject(Category cat, String objName, ArrayList<HolonElement> elements, String image) {
+		HolonObject object = new HolonObject(objName);
+		object.setImage(image);
+		object.setElements(elements);
+		addObject(cat, object);
 	}
 
 	/**
@@ -140,8 +144,10 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonTransformer(Category cat, String obj, String objType) {
-		addObject(cat, new HolonTransformer(objType, obj));
+	public void addNewHolonTransformer(Category cat, String objName, String image) {
+		HolonTransformer transformer = new HolonTransformer(objName);
+		transformer.setImage(image);
+		addObject(cat, transformer);
 	}
 
 	/**
@@ -152,8 +158,10 @@ public class CategoryController {
 	 * @param obj
 	 *            New Object Name
 	 */
-	public void addNewHolonSwitch(Category cat, String obj, String objType) {
-		addObject(cat, new HolonSwitch(objType, obj));
+	public void addNewHolonSwitch(Category cat, String objName, String image) {
+		HolonSwitch holonSwitch = new HolonSwitch(objName);
+		holonSwitch.setImage(image);
+		addObject(cat, holonSwitch);
 	}
 
 	/**

src/ui/controller/Control.java

@@ -2,10 +2,12 @@ package ui.controller;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.LinkedList;
 
 import classes.Category;
 import classes.CpsObject;
+import classes.HolonElement;
 import classes.HolonObject;
 import Interfaces.CategoryListener;
 import ui.model.Model;
@@ -25,7 +27,7 @@ public class Control {
 	private final ObjectController objectController;
 	private final CanvasController canvasController;
 	private final GlobalController globalController;
-	
+
 	public Control(Model model) {
 		this.MODEL = model;
 		this.categoryController = new CategoryController(model);
@@ -39,20 +41,20 @@ public class Control {
 		categoryController.addNewCategory(catName);
 	}
 
-	public void addObject(Category cat, String name, String objType) {
-		categoryController.addNewHolonObject(cat, name, objType);
+	public void addObject(Category cat, String objType, ArrayList<HolonElement> elements, String image) {
+		categoryController.addNewHolonObject(cat, objType, elements, image);
 	}
 
-	public void addObjectCategory(Category cat, HolonObject object) {
-		categoryController.addObject(cat, object);
-	}
+	// public void addObjectCategory(Category cat, HolonObject object) {
+	// categoryController.addObject(cat, object);
+	// }
 
-	public void addTransformer(Category cat, String name, String objType) {
-		categoryController.addNewHolonTransformer(cat, name, objType);
+	public void addTransformer(Category cat, String objName, String image) {
+		categoryController.addNewHolonTransformer(cat, objName, image);
 	}
 
-	public void addSwitch(Category cat, String name, String objType) {
-		categoryController.addNewHolonSwitch(cat, name, objType);
+	public void addSwitch(Category cat, String objName, String image) {
+		categoryController.addNewHolonSwitch(cat, objName, image);
 	}
 
 	public Category searchCategory(String name) {
@@ -75,7 +77,7 @@ public class Control {
 	public void setSelectedObjectID(int id) {
 		objectController.setSelectedObjectID(id);
 	}
-	
+
 	public void deleteObjectOnCanvas(CpsObject obj) {
 		canvasController.deleteObjectOnCanvas(obj);
 	}
@@ -85,8 +87,7 @@ public class Control {
 		objectController.addNewElementIntoCanvasObject(objName, eleName, amount, energy);
 	}
 
-	public void addElementCategoryObject(String catName, String objName, String eleName, int amount,
-			float energy) {
+	public void addElementCategoryObject(String catName, String objName, String eleName, int amount, float energy) {
 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
 	}
 
@@ -94,28 +95,28 @@ public class Control {
 		objectController.deleteElementInCanvas(id, element);
 	}
 
-	public CpsObject searchByID(int ID){
-		return searchByID(ID);
+	public CpsObject searchByID(int ID) {
+		return objectController.searchByID(ID);
 	}
-	
-	/* Global Operations*/
-	public int getScale(){
+
+	/* Global Operations */
+	public int getScale() {
 		return globalController.getScale();
 	}
-	
-	public int getScaleDiv2(){
+
+	public int getScaleDiv2() {
 		return globalController.getScaleDiv2();
 	}
-	
-	public void setScale(int s){
+
+	public void setScale(int s) {
 		globalController.setScale(s);
 	}
-	
+
 	////////// etc
 	public void initListener(CategoryListener catLis) {
 		categoryController.addCategoryListener(catLis);
 	}
-	
+
 	/**
 	 * Getter for Model
 	 * 

src/ui/view/AddObjectPopUp.java

@@ -205,11 +205,14 @@ public class AddObjectPopUp extends JDialog {
 						if (objectName.getText().length() > 0) {
 							if (sourcePath.getText().equals(filePath)) {
 								copieFile();
-								theObject = new HolonObject(objectName.getText());
-								theObject.setElements(hElements);
-								theObject.setImage(imagePath);
-								controller.addObjectCategory(controller.searchCategory(givenCategory), theObject);
-								System.out.println(theObject.getImage());
+								// theObject = new
+								// HolonObject(objectName.getText());
+								// theObject.setElements(hElements);
+								// theObject.setImage(imagePath);
+								controller.addObject(controller.searchCategory(givenCategory), objectName.getText(), hElements, imagePath);
+//								controller.addObjectCategory(controller.searchCategory(givenCategory), theObject);
+//								
+//								System.out.println(theObject.getImage());
 								System.out.println(givenCategory);
 								dispose();
 							} else