Sorted some members + added 2 menu entries: list and search

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java b/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
index 6282a42062d4520e5f7fe576ec33e1fd2eaee1d5..02d00b65808179e9c8231d88b7ffbb7671da1bfe 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
+++ b/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
@@ -57,11 +57,17 @@ public class AddressbookMenu extends BaseFrameworkSystem {
                // Add new addess\r
                menuList.add(client.getMenuItem('3', "Neue Adresse hinzufügen"));\r
 \r
+               // List entries\r
+               menuList.add(client.getMenuItem('4', "Adressbuch anzeigen"));\r
+\r
+               // Address search\r
+               menuList.add(client.getMenuItem('5', "Adresse suchen"));\r
+\r
                // Change other address\r
-               menuList.add(client.getMenuItem('4', "Adresse ändern"));\r
+               menuList.add(client.getMenuItem('6', "Adresse ändern"));\r
 \r
                // Delete other address\r
-               menuList.add(client.getMenuItem('5', "Adresse löschen"));\r
+               menuList.add(client.getMenuItem('7', "Adresse löschen"));\r
 \r
                // Always last line: Exit program\r
                menuList.add(client.getMenuItem('0', "Programm verlassen"));\r

diff --git a/Addressbook/src/org/mxchange/addressbook/menu/console/BaseMenu.java b/Addressbook/src/org/mxchange/addressbook/menu/console/BaseMenu.java
index 02bc5b6372006850dfdd4104725f333697b7417b..afa83c391c415706fe853d6c963ae6e2bce739a2 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/menu/console/BaseMenu.java
+++ b/Addressbook/src/org/mxchange/addressbook/menu/console/BaseMenu.java
@@ -41,6 +41,14 @@ public class BaseMenu extends BaseFrameworkSystem {
        super();\r
     }\r
 \r
+    /**\r
+     * Size of menu items\r
+     * @return Count of menu items\r
+     */\r
+    public int getMenuItemsCount () {\r
+       return this.menuList.size();\r
+    }\r
+\r
     /**\r
      * "Getter" for an iterator of this menu's items\r
      *\r
@@ -50,14 +58,6 @@ public class BaseMenu extends BaseFrameworkSystem {
        return this.menuList.iterator();\r
     }\r
 \r
-    /**\r
-     * Size of menu items\r
-     * @return Count of menu items\r
-     */\r
-    public int getMenuItemsCount () {\r
-       return this.menuList.size();\r
-    }\r
-\r
     /**\r
      * Shows this menu\r
      * \r

diff --git a/Addressbook/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java b/Addressbook/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java
index 85a784d89dc253ec7a804baada8bb464911f6dc8..37f9c7cacbdaff13dcf07baa71c313a23b8ecb86 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java
+++ b/Addressbook/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java
@@ -55,6 +55,14 @@ public class ConsoleMenuItem extends BaseMenuItem implements SelectableMenuItem
        return this.accessKey;\r
     }\r
 \r
+    /**\r
+     * Access key\r
+     * @param accessKey the accessKey to set\r
+     */\r
+    private void setAccessKey (char accessKey) {\r
+       this.accessKey = accessKey;\r
+    }\r
+\r
     /**\r
      * Text to user\r
      * @return the text\r
@@ -64,12 +72,6 @@ public class ConsoleMenuItem extends BaseMenuItem implements SelectableMenuItem
        return this.text;\r
     }\r
 \r
-    @Override\r
-    public void show (final Client client) {\r
-       // Call-back client over menu\r
-       client.showEntry(this);\r
-    }\r
-\r
     /**\r
      * Text to user\r
      * @param text the text to set\r
@@ -78,12 +80,10 @@ public class ConsoleMenuItem extends BaseMenuItem implements SelectableMenuItem
        this.text = text;\r
     }\r
 \r
-    /**\r
-     * Access key\r
-     * @param accessKey the accessKey to set\r
-     */\r
-    private void setAccessKey (char accessKey) {\r
-       this.accessKey = accessKey;\r
+    @Override\r
+    public void show (final Client client) {\r
+       // Call-back client over menu\r
+       client.showEntry(this);\r
     }\r
     \r
 }\r