Add- and Delete- Buttons --> UpperNodes

src/ui/controller/ObjectController.java

@@ -86,7 +86,11 @@ public class ObjectController {
 	 */
 	public void addNewElementIntoCanvasObject(int id, String element, int amount, float energy) {
 		HolonElement ele = new HolonElement(element, amount, energy);
-		addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
+		if ((HolonObject) mpC.searchByID(id) == null) {
+			addElementIntoCanvasObject((HolonObject) model.getSelectedCpsObjects().get(0), ele);
+		} else {
+			addElementIntoCanvasObject((HolonObject) mpC.searchByID(id), ele);
+		}
 	}
 
 	/**
@@ -172,6 +176,9 @@ public class ObjectController {
 	 */
 	public void deleteElementInCanvas(int id, int eleid) {
 		HolonObject object = (HolonObject) mpC.searchByID(id);
+		if (object == null) {
+			object = (HolonObject) model.getSelectedCpsObjects().get(0);
+		}
 		HolonElement element = mpC.searchEleById(object, eleid);
 		// mpC.searchEle(object, ele);
 		deleteElement(object, element);

src/ui/view/GUI.java

@@ -728,6 +728,7 @@ public class GUI<E> implements CategoryListener {
 			public void actionPerformed(ActionEvent arg0) {
 				if (model.getSelectedCpsObjects().size() == 1) {
 					AbstractCpsObject tempCpsObject = updCon.getActualCps();
+					System.out.println(tempCpsObject.getName());
 					if (tempCpsObject != null && tempCpsObject.getClass() == HolonObject.class
 							&& tempCpsObject.getID() != 0) {
 						addElementPopUp = new AddElementPopUp();
@@ -777,6 +778,7 @@ public class GUI<E> implements CategoryListener {
 					model.getEleToDelete().clear();
 					selectedElements.clear();
 				}
+				updCon.refreshTableProperties(model.getPropertyTable());
 				elementGraph.setText("None ");
 				holonEleNamesDisplayed = "None ";
 			}