From: Roland Haeder Date: Fri, 2 Oct 2015 07:49:52 +0000 (+0200) Subject: Renaming season: renamed manager -> facade X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6bc8b327fa4f88651ae5cf733cf242cc82a242ae;p=addressbook-swing.git Renaming season: renamed manager -> facade Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 197b973..b78e9d0 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index e040f7a..b2da2d6 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -26,7 +26,7 @@ import org.mxchange.addressbook.application.AddressbookApplication; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.addressbook.client.BaseAddressbookClient; import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; -import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook; +import org.mxchange.addressbook.facade.contact.ContactFacade; import org.mxchange.addressbook.menu.Menu; import org.mxchange.addressbook.menu.MenuTools; import org.mxchange.addressbook.menu.console.ConsoleMenu; @@ -156,7 +156,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // Own street and number String streetNumber = manager.enterOwnStreet(); @@ -198,7 +198,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // Gender: Gender gender = manager.enterOwnGender(); @@ -240,7 +240,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // Phone number String phoneNumber = manager.enterOwnPhoneNumber(); @@ -274,7 +274,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC this.getLogger().logTrace("CALLED!"); //NOI18N // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // First ask for gender Gender gender = manager.enterOwnGender(); @@ -323,7 +323,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC char choice = this.enterChar(accessKeys, "Bitte Auswahl eingeben (0=Programm beenden): "); // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // Try it! try { @@ -572,7 +572,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC char choice = this.enterChar(new char[] {'n', 'a', 'o', 'x'}, "Welchen Daten möchten Sie ändern? (n=Namensdaten, a=Anschriftsdaten, o=Andere, x=Zurück zur Hauptauswahl) "); // Get manager and cast it - ManageableContactAddressbook manager = (ManageableContactAddressbook) this.getManager(); + ContactFacade manager = (ContactFacade) this.getManager(); // TODO Get rid of this ugly switch block, too switch (choice) { diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index 5b4e842..b479726 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -50,7 +50,7 @@ import javax.swing.table.TableModel; import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.application.AddressbookApplication; import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; -import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook; +import org.mxchange.addressbook.facade.contact.ContactFacade; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcore.application.Application; @@ -237,7 +237,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra this.getLogger().logTrace(MessageFormat.format("client={0}: CALLED!", client)); //NOI18N // Has the user entered own data? - if (((ManageableContactAddressbook) this.getClient().getManager()).isOwnContactAdded()) { + if (((ContactFacade) this.getClient().getManager()).isOwnContactAdded()) { // Debug message this.getLogger().logDebug("Disabling menus: isOwnContactAdded()=false"); //NOI18N @@ -702,7 +702,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra @Override public void actionPerformed (final ActionEvent e) { try { - ((ManageableContactAddressbook) self.getClient().getManager()).doEnterOwnData(); + ((ContactFacade) self.getClient().getManager()).doEnterOwnData(); } catch (final ContactAlreadyAddedException ex) { // Already added, log away // TODO maybe output message here? @@ -730,7 +730,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra @Override public void actionPerformed (final ActionEvent e) { try { - ((ManageableContactAddressbook) self.getClient().getManager()).doChangeOwnData(); + ((ContactFacade) self.getClient().getManager()).doChangeOwnData(); } catch (final IOException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { self.logException(ex); } @@ -750,7 +750,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra */ @Override public void actionPerformed (final ActionEvent e) { - ((ManageableContactAddressbook) self.getClient().getManager()).doAddOtherAddress(); + ((ContactFacade) self.getClient().getManager()).doAddOtherAddress(); } });