Continued:

[addressbook-swing.git] / src / org / mxchange / addressbook / client / BaseAddressbookClient.java

diff --git a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
index effa814cc046867f8493481c1733f0e5ff2171cc..b566d764854f8681ddbc63338de9c20c27b812e8 100644 (file)
--- a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
+++ b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Roland Haeder
+ * Copyright (C) 2016 - 2020 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,23 +18,23 @@ package org.mxchange.addressbook.client;
 
 import java.sql.SQLException;
 import java.text.MessageFormat;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.addressbook.manager.contact.AddressbookContactManager;
-import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook;
+import org.mxchange.addressbook.facade.contact.AddressbookContactFacade;
+import org.mxchange.addressbook.facade.contact.ContactFacade;
 import org.mxchange.addressbook.menu.Menu;
 import org.mxchange.jcore.client.BaseClient;
-import org.mxchange.jcore.client.Client;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
 
 /**
  * A general addressbook client
  * <p>
- * @author Roland Haeder TODO: Find better name
+ * @author Roland Häder<roland@mxchange.org> TODO: Find better name
  */
 public abstract class BaseAddressbookClient extends BaseClient implements AddressbookClient {
 
@@ -47,7 +47,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         * Logger instance
         */
        @Log
-       private LoggerBeanLocal logger;
+       private LoggerBeanLocal loggerBeanLocal;
 
        /**
         * Menu system
@@ -66,8 +66,8 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
                        // Get context
                        Context context = new InitialContext();
 
-                       // Lookup logger
-                       this.logger = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal");
+                       // Lookup loggerBeanLocal
+                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new RuntimeException(ex);
@@ -79,12 +79,12 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         * <p>
         * @return the currentMenu
         */
-       public final String getCurrentMenu () {
+       public String getCurrentMenu () {
                return this.currentMenu;
        }
 
        @Override
-       public final void setCurrentMenu (final String currentMenu) {
+       public void setCurrentMenu (final String currentMenu) {
                this.currentMenu = currentMenu;
        }
 
@@ -92,6 +92,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         * "Getter" for given menu type
         * <p>
         * @param menuType Menu type instance to return
+        * <p>
         * @return Menu or null if not found
         */
        private Menu getMenu (final String menuType) {
@@ -116,7 +117,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
        protected void abortProgramWithException (final Throwable throwable) {
                // Log exception
                this.logException(throwable);
-               
+
                // Abort here
                System.exit(1);
        }
@@ -127,12 +128,12 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
        protected abstract void fillMenuMap ();
 
        /**
-        * Getter for logger instance
+        * Getter for loggerBeanLocal instance
         * <p>
         * @return Logger instance
         */
-       protected LoggerBeanLocal getLogger () {
-               return this.logger;
+       protected LoggerBeanLocal getLoggerBeanLocal () {
+               return this.loggerBeanLocal;
        }
 
        /**
@@ -140,8 +141,8 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         * <p>
         * @return Map of all menus
         */
-       protected final Map<String, Menu> getMenus () {
-               return this.menus;
+       protected Map<String, Menu> getMenus () {
+               return Collections.unmodifiableMap(this.menus);
        }
 
        /**
@@ -151,23 +152,23 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         */
        protected void initContactManager () throws SQLException {
                // Trace message
-               this.getLogger().logTrace("CALLED!"); //NOI18N
+               this.getLoggerBeanLocal().logTrace("CALLED!"); //NOI18N
 
                // Debug message
-               this.getLogger().logDebug("Initializing contact manager ..."); //NOI18N
+               this.getLoggerBeanLocal().logDebug("Initializing contact manager ..."); //NOI18N
 
-               // Init contact manager with console client
+               // Init contact facade with console client
                // TODO Static initial amount of contacts
-               ManageableContactAddressbook manager = new AddressbookContactManager((Client) this);
+               ContactFacade facade = new AddressbookContactFacade(this);
 
                // Set it here
-               this.setManager(manager);
+               this.setFacade(facade);
 
                // Debug message
-               this.getLogger().logDebug("Contact manager has been initialized."); //NOI18N
+               this.getLoggerBeanLocal().logDebug("Contact manager has been initialized."); //NOI18N
 
                // Trace message
-               this.getLogger().logTrace("EXIT!"); //NOI18N
+               this.getLoggerBeanLocal().logTrace("EXIT!"); //NOI18N
        }
 
        /**
@@ -176,8 +177,8 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         * @param throwable Throwable
         */
        protected void logException (final Throwable throwable) {
-               // Deligate to logger
-               this.getLogger().logException(throwable);
+               // Deligate to loggerBeanLocal
+               this.getLoggerBeanLocal().logException(throwable);
        }
 
        /**
@@ -187,7 +188,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
         */
        protected void showMenu (final String menuType) {
                // Trace message
-               this.getLogger().logTrace(MessageFormat.format("menuType={0} - CALLED!", menuType)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("menuType={0} - CALLED!", menuType)); //NOI18N
 
                // Get menu from type
                Menu menu = this.getMenu(menuType);
@@ -203,6 +204,6 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
                menu.show(this);
 
                // Trace message
-               this.getLogger().logTrace("EXIT!"); //NOI18N
+               this.getLoggerBeanLocal().logTrace("EXIT!"); //NOI18N
        }
 }