search by ID

src/ui/controller/CanvasController.java

@@ -20,10 +20,10 @@ public class CanvasController {
 	 *            CpsObject to be added.
 	 */
 	public void addObjectIntoCanvas(CpsObject object) {
-		String name = object.getObjName();
+		String objName = object.getObjName();
 		MODEL.getObjectsOnCanvas().add(object);
 		notifyObjListeners();
-		System.out.println("Added: " + name);
+		System.out.println("Added: " + objName);
 	}
 	
 	public void addObjectListener(ObjectListener objLis) {

src/ui/controller/Control.java

@@ -94,6 +94,10 @@ public class Control {
 		objectController.deleteElementInCanvas(id, element);
 	}
 
+	public CpsObject searchByID(int ID){
+		return searchByID(ID);
+	}
+	
 	/* Global Operations*/
 	public int getScale(){
 		return globalController.getScale();

src/ui/controller/ObjectController.java

@@ -12,9 +12,6 @@ import Interfaces.ObjectListener;
 
 public class ObjectController {
 
-	public enum Type {
-		CONSUMER, PRODUCER
-	}
 
 	private Model MODEL;
 
@@ -116,7 +113,7 @@ public class ObjectController {
 	 * @param amount
 	 */
 	public void deleteElementInCanvas(int ID, String ele) {
-		HolonObject object = searchByID(ID, MODEL.getObjectsOnCanvas());
+		HolonObject object = (HolonObject) searchByID(ID);
 		HolonElement element = searchHolonElement(object, ele);
 
 //		element.setAmount(element.getAmount() - amount);
@@ -170,10 +167,10 @@ public class ObjectController {
 	 * @param list
 	 * @return
 	 */
-	public HolonObject searchByID(int ID, ArrayList<CpsObject> list){
-		for (CpsObject objects : list) {
+	public CpsObject searchByID(int ID){
+		for (CpsObject objects : MODEL.getObjectsOnCanvas()) {
 			if(objects.getID() == ID)
-				return (HolonObject) objects;
+				return objects;
 		}
 		return null;
 	}