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

src/ui/view/UpperNodeCanvas.java

@@ -957,9 +957,6 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			// for (AbstractCpsObject temp : model.getSelectedCpsObjects()) {
 			// System.out.println(temp.getName() + " " + temp.getID());
 			// }
-			updCon.paintProperties(tempCps);
-			updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
-			updCon.refreshTableProperties(model.getPropertyTable());
 			repaint();
 		}
 	}
@@ -1043,7 +1040,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		}
 
 		controller.calculateStateForTimeStep(model.getCurIteration());
-
+		updCon.paintProperties(tempCps);
+		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
+		updCon.refreshTableProperties(model.getPropertyTable());
 		repaint();
 
 	}