fixes + updated jar

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar
index c751f576a07947da18dcbd7c3eda7b5d1373c1cb..745accb44e784bd8ebaeab5db81c0c21509e7f65 100644 (file)
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 b2da2d68011be26c79d1b88a532f63672f2dcfe7..097a9e5dbfe864ed122fe4c930bbd83b965408d6 100644 (file)
--- 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 b4797265be878bc610ae15850372080e730c6042..beea931c030398f79df588f16acdb3bb0faa7ba1 100644 (file)
--- 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);