Fixed and added more MySQL-related stuff

[jaddressbook-share-lib.git] / Addressbook / src / org / mxchange / addressbook / menu / AddressbookMenu.java

diff --git a/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java b/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
index 418a7cb1b784bf39c26c2618d481945ab803242a..af29b11fa065e17dafe51b66d4ce94bce5d05a53 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
+++ b/Addressbook/src/org/mxchange/addressbook/menu/AddressbookMenu.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.addressbook.menu;
 
+import java.text.MessageFormat;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import org.mxchange.addressbook.BaseFrameworkSystem;
@@ -40,15 +41,27 @@ public class AddressbookMenu extends BaseFrameworkSystem {
                // Get logger
                Logger log = new AddressbookMenu().getLogger();
 
+               // Trace call
+               log.trace(MessageFormat.format("menuList={0},menuType={1},client={2} - CALLED!", menuList, menuType, client)); //NOI18N
+
+               // Some instances must be set
+               if (menuList == null) {
+                       // Abort here
+                       throw new NullPointerException("menuList is null"); //NOI18N
+               } else if (client == null) {
+                       // Abort here
+                       throw new NullPointerException("contact is null"); //NOI18N
+               }
+
                // Get list size
                int size = menuList.size();
 
                // Debug message
-               log.debug("Adding menu for '" + menuType + "' (old size: '" + size + "') ...");
+               log.debug(MessageFormat.format("Adding menu for '{0}' (old size: '{1}') ...", menuType, size)); //NOI18N
 
                // Depends on type
                switch (menuType) {
-                       case "main": // Main menu
+                       case "main": // Main menu //NOI18N
                                // Enter own data
                                menuList.add(client.getMenuItem('1', "Eigene Adresse anlegen"));
 
@@ -75,7 +88,7 @@ public class AddressbookMenu extends BaseFrameworkSystem {
                                break;
 
                        default: // Not supported
-                               log.error("Menu type '" + menuType + "' ont supported");
+                               log.error(MessageFormat.format("Menu type '{0}' ont supported", menuType)); //NOI18N
                                System.exit(1);
                }