Remove HolonElement updates (still with bugs)

src/ui/controller/Control.java

@@ -103,6 +103,9 @@ public class Control {
 	public void deleteElementCanvas(int id, String element) {
 		objectController.deleteElementInCanvas(id, element);
 	}
+	public void deleteElementCanvas(HolonObject obj, HolonElement ele) {
+		objectController.deleteElement(obj, ele);
+	}
 
 	public CpsObject searchByID(int ID){
 		return objectController.searchByID(ID);

src/ui/model/idCounter.java

@@ -1,10 +1,10 @@
 package ui.model;
 
 public class idCounter {
-	private static int counter = 0;
+	private static int counter = 1;
 
 	public static synchronized int nextId() {
-		return ++counter;
-		
+		return counter++;
+
 	}
 }

src/ui/view/GUI.java

@@ -21,6 +21,7 @@ import javax.swing.JTable;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 
+import com.sun.javafx.TempState;
 import com.sun.xml.internal.bind.v2.TODO;
 
 import ui.controller.Control;
@@ -191,8 +192,9 @@ public class GUI implements CategoryListener {
 		frmCyberPhysical.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
 		frmCyberPhysical.setJMenuBar(menuBar);
-		
-		frmCyberPhysical.setIconImage(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30, Image.SCALE_SMOOTH));
+
+		frmCyberPhysical.setIconImage(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
+				.getScaledInstance(30, 30, Image.SCALE_SMOOTH));
 
 		menuBar.add(mnNewMenu);
 
@@ -293,15 +295,17 @@ public class GUI implements CategoryListener {
 				if (tempCps != null && tempCps.getClass() == HolonObject.class) {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
-					((HolonObject) tempCps).addElements(addElementPopUp.getElement());
+					controller.addElementCanvasObject(tempCps.getName(), addElementPopUp.getElement().getEleName(),
+							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
 				}
 			}
 		});
 		toolBarHolonEl.add(btnDelHolEL);
 		btnDelHolEL.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
-				if (tempElement != null) {
-					((HolonObject) tempCps).getElements().remove(tempElement);
+				if (tempElement != null && tempCps.getClass() == HolonObject.class) {
+					System.out.println(tempCps.getID());
+					controller.deleteElementCanvas(tempCps.getID(), tempElement.getEleName());
 				}
 			}
 		});
@@ -309,7 +313,7 @@ public class GUI implements CategoryListener {
 		tableHolonElement.addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
 				int rowSelected = (int) Math.floor(e.getY() / 16);
-				if (tableHolonElement.getSelectedColumn() == 0 && tableHolonElement.getRowCount() >= rowSelected) {
+				if (tableHolonElement.getRowCount() > rowSelected) {
 					tempElement = ((HolonObject) tempCps).getElements().get(rowSelected);
 				} else {
 					tempElement = null;
@@ -483,7 +487,6 @@ public class GUI implements CategoryListener {
 		canvas.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent e) {
-
 				// Update of the Information about the HolonElements - only for
 				// HolonObjects
 				if (tableModelHolonElement.getRowCount() > 0) {