Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git into Ohne_Drag_and_Drop

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

@@ -17,6 +17,9 @@ 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;
 import ui.model.*;
 
@@ -155,9 +158,9 @@ public class GUI implements CategoryListener {
 		this.model = control.getModel();
 		this.canvas = new MyCanvas(model, control);
 		this.testgraph = new UnitGraph(model, control); // for testing, remove
-										
+
 		timePanel = new TimePanel(model, controller);
-				 
+
 		// later
 		control.initListener(this);
 		initialize();
@@ -278,15 +281,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) {
+				if (tempElement != null && tempCps.getClass() == HolonObject.class) {
-					((HolonObject) tempCps).getElements().remove(tempElement);
+					System.out.println(tempCps.getID());
+					controller.deleteElementCanvas(tempCps.getID(), tempElement.getEleName());
 				}
 			}
 		});
@@ -294,7 +299,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;
@@ -468,7 +473,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) {
@@ -652,7 +656,6 @@ public class GUI implements CategoryListener {
 		split_Graph_HolonEl.setTopComponent(scrollGraph);
 		split_Graph_HolonEl.setBottomComponent(scrollElements);
 
-		
 		frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
 	}
 

src/ui/view/Main.java

@@ -29,9 +29,6 @@ public class Main {
 					Model MODEL = new Model();
 					Control CONTROL = new Control(MODEL);
 					GUI VIEW = new GUI(CONTROL);
-					
-					
-					
 
 					VIEW.getFrmCyberPhysical().setVisible(true);