IdCounter fixed (Warning: Each time that a HolonObj is created in a Category, an ID is given!)

src/classes/CpsObject.java

@@ -32,6 +32,7 @@ public abstract class CpsObject implements ComparableObject {
 		position = new Position();
 		id = iDCounter.nextId();
 		image = "/Images/Dummy_House.png";
+//		System.out.println("ID: " + id + " of " + objName);
 	}
 
 	public CpsObject(CpsObject obj) {

src/ui/controller/CanvasController.java

@@ -7,11 +7,11 @@ import ui.model.Model;
 
 public class CanvasController {
 
-	private iDCounter ID;
+//	private iDCounter ID;
 	private Model MODEL;
 
-	public CanvasController(Model model, iDCounter id) {
-		this.ID = id;
+	public CanvasController(Model model) {
+//		this.ID = id;
 		this.MODEL = model;
 	}
 

src/ui/controller/CategoryController.java

@@ -18,11 +18,11 @@ import ui.view.*;
 
 public class CategoryController {
 
-	private iDCounter ID;
+//	private iDCounter ID;
 	private Model MODEL;
 
-	public CategoryController(Model model, iDCounter id) {
-		this.ID = id;
+	public CategoryController(Model model) {
+//		this.ID = id;
 		this.MODEL = model;
 		initCategories();
 	}

src/ui/controller/Control.java

@@ -19,7 +19,7 @@ public class Control {
 		CATEGORY, OBJECT
 	}
 
-	private iDCounter ID;
+//	private iDCounter ID;
 	private Model MODEL;
 	
 	private ActionListener actionListener;
@@ -28,12 +28,12 @@ public class Control {
 	private final ObjectController objectController;
 	private final CanvasController canvasController;
 
-	public Control(Model model, iDCounter id) {
+	public Control(Model model) {
 		this.MODEL = model;
-		this.ID = id;
-		this.categoryController = new CategoryController(model, id);
+//		this.ID = id;
+		this.categoryController = new CategoryController(model);
 		this.objectController = new ObjectController(model);
-		this.canvasController = new CanvasController(model, id);
+		this.canvasController = new CanvasController(model);
 	}
 
 	/* Operations for Categories and Objects */
@@ -93,7 +93,9 @@ public class Control {
 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
 	}
 	
-	public void deleteElement()
+	public void deleteElement(){
+		
+	}
 
 	////////// etc
 	/**

src/ui/controller/ObjectController.java

@@ -18,11 +18,11 @@ public class ObjectController {
 	}
 
 	private Model MODEL;
-	private int ID;
+//	private int ID;
 
 	public ObjectController(Model model) {
 		this.MODEL = model;
-		this.ID = iDCounter.nextId();
+//		this.ID = iDCounter.nextId();
 		initHolonElements();
 	}
 	

src/ui/model/tests.java

@@ -8,7 +8,7 @@ import ui.controller.CategoryController;
 public class tests {
 	
 	public static void main(String[] args){
-		CategoryController cc = new CategoryController(new Model(), new iDCounter());
+		CategoryController cc = new CategoryController(new Model());
 		ArrayList<Category> cats = new ArrayList<Category>();
 		cats.add(new Category("sup"));
 		boolean value;

src/ui/view/Main.java

@@ -27,7 +27,7 @@ public class Main {
 				try {
 					iDCounter ID = new iDCounter();
 					Model MODEL = new Model();
-					Control CONTROL = new Control(MODEL, ID);
+					Control CONTROL = new Control(MODEL);
 					GUI VIEW = new GUI(CONTROL);
 
 					VIEW.getFrmCyberPhysical().setVisible(true);