Introduced own exception + added first sub menu for changing address data

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

diff --git a/Addressbook/src/org/mxchange/addressbook/UnhandledUserChoiceException.java b/Addressbook/src/org/mxchange/addressbook/UnhandledUserChoiceException.java
new file mode 100644 (file)
index 0000000..e97f20a
--- /dev/null
+++ b/Addressbook/src/org/mxchange/addressbook/UnhandledUserChoiceException.java
@@ -0,0 +1,30 @@
+/*\r
+ * Copyright (C) 2015 Roland Haeder\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ */\r
+package org.mxchange.addressbook;\r
+\r
+/**\r
+ * This exception is thrown when the user made a valid choice but it was not\r
+ * handled by the program.\r
+ * \r
+ * @author Roland Haeder\r
+ */\r
+public class UnhandledUserChoiceException extends Exception {\r
+\r
+    public UnhandledUserChoiceException (final String message) {\r
+       super(message);\r
+    }\r
+}\r

diff --git a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
index 7799aca1788c14dc7b3658d8cd7597176a52c2fb..44fe4684cc5cffc000efaf930e1293f04d42054d 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
+++ b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
@@ -170,7 +170,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli
 \r
            try {\r
                // Ask for user input and run proper method\r
-               this.getClient().doUserChoice();\r
+               this.getClient().doUserMenuChoice();\r
            } catch (final Exception ex) {\r
                this.getLogger().catching(ex);\r
            }\r

diff --git a/Addressbook/src/org/mxchange/addressbook/client/Client.java b/Addressbook/src/org/mxchange/addressbook/client/Client.java
index 545389447fecdd1284b8c8a6809d289bdc98ca90..2c4336c5b9f8509732f3c90188cd1c4fbfde931f 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/client/Client.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/Client.java
@@ -16,6 +16,7 @@
  */\r
 package org.mxchange.addressbook.client;\r
 \r
