some updates :D

src/ui/controller/UpdateController.java

@@ -202,12 +202,17 @@ public class UpdateController {
 	 * @return selected CpsObject
 	 */
 	public AbstractCpsObject getActualCps() {
-		int tempID = model.getSelectedObjectID();
-		//System.out.println(model.getSelectedObjectID());
-		AbstractCpsObject tempCps = controller.searchByID(tempID);
+		AbstractCpsObject tempCps = null;
+		if (model.getSelectedCpsObjects().size() == 1) {
+			tempCps = model.getSelectedCpsObjects().get(0);
+		} else {
+			int tempID = model.getSelectedObjectID();
+			// System.out.println(model.getSelectedObjectID());
+			tempCps = controller.searchByID(tempID);
+		}
 		return tempCps;
 	}
-	
+
 	/**
 	 * Getter for selected CpsObject.
 	 * 
@@ -218,8 +223,6 @@ public class UpdateController {
 		AbstractCpsObject tempCps = controller.searchByIDUpperNode(tempID, canvas.upperNode);
 		return tempCps;
 	}
-	
-	
 
 	public void paintProperties(AbstractCpsObject obj) {
 		if (obj != null) {

src/ui/view/GUI.java

@@ -780,7 +780,7 @@ public class GUI<E> implements CategoryListener {
 				HolonObject obj = null;
 				if (model.getSelectedCpsObjects().size() == 1
 						&& model.getSelectedCpsObjects().get(0) instanceof HolonObject) {
-					obj = (HolonObject) model.getSelectedCpsObjects().get(0);
+					obj = (HolonObject) updCon.getActualCps();
 				}
 				yValueElements = e.getY();
 				HolonElement ele = null;
@@ -1886,6 +1886,8 @@ public class GUI<E> implements CategoryListener {
 				@Override
 				public void mousePressed(MouseEvent e) {
 					unitGraph.empty();
+					holonEleNamesDisplayed = "None ";
+					elementGraph.setText(holonEleNamesDisplayed);
 					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
 							.getComponent(0)).tempCps;
 					if (doubleClick() && MouseEvent.BUTTON3 != e.getButton() && temp instanceof CpsUpperNode) {