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

src/ui/view/GUI.java

@@ -266,7 +266,7 @@ public class GUI<E> implements CategoryListener {
 	private AbstractCpsObject temp = null;
 	private final JMenuItem mntmUndo = new JMenuItem("Undo");
 	private final JMenuItem mntmRedo = new JMenuItem("Redo");
-	private final JMenuItem mntmEditEdges = new JMenuItem("Edit Edges");
+	private final JMenuItem mntmEditEdges = new JMenuItem("Edge Properties");
 	private final JMenuItem mntmFindReplace = new JMenuItem("Find/ Replace");
 	private final JMenuItem mntmEditShowedInformation = new JMenuItem("Edit showed Information");
 	private final JMenuItem mntmResetCategory = new JMenuItem("Reset Categories");
@@ -689,8 +689,7 @@ public class GUI<E> implements CategoryListener {
 		});
 
 		mnNewMenuEdit.add(mntmEditShowedInformation);
-
-		menuBar.add(mnNewMenuOptions);
+		mnNewMenuEdit.add(mntmEditEdges);
 		mntmEditEdges.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				EditEdgesPopUp edgePopUp = new EditEdgesPopUp();
@@ -700,7 +699,7 @@ public class GUI<E> implements CategoryListener {
 			}
 		});
 
-		mnNewMenuOptions.add(mntmEditEdges);
+		menuBar.add(mnNewMenuOptions);
 
 		mnNewMenuOptions.add(mntmResetCategory);
 		mntmResetCategory.addActionListener(new ActionListener() {