objekte werden wider kopiert

src/classes/HolonObject.java

@@ -35,9 +35,10 @@ public class HolonObject extends CpsObject {
 
 	public HolonObject(CpsObject obj) {
 		super(obj.objName);
-		/*
-		 * this.consumers = obj.consumers; this.producers = obj.producers;
-		 */
+		consumers = new ArrayList<HolonElement>();
+		producers = new ArrayList<HolonElement>();
+		this.consumers = ((HolonObject)obj).getConsumers();
+		this.producers = ((HolonObject)obj).getProducers();
 	}
 
 	public void addConsumer(HolonElement consumer) {

src/ui/view/GUI.java

@@ -214,21 +214,22 @@ public class GUI implements CategoryListener {
 				CpsObject tempCPS = null;
 
 				for (Category cat : model.getCategories()) {
+					if (value.toString().compareTo(cat.getCompareName()) == 0) {
+						label.setText(cat.getCompareName());
+					}
 					for (CpsObject cps : cat.getObjects()) {
 						if (value.toString().compareTo(cps.getCompareName()) == 0) {
 							tempCPS = cps;
-							// System.out.println(tempCPS.getImage());
 							imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
 									.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
 							if (imgR != null) {
 								label.setIcon(new ImageIcon(imgR));
 							}
-						} else {
-							
+							label.setText(cps.getName());
 						}
 					}
 				}
-				label.setText(value.toString());
+				if(label.getText().length() == 0) label.setText(value.toString());
 				return label;
 
 			}
@@ -247,14 +248,7 @@ public class GUI implements CategoryListener {
 			public void mouseReleased(MouseEvent e) {
 				try {
 					if (dragging) {
-
-						// if(){
-						// HolonSwitch h = new HolonSwitch(actualObjectClicked);
-						// }else if(){
-						// HolonTransformer h = new
-						// HolonTransformer(actualObjectClicked);
-						// }else{
-						HolonObject h = new HolonObject(actualObjectClicked);
+						HolonObject h = new HolonObject(tempCps);
 						h.setPos((int) canvas.getMousePosition().getX(), (int) canvas.getMousePosition().getY());
 						controller.addObject(h);
 						for (int i = 0; i < model.getObjectsOnCanvas().size(); i++) {

src/ui/view/MyCanvas.java

@@ -51,7 +51,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			}
 		});
 
-		img = new ImageIcon(this.getClass().getResource("/Images/house.png")).getImage()
+		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
 				.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
 		
 		this.addMouseListener(this);