From: Roland Haeder Date: Fri, 2 Oct 2015 07:57:15 +0000 (+0200) Subject: fixes + updated jar X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e23b651a9dc866ea8d2fb948f84d83ea90970bd;p=jfinancials-swing.git fixes + updated jar Signed-off-by:Roland Häder --- diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar index c751f57..745accb 100644 Binary files a/lib/jcore-swing.jar and b/lib/jcore-swing.jar differ diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index b2da2d6..097a9e5 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -156,7 +156,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // Own street and number String streetNumber = manager.enterOwnStreet(); @@ -198,7 +198,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // Gender: Gender gender = manager.enterOwnGender(); @@ -240,7 +240,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get manager and cast it - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // 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 - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // 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 - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // 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 - ContactFacade manager = (ContactFacade) this.getManager(); + ContactFacade manager = (ContactFacade) this.getFacade(); // 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 b479726..beea931 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -56,7 +56,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcore.application.Application; import org.mxchange.jcore.client.Client; import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException; -import org.mxchange.jcore.manager.Manageable; +import org.mxchange.jcore.facade.Facade; import org.mxchange.jcoreswing.client.gui.ClientFrame; import org.mxchange.jcoreswing.model.swing.contact.ContactTableModel; @@ -217,7 +217,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra } @Override - public Manageable getManager () { + public Facade getFacade () { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } @@ -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 (((ContactFacade) this.getClient().getManager()).isOwnContactAdded()) { + if (((ContactFacade) this.getClient().getFacade()).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 { - ((ContactFacade) self.getClient().getManager()).doEnterOwnData(); + ((ContactFacade) self.getClient().getFacade()).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 { - ((ContactFacade) self.getClient().getManager()).doChangeOwnData(); + ((ContactFacade) self.getClient().getFacade()).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) { - ((ContactFacade) self.getClient().getManager()).doAddOtherAddress(); + ((ContactFacade) self.getClient().getFacade()).doAddOtherAddress(); } }); @@ -899,7 +899,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra this.getLogger().logTrace("CALLED!"); //NOI18N // Instance table model - this.dataModel = new ContactTableModel(this.getClient().getManager()); + this.dataModel = new ContactTableModel(this.getClient().getFacade()); // Instance table this.dataTable = new JTable(this.dataModel);