From: Roland Haeder Date: Thu, 3 Sep 2015 08:40:58 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bcf8e597703c7aeeb8e6be0cd688666fc2b7670a;p=addressbook-lib.git Continued: - tpyo fixed ... ;-) - it is now getSingletonManager(application) - jcore.jar updated Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 5ed709d..526b59e 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/src/org/mxchange/addressbook/application/AddressbookApplication.java b/src/org/mxchange/addressbook/application/AddressbookApplication.java index 5a11c89..9a17d06 100644 --- a/src/org/mxchange/addressbook/application/AddressbookApplication.java +++ b/src/org/mxchange/addressbook/application/AddressbookApplication.java @@ -354,7 +354,7 @@ public class AddressbookApplication extends BaseAddressbookSystem implements App this.parseArguments(args); // Launch application - ApplicationManager.getManager(this).start(); + ApplicationManager.getSingeltonManager(this).start(); // Good bye, but this should not be reached ... this.getLogger().warn("Unusual exit reached."); //NOI18N diff --git a/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java b/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java index 24a0cf8..7a5d205 100644 --- a/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java +++ b/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java @@ -189,19 +189,19 @@ public class AddressbookContactDatabaseFrontend extends BaseDatabaseFrontend imp // Is there one row at least? if (result.hasNext()) { // Then get it - Storable storeable = result.next(); + Storable storable = result.next(); // Debug message - this.getLogger().debug(MessageFormat.format("storeable={0}", storeable)); + this.getLogger().debug(MessageFormat.format("storable={0}", storable)); // Is it same instance? - if (!(storeable instanceof Contact)) { + if (!(storable instanceof Contact)) { // Not same instance - throw new IllegalArgumentException(MessageFormat.format("storeable={0} is not implementing Contact", storeable)); + throw new IllegalArgumentException(MessageFormat.format("storable={0} is not implementing Contact", storable)); } // Cast it securely - contact = (Contact) storeable; + contact = (Contact) storable; } // Trace message diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java index 6a99cc5..d7be29e 100644 --- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java +++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java @@ -603,13 +603,13 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("rowIndex={0},columnIndex={1} CALLED!", rowIndex, columnIndex)); //NOI18N // Then get specific row from database which is a Contact instance - Storable storeable = this.getFrontend().getStorableAtRow(rowIndex); + Storable storable = this.getFrontend().getStorableAtRow(rowIndex); // Debug message - this.getLogger().debug(MessageFormat.format("storeable={0}", storeable)); //NOI18N + this.getLogger().debug(MessageFormat.format("storable={0}", storable)); //NOI18N // It may return null - if (null == storeable) { + if (null == storable) { // Nothing found this.getLogger().warn("contact is null - returning null ..."); //NOI18N return null; @@ -624,7 +624,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable // Now get that column Object value = null; try { - value = storeable.getValueFromColumn(columnName); + value = storable.getValueFromColumn(columnName); } catch (final IllegalArgumentException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { this.abortProgramWithException(ex); }