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

src/ui/controller/UpdateController.java

@@ -39,11 +39,12 @@ public class UpdateController {
 	 * Update the information concerning properties of the selected CpsObject.
 	 */
 	public void refreshTableProperties(DefaulTable table) {
-
 		if (model.getSelectedCpsObjects().size() == 1) {
 			AbstractCpsObject tempCps = model.getSelectedCpsObjects().get(0);
 			if (tempCps != null && tempCps.getClass() == HolonObject.class) {
-				table.removeRow(2);
+				if (table.getRowCount() != 0) {
+					table.removeRow(2);
+				}
 				Object[] tempEnergy = { Languages.getLanguage()[73], ((HolonObject) tempCps).getCurrentEnergy() };
 				table.insertRow(2, tempEnergy);
 			}
@@ -207,6 +208,7 @@ public class UpdateController {
 		if (model.getSelectedCpsObjects().size() == 1) {
 			tempCps = model.getSelectedCpsObjects().get(0);
 		} else {
+			// tempCps = model.getSelectedCpsObject();
 			int tempID = model.getSelectedObjectID();
 			// System.out.println(model.getSelectedObjectID());
 			tempCps = controller.searchByID(tempID);

src/ui/view/GUI.java

@@ -1313,7 +1313,7 @@ public class GUI<E> implements CategoryListener {
 					elementGraph.setText(Languages.getLanguage()[25]);
 				}
 				temp = updCon.getActualCps();
-
+				System.out.println(temp);
 				// Erase old data in the PropertyTable
 				if (model.getPropertyTable().getRowCount() > 0) {
 					for (int i = model.getPropertyTable().getRowCount() - 1; i > -1; i--) {
@@ -1342,15 +1342,12 @@ public class GUI<E> implements CategoryListener {
 
 			@Override
 			public void mouseReleased(MouseEvent e) {
-				updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
-				updCon.refreshTableProperties(model.getPropertyTable());
 				if (model.getSelectedCpsObjects().size() > 1) {
 					model.getTableHolonElement().setModel(model.getMultiTable());
 				} else if (model.getSelectedCpsObjects().size() == 1) {
 					model.getTableHolonElement().setModel(model.getSingleTable());
 				}
 			}
-
 		});
 
 		holonCanvas.addMouseListener(new MouseAdapter() {

src/ui/view/MyCanvas.java

@@ -38,6 +38,7 @@ import classes.HolonSwitch;
 import classes.Position;
 import classes.SubNet;
 import ui.controller.Control;
+import ui.controller.UpdateController;
 import ui.model.Model;
 
 /**
@@ -61,6 +62,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	private Position unPos;
 	private ArrayList<Position> savePos;
 
+	private UpdateController updCon;
+
 	ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
 	ArrayList<AbstractCpsObject> tempSelected = new ArrayList<AbstractCpsObject>();
 
@@ -132,6 +135,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		popmenu.add(itemTrack);
 		popmenu.add(itemUntrack);
 
+		updCon = new UpdateController(mod, control);
+
 		itemDelete.setEnabled(false);
 		itemCut.setEnabled(false);
 		itemCopy.setEnabled(false);
@@ -613,7 +618,14 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-
+		if (model.getPropertyTable().getRowCount() > 0) {
+			for (int i = model.getPropertyTable().getRowCount() - 1; i > -1; i--) {
+				model.getPropertyTable().removeRow(i);
+			}
+		}
+		updCon.paintProperties(tempCps);
+		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
+		updCon.refreshTableProperties(model.getPropertyTable());
 	}
 
 	@Override