+import org.mxchange.addressbook.UnhandledUserChoiceException;\r
 import org.mxchange.addressbook.FrameworkInterface;\r
 import org.mxchange.addressbook.contact.Contact;\r
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;\r
@@ -54,11 +55,19 @@ public interface Client extends FrameworkInterface {
      */\r
     public void displayOtherDataBox (final Contact contact);\r
 \r
+    /**\r
+     * Let the user choose what to change on the address: [n]ame, [a]ddress,\r
+     * [o]ther\r
+     * @param contact Contact instance to let the user change data\r
+     * @throws UnhandledUserChoiceException If choice is not supported\r
+     */\r
+    public void doUserChangeAdressChoice (final Contact contact) throws UnhandledUserChoiceException;\r
+\r
     /**\r
      * Asks the user for a choice and proceeds accordingly\r
-     * @throws java.lang.Exception\r
+     * @throws UnhandledUserChoiceException If choice is not supported\r
      */\r
-    public void doUserChoice () throws Exception ;\r
+    public void doUserMenuChoice () throws UnhandledUserChoiceException ;\r
 \r
     /**\r
      * Enables isRunning attribute which singals that the client is running\r

diff --git a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index 66ace076bbaac91b8e6e8dab71de97b36f9e2684..36c6faab4aab073962a392f34009c2299d7b6b5f 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.HashMap;\r
 import java.util.Map;\r
 import java.util.Scanner;\r
+import org.mxchange.addressbook.UnhandledUserChoiceException;\r
 import org.mxchange.addressbook.application.AddressbookApplication;\r
 import org.mxchange.addressbook.application.Application;\r
 import org.mxchange.addressbook.client.BaseClient;\r
@@ -128,12 +129,41 @@ public class ConsoleClient extends BaseClient implements Client {
     }\r
 \r
     @Override\r
-    public void doUserChoice () throws Exception {\r
+    public void doUserChangeAdressChoice (final Contact contact) throws UnhandledUserChoiceException {\r
+       // Ask the user for editing [name], [a]ddress or [other] data\r
+       char choice = this.enterChar(new char[]{'n', 'a', 'o', 'x'}, "Welchen Daten möchten Sie ändern? (n=Namensdaten, a=Anschriftsdaten, o=Andere, x=Zurück zur Hauptauswahl) ");\r
+\r
+       // @TODO Get rid of this ugly switch block, too\r
+       switch (choice) {\r
+           case 'n': // Name data\r
+               this.getContactManager().changeNameData(contact);\r
+               break;\r
+\r
+           case 'a': // Address data\r
+               this.getContactManager().changeAddressData(contact);\r
+               break;\r
+\r
+           case 'o': // Other data\r
+               this.getContactManager().changeOtherData(contact);\r
+               break;\r
+\r
+           case 'x': // Exit this menu\r
+               // Ignored as it should go back\r
+               break;\r
+\r
+           default:\r
+               // @TODO throw own exception\r
+               throw new UnhandledUserChoiceException("Choice '" + choice + "' not handled yet.");\r
+       }\r
+    }\r
+\r
+    @Override\r
+    public void doUserMenuChoice () throws UnhandledUserChoiceException {\r
        // Get all access keys from menu\r
        char[] accessKeys = MenuTools.getAccessKeysFromMenuMap(this.menus, this.getCurrentMenu());\r
 \r
        // Output textural message and ask for a char as input\r
-       char choice = this.enterChar(accessKeys, "Bitte Auswahl eingeben (0=Beenden/Zurück in's vorherhige Menü): ");\r
+       char choice = this.enterChar(accessKeys, "Bitte Auswahl eingeben (0=Programm beenden): ");\r
 \r
        // @TODO Rewrite this ugly switch() block\r
        switch (choice) {\r
@@ -162,8 +192,8 @@ public class ConsoleClient extends BaseClient implements Client {
                break;\r
        \r
            default:\r
-               // @TODO throw on exception\r
-               throw new Exception("choice " + choice + " invalid");\r
+               // @TODO throw own exception\r
+               throw new UnhandledUserChoiceException("Choice '" + choice + "' not handled yet.");\r
        }\r
     }\r
 \r

diff --git a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
index 80cffd3ce5eab8f2d54ea5d854fe29fb8907fc6b..e4e842ce19c66b07cfead9708e723045bcca0787 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
+++ b/Addressbook/src/org/mxchange/addressbook/manager/contact/ContactManager.java
@@ -88,6 +88,26 @@ public class ContactManager extends BaseManager implements ManageableContact {
        throw new UnsupportedOperationException("Not supported yet.");\r
     }\r
 \r
+    /**\r
+     * Let the user change address data\r
+     * \r
+     * @param contact Instance to change data\r
+     */\r
+    @Override\r
+    public void changeAddressData (final Contact contact) {\r
+       throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.\r
+    }\r
+\r
+    /**\r
+     * Let the user change "name data"\r
+     * \r
+     * @param contact Instance to change data\r
+     */\r
+    @Override\r
+    public void changeNameData (final Contact contact) {\r
+       throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.\r
+    }\r
+\r
     /**\r
      * Let the user change other address\r
      */\r
@@ -96,6 +116,16 @@ public class ContactManager extends BaseManager implements ManageableContact {
        throw new UnsupportedOperationException("Not supported yet.");\r
     }\r
 \r
+    /**\r
+     * Let the user change other data\r
+     *\r
+     * @param contact Instance to change data\r
+     */\r
+    @Override\r
+    public void changeOtherData (final Contact contact) {\r
+       throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.\r
+    }\r
+\r
     /**\r
      * Allows the user to change his/her own data\r
      */\r
@@ -122,8 +152,12 @@ public class ContactManager extends BaseManager implements ManageableContact {
        // Display contact\r
        contact.show(this.getClient());\r
 \r
-       // @TODO Unfinished\r
-       throw new UnsupportedOperationException("Method is not finished.");\r
+       try {\r
+           // Ask user what to change\r
+           this.getClient().doUserChangeAdressChoice(contact);\r
+       } catch (final Exception ex) {\r
+           this.getLogger().catching(ex);\r
+       }\r
     }\r
 \r
     /**\r

diff --git a/Addressbook/src/org/mxchange/addressbook/manager/contact/ManageableContact.java b/Addressbook/src/org/mxchange/addressbook/manager/contact/ManageableContact.java
index 03bdd8eb0444ffaffc2bd52897924f3c12f3c441..ac0db41e70bb1ea0f11aba9ba90d70b59bb13062 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/manager/contact/ManageableContact.java
+++ b/Addressbook/src/org/mxchange/addressbook/manager/contact/ManageableContact.java
@@ -37,11 +37,34 @@ public interface ManageableContact extends Manageable {
      */\r
     public void addOtherAddress ();\r
 \r
+    /**\r
+     * The user can change address data, like street, ZIP code, city and country\r
+     * of given Contact instance.\r
+     * \r
+     * @param contact Instance to change data\r
+     */\r
+    public void changeAddressData (final Contact contact);\r
+\r
+    /**\r
+     * The user can change name data, like gender, surname, family name and\r
+     * company name (if business contact).\r
+     * \r
+     * @param contact Instance to change data\r
+     */\r
+    public void changeNameData (final Contact contact);\r
+\r
     /**\r
      * Let the user change other address\r
      */\r
     public void changeOtherAddress ();\r
 \r
+    /**\r
+     * The user can change other data, like phone numbers or comments.\r
+     * \r
+     * @param contact Instance to change data\r
+     */\r
+    public void changeOtherData (final Contact contact);\r
+\r
     /**\r
      * Let the user change own data\r
      */\r