Cleaned up logger XML + renamed interface fixed

[addressbook-swing.git] / Addressbook / src / org / mxchange / addressbook / menu / BaseMenu.java

diff --git a/Addressbook/src/org/mxchange/addressbook/menu/BaseMenu.java b/Addressbook/src/org/mxchange/addressbook/menu/BaseMenu.java
index 73f3422db93b0ea38bc6354659e6fb514e6e3c4b..f5548207938051251ef209dfec785099e29c3b17 100644 (file)
--- a/Addressbook/src/org/mxchange/addressbook/menu/BaseMenu.java
+++ b/Addressbook/src/org/mxchange/addressbook/menu/BaseMenu.java
@@ -16,18 +16,20 @@
  */
 package org.mxchange.addressbook.menu;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.mxchange.addressbook.BaseFrameworkSystem;
-import org.mxchange.addressbook.client.Client;
+import org.mxchange.addressbook.BaseAddressbookSystem;
+import org.mxchange.addressbook.client.AddressbookClient;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
+import org.mxchange.jcore.client.Client;
 
 /**
  *
  * @author Roland Haeder
  */
-public class BaseMenu extends BaseFrameworkSystem {
+public class BaseMenu extends BaseAddressbookSystem {
 
        /**
         * Menu list
@@ -38,7 +40,6 @@ public class BaseMenu extends BaseFrameworkSystem {
         * No instance from this object
         */
        protected BaseMenu () {
-               super();
        }
 
        /**
@@ -65,6 +66,15 @@ public class BaseMenu extends BaseFrameworkSystem {
         * @param client Client instance to call back
         */
        public void show (final Client client) {
+               // Trace message
+               this.getLogger().trace(MessageFormat.format("client={0} CALLED!", client)); //NOI18N
+
+               // Client must not be null
+               if (client == null) {
+                       // Abort here
+                       throw new NullPointerException("client is null"); //NOI18N
+               }
+
                // Get values
                Iterator<SelectableMenuItem> iterator = this.menuList.iterator();
 
@@ -77,8 +87,11 @@ public class BaseMenu extends BaseFrameworkSystem {
                        SelectableMenuItem item = iterator.next();
 
                        // Show this item
-                       item.show(client);
+                       item.show((AddressbookClient) client);
                }
+
+               // Trace message
+               this.getLogger().trace("EXIT!"); //NOI18N
        }
 
        /**
@@ -97,7 +110,13 @@ public class BaseMenu extends BaseFrameworkSystem {
         * @param client CLient to call back
         */
        protected void initMenu (final String menuType, final Client client) {
+               // Trace message
+               this.getLogger().trace(MessageFormat.format("menuType={0},client={1} - CALLED!", menuType, client)); //NOI18N
+
                // Init menu list
                this.menuList = new ArrayList<>(5);
+
+               // Trace message
+               this.getLogger().trace("EXIT!"); //NOI18N
        }
 }