X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Faddressbook%2Fclient%2FBaseAddressbookClient.java;h=b566d764854f8681ddbc63338de9c20c27b812e8;hb=528eeece943480f5a89d0067cfb6e4cb86f528b5;hp=effa814cc046867f8493481c1733f0e5ff2171cc;hpb=d320d13f3f26ab01c36a7d6857918b141977454a;p=addressbook-swing.git diff --git a/src/org/mxchange/addressbook/client/BaseAddressbookClient.java b/src/org/mxchange/addressbook/client/BaseAddressbookClient.java index effa814..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,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 *
- * @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;
}
@@ -92,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) {
@@ -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
*
* @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
*
* @return Map of all menus
*/
- protected final Map