X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Faddressbook%2Fclient%2FBaseAddressbookClient.java;h=b566d764854f8681ddbc63338de9c20c27b812e8;hb=528eeece943480f5a89d0067cfb6e4cb86f528b5;hp=094d0ecee9a485b2d3369cbbb86dfc1658b0a0fd;hpb=16624bae7209070f842d14159924d85a320c362d;p=addressbook-swing.git diff --git a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java index 094d0ec..b566d76 100644 --- 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,22 +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 *
- * @author Roland Haeder TODO: Find better name
+ * @author Roland Häder
* @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;
}
@@ -90,6 +92,7 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
* "Getter" for given menu type
*
* @param menuType Menu type instance to return
+ *
* @return Menu or null if not found
*/
private Menu getMenu (final String menuType) {
@@ -106,18 +109,40 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
return menu;
}
+ /**
+ * Logs exception and exits program
+ *
+ * @param throwable Throwable
+ */
+ protected void abortProgramWithException (final Throwable throwable) {
+ // Log exception
+ this.logException(throwable);
+
+ // Abort here
+ System.exit(1);
+ }
+
/**
* Fills menu map with swing menus
*/
protected abstract void fillMenuMap ();
+ /**
+ * Getter for loggerBeanLocal instance
+ *
+ * @return Logger instance
+ */
+ protected LoggerBeanLocal getLoggerBeanLocal () {
+ return this.loggerBeanLocal;
+ }
+
/**
* Getter for menus map
*
* @return Map of all menus
*/
- protected final Map
+ * @param throwable Throwable
+ */
+ protected void logException (final Throwable throwable) {
+ // Deligate to loggerBeanLocal
+ this.getLoggerBeanLocal().logException(throwable);
}
/**
@@ -153,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);
@@ -169,38 +204,6 @@ public abstract class BaseAddressbookClient extends BaseClient implements Addres
menu.show(this);
// Trace message
- this.getLogger().logTrace("EXIT!"); //NOI18N
- }
-
- /**
- * Getter for logger instance
- *
- * @return Logger instance
- */
- protected LoggerBeanLocal getLogger () {
- return this.logger;
- }
-
- /**
- * Logs an exception
- *
- * @param throwable Throwable
- */
- protected void logException (final Throwable throwable) {
- // Deligate to logger
- this.getLogger().logException(throwable);
- }
-
- /**
- * Logs exception and exits program
- *
- * @param throwable Throwable
- */
- protected void abortProgramWithException (final Throwable throwable) {
- // Log exception
- this.logException(throwable);
-
- // Abort here
- System.exit(1);
+ this.getLoggerBeanLocal().logTrace("EXIT!"); //NOI18N
}
}