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

src/ui/view/AboutUsPopUp.java

@@ -28,10 +28,10 @@ public class AboutUsPopUp extends JFrame {
 	private JLabel credits = new JLabel();
 
 	/**
-	 * Constructor.
+	 * Constructor
 	 */
 	public AboutUsPopUp() {
-		super("About Us");
+		super(Languages.getLanguage()[14]);
 		this.setIconImage(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
 				.getScaledInstance(30, 30, Image.SCALE_SMOOTH));
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);

src/ui/view/GUI.java

@@ -837,12 +837,12 @@ public class GUI<E> implements CategoryListener {
 									eleTemp.setAmount(iTemp);
 								}
 							}
-							refreshTableProperties();
-							tableModelHolonElementSingle.fireTableDataChanged();
-							controller.calculateStateForTimeStep(model.getCurIteration());
-							unitGraph.repaint();
 						}
 					}
+					refreshTableProperties();
+					tableModelHolonElementSingle.fireTableDataChanged();
+					controller.calculateStateForTimeStep(model.getCurIteration());
+					unitGraph.repaint();
 				} catch (Exception e) {
 
 				}
@@ -920,10 +920,8 @@ public class GUI<E> implements CategoryListener {
 					}
 					canvas.repaint();
 				} catch (Exception e) {
-
 				}
 			}
-
 		});
 
 		/***********************