Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git into Ohne_Drag_and_Drop

src/ui/view/GUI.java

@@ -275,12 +275,14 @@ public class GUI implements CategoryListener {
 		toolBarHolonEl.add(btnAddHolEL);
 		btnAddHolEL.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
-				System.out.println(tempCps.getName() + " with ID: " + tempCps.getID());
-				if (tempCps != null && tempCps.getClass() == HolonObject.class && tempCps.getID() != 0) {
+				CpsObject tempCpsObject = getActualCps();
+				if (tempCpsObject != null && tempCpsObject.getClass() == HolonObject.class
+						&& tempCpsObject.getID() != 0) {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
-					controller.addElementCanvasObject(tempCps.getName(), addElementPopUp.getElement().getEleName(),
-							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
+					controller.addElementCanvasObject(tempCpsObject.getName(),
+							addElementPopUp.getElement().getEleName(), addElementPopUp.getElement().getAmount(),
+							addElementPopUp.getElement().getEnergy());
 				}
 			}
 		});
@@ -741,4 +743,11 @@ public class GUI implements CategoryListener {
 		return frmCyberPhysical;
 	}
 
+	public CpsObject getActualCps() {
+		return canvas.tempCps;
+	}
+
+	public ArrayList<HolonElement> getActualHolonElements(HolonObject obj) {
+		return obj.getElements();
+	}
 }