UpperNodeSearch, Delete in UpperNode

src/ui/controller/MultiPurposeController.java

@@ -5,6 +5,7 @@ import java.util.Map.Entry;
 
 import classes.Category;
 import classes.CpsEdge;
+import classes.CpsUpperNode;
 import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
@@ -114,6 +115,22 @@ public class MultiPurposeController {
 	public HolonElement searchEleById(HolonObject object, int idEle) {
 		return object.searchElementById(idEle);
 	}
+	
+	/**
+	 * 
+	 * @param upperNode
+	 * @param id
+	 * @return
+	 */
+	public AbstractCpsObject searchIDUpperNode(CpsUpperNode upperNode, int id) {
+		
+		Integer idx;
+
+		if ((idx = upperNode.getNodesIdx().get(id)) == null || upperNode.getNodesIdx().size() < 1)
+			return null;
+		else
+			return upperNode.getNodes().get(idx);
+	}
 
 	/**
 	 * Search Edge between 2 Objects.

src/ui/controller/NodeController.java

@@ -50,7 +50,7 @@ public class NodeController {
 	public void addObjectInUpperNode(AbstractCpsObject object, CpsUpperNode upperNode) {
 		object.setSav("UPPER" + upperNode.getID());
 		upperNode.getNodesIdx().put(object.getID(), upperNode.getNodes().size());
-		upperNode.getNodes().add(object);
+		upperNode.getNodes().add(object);	
 	}
 
 	/**

src/ui/view/UpperNodeCanvas.java

@@ -191,7 +191,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			public void actionPerformed(ActionEvent e) {
 				// Remove the selected Object objects
 				for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
-					controller.delCanvasObject(cps);
+					controller.delObjUpperNode(cps, UpperNode);
 				}
 				model.getSelectedCpsObjects().clear();
 				tempCps = null;