Convention applied:

[jfinancials-lib.git] / Addressbook / src / org / mxchange / addressbook / application / AddressbookApplication.java

diff --git a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
index 7799aca1788c14dc7b3658d8cd7597176a52c2fb..2d3237a6bb74e056ac3cd3f232e89c5b18b2aac9 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
+++ b/Addressbook/src/org/mxchange/addressbook/application/AddressbookApplication.java
@@ -17,6 +17,7 @@
 package org.mxchange.addressbook.application;\r
 \r
 import org.mxchange.addressbook.BaseFrameworkSystem;\r
+import org.mxchange.addressbook.UnhandledUserChoiceException;\r
 import org.mxchange.addressbook.client.Client;\r
 import org.mxchange.addressbook.client.console.ConsoleClient;\r
 import org.mxchange.addressbook.manager.application.ApplicationManager;\r
@@ -130,7 +131,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli
      */\r
     public static void main (String[] args) {\r
        // Start application\r
-       new AddressbookApplication().start ();\r
+       new AddressbookApplication().start();\r
     }\r
 \r
     /**\r
@@ -164,14 +165,14 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli
        this.getClient().setCurrentMenu("main");\r
 \r
        // --- Main loop starts here ---\r
-       while (this.getClient().isApplicationRunning()) {\r
+       while (this.getClient().isRunning()) {\r
            // The application is still active, show menu selection\r
            this.getClient().showCurrentMenu();\r
 \r
            try {\r
                // Ask for user input and run proper method\r
-               this.getClient().doUserChoice();\r
-           } catch (final Exception ex) {\r
+               this.getClient().doUserMenuChoice();\r
+           } catch (final UnhandledUserChoiceException ex) {\r
                this.getLogger().catching(ex);\r
            }\r
        }\r
@@ -196,7 +197,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli
        this.getLogger().info("Program is started.");\r
 \r
        // Launch application\r
-       ApplicationManager.getManager(this).start ();\r
+       ApplicationManager.getManager(this).start();\r
 \r
        this.getLogger().info("End of program (last line)");\r
     }\r