From 893853d012e88c107763ce0f3a81bdda9420fb38 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 17 Sep 2015 08:23:55 +0200 Subject: [PATCH] =?utf8?q?Some=20fixes=20+=20updated=20jcore.jar=20Signed-?= =?utf8?q?off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 28035 -> 28883 bytes .../application/AddressbookApplication.java | 5 +++-- .../client/console/ConsoleClient.java | 3 ++- .../contact/AddressbookContactManager.java | 2 +- .../model/contact/book/BookContact.java | 4 ++++ .../model/contact/user/UserContact.java | 4 ++++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/jcore.jar b/lib/jcore.jar index 4426c96e512eef4eac4d14f9f802bb47fc8361a4..107bb124479ac807cac4bf7d732d29970746d24a 100644 GIT binary patch delta 1926 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 Q{{PuoS(&vyoj3aa7dFR6b^rhX diff --git a/src/org/mxchange/addressbook/application/AddressbookApplication.java b/src/org/mxchange/addressbook/application/AddressbookApplication.java index 2e16df4..7dbbf57 100644 --- a/src/org/mxchange/addressbook/application/AddressbookApplication.java +++ b/src/org/mxchange/addressbook/application/AddressbookApplication.java @@ -182,6 +182,7 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli } else { // Not client choosen this.getLogger().error("No client choosen. Cannot launch."); //NOI18N + try { this.doShutdown(); } catch (final SQLException | IOException ex) { @@ -256,10 +257,10 @@ public class AddressbookApplication extends BaseFrameworkSystem implements Appli public void doShutdown () throws SQLException, IOException { // Trace message this.getLogger().trace("CALLED!"); //NOI18N - + // Shutdown client this.getClient().doShutdown(); - + this.getLogger().info("End of program (last line)"); //NOI18N System.exit(0); } diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 082e49b..ecfbd4d 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -37,6 +37,7 @@ import org.mxchange.jcore.application.Application; import org.mxchange.jcore.exceptions.UnhandledUserChoiceException; import org.mxchange.jcore.model.contact.Contact; import org.mxchange.jcore.model.contact.gender.Gender; +import org.mxchange.jcore.model.contact.gender.GenderUtils; /** * A client for the console @@ -109,7 +110,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC } // Get translated gender as the user may want to see "Mr.", "Mrs." - String gender = contact.getTranslatedGender(); + String gender = GenderUtils.getTranslatedGender(contact); // Get company name String companyName = contact.getCompanyName(); diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java index c7aed6a..65bdd97 100644 --- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java +++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java @@ -710,7 +710,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable // Then iterate over all while (iterator.hasNext()) { // Get next element - String key = iterator.next(); + String key = iterator.next().toLowerCase(); // Does the key start with AddressbookContactManager.columnName ? if (key.startsWith("ContactManager.columnName")) { //NOI18N diff --git a/src/org/mxchange/addressbook/model/contact/book/BookContact.java b/src/org/mxchange/addressbook/model/contact/book/BookContact.java index c34066f..65ef941 100644 --- a/src/org/mxchange/addressbook/model/contact/book/BookContact.java +++ b/src/org/mxchange/addressbook/model/contact/book/BookContact.java @@ -26,6 +26,10 @@ import org.mxchange.jcore.model.contact.Contact; * @version 0.0 */ public class BookContact extends BaseContact implements Contact { + /** + * Serial number + */ + private static final long serialVersionUID = 27_834_738_781L; /** * Default constructor, may only be used from database backend diff --git a/src/org/mxchange/addressbook/model/contact/user/UserContact.java b/src/org/mxchange/addressbook/model/contact/user/UserContact.java index ef51cb4..8642ae1 100644 --- a/src/org/mxchange/addressbook/model/contact/user/UserContact.java +++ b/src/org/mxchange/addressbook/model/contact/user/UserContact.java @@ -27,6 +27,10 @@ import org.mxchange.jcore.model.contact.gender.Gender; * TODO After a Collection has been used in ContactManager, change to BaseContact */ public class UserContact extends BookContact implements Contact { + /** + * Serial number + */ + private static final long serialVersionUID = 36_725_784_819_501L; /** * Creates own contact entry -- 2.39.5