From 3345026dfa6b1915ab532c5e3883d185efa96b59 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 27 Aug 2015 08:52:41 +0200 Subject: [PATCH] Better compare this way: MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit if (null == foo) Otherwise could lead to a bug if you miss only one equal sign + updated jcore Signed-off-by:Roland Häder --- lib/jcore.jar | Bin 116351 -> 116645 bytes nbproject/project.properties | 30 ++++++++++++++---- .../client/console/ConsoleClient.java | 20 ++++++------ .../AddressbookContactDatabaseFrontend.java | 12 +++---- .../contact/AddressbookContactManager.java | 14 ++++---- .../addressbook/menu/AddressbookMenu.java | 4 +-- .../mxchange/addressbook/menu/BaseMenu.java | 2 +- .../addressbook/menu/console/ConsoleMenu.java | 2 +- .../menu/item/console/ConsoleMenuItem.java | 2 +- 9 files changed, 51 insertions(+), 35 deletions(-) diff --git a/lib/jcore.jar b/lib/jcore.jar index f4bdc108ad5046a41cac1bfec183ec3cace35b8f..d75f9b63bad3754b5874cc870805afe33c6a3141 100644 GIT binary patch delta 16478 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 nD51~*;Q 0) && (input.length() < minLength) && (allowEmpty)) || ((input instanceof String) && (input.length() > maxLength))) { + while (((null == input) || ((input.length() < minLength) && (!allowEmpty))) || ((input.length() > 0) && (input.length() < minLength) && (allowEmpty)) || ((input instanceof String) && (input.length() > maxLength))) { // Output message System.out.print(message); @@ -635,7 +635,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC this.getLogger().trace(MessageFormat.format("contact={0} CALLED!", contact)); //NOI18N // Contact must not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } diff --git a/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java b/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java index 5f68c5c..02089cb 100644 --- a/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java +++ b/src/org/mxchange/addressbook/database/frontend/contact/AddressbookContactDatabaseFrontend.java @@ -58,7 +58,7 @@ public class AddressbookContactDatabaseFrontend extends BaseDatabaseFrontend imp this.getLogger().trace(MessageFormat.format("manager={0} - CALLED!", manager)); //NOI18N // Manager instance must not be null - if (manager == null) { + if (null == manager) { // Abort here throw new NullPointerException("manager is null"); //NOI18N } @@ -89,7 +89,7 @@ public class AddressbookContactDatabaseFrontend extends BaseDatabaseFrontend imp this.getLogger().trace("CALLED!"); //NOI18N // Make sure the contact is set - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -222,7 +222,7 @@ public class AddressbookContactDatabaseFrontend extends BaseDatabaseFrontend imp this.getLogger().trace(MessageFormat.format("contact={0} - CALLED!", contact)); //NOI18N // contact should not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -267,13 +267,13 @@ public class AddressbookContactDatabaseFrontend extends BaseDatabaseFrontend imp @Override public boolean isOwnContactFound () throws SQLException, IOException, BadTokenException, CorruptedDatabaseFileException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { // Get search criteria instance - SearchableCriteria critera = new SearchCriteria(); + SearchableCriteria criteria = new SearchCriteria(); // Add condition - critera.addCriteria(AddressbookContactDatabaseConstants.COLUMN_OWN_CONTACT, true); + criteria.addCriteria(AddressbookContactDatabaseConstants.COLUMN_OWN_CONTACT, true); // Get result - Result result = this.getBackend().doSelectByCriteria(critera); + Result result = this.getBackend().doSelectByCriteria(criteria); // Deligate this call to backend return result.hasNext(); diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java index fd2a538..881d1ba 100644 --- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java +++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java @@ -70,7 +70,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("client={1} - CALLED!", client)); //NOI18N // Make sure all parameters are set correctly - if (client == null) { + if (null == client) { // Abort here throw new NullPointerException("client is null"); //NOI18N } @@ -104,7 +104,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("contact={0} - CALLED!", contact)); //NOI18N // Contact instance must not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -135,7 +135,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("contact={0} CALLED!", contact)); //NOI18N // Contact must not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -170,7 +170,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("contact={0} CALLED!", contact)); //NOI18N // Contact must not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -214,7 +214,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("contact={0} CALLED!", contact)); //NOI18N // Contact must not be null - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } @@ -609,7 +609,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().debug(MessageFormat.format("storeable={0}", storeable)); // It may return null - if (storeable == null) { + if (null == storeable) { // Nothing found this.getLogger().warn("contact is null - returning null ..."); return null; @@ -677,7 +677,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable this.getLogger().trace(MessageFormat.format("contact={0} CALLED!", contact)); //NOI18N // Sanity check - if (contact == null) { + if (null == contact) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } diff --git a/src/org/mxchange/addressbook/menu/AddressbookMenu.java b/src/org/mxchange/addressbook/menu/AddressbookMenu.java index 12257eb..b59b13e 100644 --- a/src/org/mxchange/addressbook/menu/AddressbookMenu.java +++ b/src/org/mxchange/addressbook/menu/AddressbookMenu.java @@ -46,10 +46,10 @@ public class AddressbookMenu extends BaseAddressbookSystem { log.trace(MessageFormat.format("menuList={0},menuType={1},client={2} - CALLED!", menuList, menuType, client)); //NOI18N // Some instances must be set - if (menuList == null) { + if (null == menuList) { // Abort here throw new NullPointerException("menuList is null"); //NOI18N - } else if (client == null) { + } else if (null == client) { // Abort here throw new NullPointerException("contact is null"); //NOI18N } else if (!(client instanceof AddressbookClient)) { diff --git a/src/org/mxchange/addressbook/menu/BaseMenu.java b/src/org/mxchange/addressbook/menu/BaseMenu.java index f554820..207a9b3 100644 --- a/src/org/mxchange/addressbook/menu/BaseMenu.java +++ b/src/org/mxchange/addressbook/menu/BaseMenu.java @@ -70,7 +70,7 @@ public class BaseMenu extends BaseAddressbookSystem { this.getLogger().trace(MessageFormat.format("client={0} CALLED!", client)); //NOI18N // Client must not be null - if (client == null) { + if (null == client) { // Abort here throw new NullPointerException("client is null"); //NOI18N } diff --git a/src/org/mxchange/addressbook/menu/console/ConsoleMenu.java b/src/org/mxchange/addressbook/menu/console/ConsoleMenu.java index 965f68a..b5c2e43 100644 --- a/src/org/mxchange/addressbook/menu/console/ConsoleMenu.java +++ b/src/org/mxchange/addressbook/menu/console/ConsoleMenu.java @@ -39,7 +39,7 @@ public class ConsoleMenu extends BaseMenu implements Menu { this.getLogger().trace(MessageFormat.format("menuType={0},client={1} - CALLED!", menuType, client)); //NOI18N // Client must not be null - if (client == null) { + if (null == client) { // Abort here throw new NullPointerException("client is null"); } diff --git a/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java b/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java index 1090a63..091787d 100644 --- a/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java +++ b/src/org/mxchange/addressbook/menu/item/console/ConsoleMenuItem.java @@ -93,7 +93,7 @@ public class ConsoleMenuItem extends BaseMenuItem implements SelectableMenuItem this.getLogger().trace(MessageFormat.format("client={0} - CALLED!", client)); //NOI18N // Client must not be null - if (client == null) { + if (null == client) { // Abort here throw new NullPointerException("client is null"); } else if (!(client instanceof AddressbookClient)) { -- 2.39.5