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

src/ui/view/GUI.java

@@ -210,9 +210,8 @@ public class GUI implements CategoryListener {
 	private final JMenuItem mItemSwitch = new JMenuItem("Switch");
 	private final JMenuItem mItemBattery = new JMenuItem("Battery");
 	private final JButton btnDel = new JButton("Delete");
-	private final JButton btnAddHolEL = new JButton("New");
-	private final JButton btnDelHolEL = new JButton("Delete");
-	private final JLabel lblElement = new JLabel("[Element]");
+	private final JButton btnAddHolEL = new JButton("New Element");
+	private final JButton btnDelHolEL = new JButton("Delete Element");
 	private final JButton resetGraphBtn = new JButton("Reset");
 
 	private final JToolBar toolBar = new JToolBar();
@@ -1148,7 +1147,6 @@ public class GUI implements CategoryListener {
 		panelHolonEl.setLayout(new BoxLayout(panelHolonEl, BoxLayout.X_AXIS));
 		toolBarHolonEl.add(btnAddHolEL);
 		toolBarHolonEl.add(btnDelHolEL);
-		toolBarHolonEl.add(lblElement);
 		toolBarHolonEl.setFloatable(false);
 		panelHolonEl.add(toolBarHolonEl);