From 629af4ecbf6efa25817c830e2f2d30929dbcbd6f Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Sun, 3 Jun 2012 08:54:47 +0000 Subject: [PATCH] Replaced custom String checks with MText.isBlank() and MText.isEmpty(). --- .../com/marcozanon/macaco/MInformation.java | 3 ++- .../attic/configuration/MConfiguration.java | 7 ++++--- .../attic/web/ui/MWebApplicationContext.java | 8 ++++---- .../attic/web/ui/MWebApplicationServlet.java | 5 +++-- .../macaco/attic/web/ui/MWebBrowserPage.java | 2 +- .../macaco/attic/web/ui/MWebComboBox.java | 10 +++++----- .../macaco/attic/web/ui/MWebDateBox.java | 4 ++-- .../macaco/attic/web/ui/MWebDisplayWidget.java | 6 ++++-- .../macaco/attic/web/ui/MWebFont.java | 3 ++- .../macaco/attic/web/ui/MWebMessage.java | 5 +++-- .../macaco/attic/web/ui/MWebNumberBox.java | 4 ++-- .../macaco/attic/web/ui/MWebTable.java | 18 +++++++++--------- .../macaco/attic/web/ui/MWebTableCell.java | 2 +- .../macaco/attic/web/ui/MWebVerticalMenu.java | 16 ++++++++-------- .../macaco/attic/web/ui/MWebView.java | 6 +++--- .../macaco/attic/web/ui/MWebWidget.java | 3 ++- .../macaco/conversion/MDateConverter.java | 5 +++-- .../macaco/conversion/MNumberConverter.java | 5 +++-- .../marcozanon/macaco/json/MJsonBoolean.java | 4 +++- .../com/marcozanon/macaco/json/MJsonNull.java | 4 +++- .../marcozanon/macaco/json/MJsonNumber.java | 3 ++- .../marcozanon/macaco/json/MJsonObject.java | 9 +++++---- .../marcozanon/macaco/json/MJsonString.java | 4 +++- .../macaco/logging/MLogPlainTextFile.java | 3 ++- .../marcozanon/macaco/sql/MSqlConnection.java | 7 ++++--- .../macaco/sql/MSqlConnectionGenerator.java | 5 +++-- .../macaco/sql/MSqlStatementResults.java | 3 ++- .../com/marcozanon/macaco/sql/MSqlTable.java | 5 +++-- .../marcozanon/macaco/text/MTranslator.java | 6 +++--- 29 files changed, 94 insertions(+), 71 deletions(-) diff --git a/src/java/com/marcozanon/macaco/MInformation.java b/src/java/com/marcozanon/macaco/MInformation.java index cbe7d05..8f28f2f 100644 --- a/src/java/com/marcozanon/macaco/MInformation.java +++ b/src/java/com/marcozanon/macaco/MInformation.java @@ -6,6 +6,7 @@ package com.marcozanon.macaco; +import com.marcozanon.macaco.text.MText; import java.io.BufferedInputStream; import java.io.InputStream; import java.io.IOException; @@ -59,7 +60,7 @@ public class MInformation extends MObject { /* Resources */ public static byte[] getCoreResource(String resource) throws IOException { - if ((null == resource) || ("".equals(resource))) { + if (MText.isBlank(resource)) { throw new IllegalArgumentException("Invalid 'resource': null or empty."); } // modified from http://articles.techrepublic.com.com/5100-10878_11-1046714.html diff --git a/src/java/com/marcozanon/macaco/attic/configuration/MConfiguration.java b/src/java/com/marcozanon/macaco/attic/configuration/MConfiguration.java index dfd4e65..e066777 100644 --- a/src/java/com/marcozanon/macaco/attic/configuration/MConfiguration.java +++ b/src/java/com/marcozanon/macaco/attic/configuration/MConfiguration.java @@ -8,6 +8,7 @@ package com.marcozanon.macaco.attic.configuration; import com.marcozanon.macaco.MInformation; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStreamReader; @@ -37,7 +38,7 @@ public class MConfiguration extends MObject { /* Strings management */ public void parseFile(String file) throws MFileParsingConfigurationException { - if ((null == file) || ("".equals(file))) { + if (MText.isBlank(file)) { throw new IllegalArgumentException("Invalid 'file': null or empty."); } // @@ -63,7 +64,7 @@ public class MConfiguration extends MObject { break; } line = line.trim(); - if ((line.startsWith("#")) || (line.startsWith(";")) || ("".equals(line))) { + if ((line.startsWith("#")) || (line.startsWith(";")) || (MText.isEmpty(line))) { continue; } else { @@ -95,7 +96,7 @@ public class MConfiguration extends MObject { } public String getValue(String key) throws MValueNotFoundConfigurationException { - if ((null == key) || ("".equals(key))) { + if (MText.isBlank(key)) { throw new IllegalArgumentException("Invalid 'key': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationContext.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationContext.java index 0d8879e..523daaf 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationContext.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationContext.java @@ -83,7 +83,7 @@ public abstract class MWebApplicationContext extends MObject { /* Response content */ protected void setResponseContentType(String responseContentType) { - if ((null == responseContentType) || ("".equals(responseContentType))) { + if (MText.isBlank(responseContentType)) { throw new IllegalArgumentException("Invalid 'responseContentType': null or empty."); } // @@ -100,7 +100,7 @@ public abstract class MWebApplicationContext extends MObject { } protected void addPlainTextResponseContent(String responseContent) throws MResponseWebException { - if ((null == responseContent) || ("".equals(responseContent))) { + if (MText.isBlank(responseContent)) { throw new IllegalArgumentException("Invalid 'responseContent': null or empty."); } // @@ -122,7 +122,7 @@ public abstract class MWebApplicationContext extends MObject { } protected void setXhtmlResponseContent(String responseContent) throws MResponseWebException { - if ((null == responseContent) || ("".equals(responseContent))) { + if (MText.isBlank(responseContent)) { throw new IllegalArgumentException("Invalid 'responseContent': null or empty."); } // @@ -178,7 +178,7 @@ public abstract class MWebApplicationContext extends MObject { } public void addNotificationAreaMessage(boolean error, String message, boolean framedOutput) throws MResponseWebException { - if ((null == message) || ("".equals(message))) { + if (MText.isBlank(message)) { throw new IllegalArgumentException("Invalid 'message': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationServlet.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationServlet.java index 22c2789..c62f747 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationServlet.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebApplicationServlet.java @@ -14,6 +14,7 @@ import com.marcozanon.macaco.json.MJsonObject; import com.marcozanon.macaco.json.MJsonString; import com.marcozanon.macaco.logging.MLogFilter; import com.marcozanon.macaco.logging.MLoggingException; +import com.marcozanon.macaco.text.MText; import java.io.IOException; import java.io.UnsupportedEncodingException; import javax.servlet.http.HttpServletRequest; @@ -176,7 +177,7 @@ public abstract class MWebApplicationServlet extends MHttpServlet { /* Responses */ protected void returnStandardResponse(HttpServletResponse response, String contentType, byte[] content, boolean ajaxMode) throws IOException { - if ((null == contentType) || ("".equals(contentType))) { + if (MText.isBlank(contentType)) { contentType = MInformation.HttpContentType.PLAIN.toString(); } // prepare response content @@ -277,7 +278,7 @@ public abstract class MWebApplicationServlet extends MHttpServlet { if (null == response) { throw new IllegalArgumentException("Invalid 'response': null."); } - if ((null == contentType) || ("".equals(contentType))) { + if (MText.isBlank(contentType)) { throw new IllegalArgumentException("Invalid 'contentType': null or empty."); } if (null == content) { diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebBrowserPage.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebBrowserPage.java index 783a72c..50e5dde 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebBrowserPage.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebBrowserPage.java @@ -279,7 +279,7 @@ public abstract class MWebBrowserPage extends MObject { /* Redirection */ public void redirect(String url) throws MResponseWebException { - if ((null == url) || ("".equals(url))) { + if (MText.isBlank(url)) { throw new IllegalArgumentException("Invalid 'url': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebComboBox.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebComboBox.java index 1e8a527..e314e08 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebComboBox.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebComboBox.java @@ -71,7 +71,7 @@ public class MWebComboBox extends MWebDirectWidget { } else { for (String k: items.keySet()) { - if ((null == k) || ("".equals(k))) { + if (MText.isBlank(k)) { throw new IllegalArgumentException("Invalid 'items': item key null or empty."); } else if (null == items.get(k)) { @@ -127,7 +127,7 @@ public class MWebComboBox extends MWebDirectWidget { if (null == selectedItemKey) { throw new IllegalArgumentException("Invalid 'selectedItemKey': null."); } - else if ((!"".equals(selectedItemKey)) && (!this.getItemsReference().containsKey(selectedItemKey))) { + else if ((!MText.isEmpty(selectedItemKey)) && (!this.getItemsReference().containsKey(selectedItemKey))) { throw new IllegalArgumentException(String.format("Invalid 'selectedItemKey': %s: not available.", selectedItemKey)); } // @@ -155,7 +155,7 @@ public class MWebComboBox extends MWebDirectWidget { public int getSelectedItemIndex() { String selectedItemKey = this.getSelectedItemKey(); int selectedItemIndex = 0; - if ("".equals(selectedItemKey)) { + if (MText.isEmpty(selectedItemKey)) { return selectedItemIndex; } for (String k: this.getItemsReference().keySet()) { @@ -305,7 +305,7 @@ public class MWebComboBox extends MWebDirectWidget { if (null == selectedItemKey) { throw new MUnexpectedMessageWebException("Invalid message: selected item key parameter not available."); } - else if ((!"".equals(selectedItemKey)) && (!this.getItemsReference().keySet().contains(selectedItemKey))) { + else if ((!MText.isEmpty(selectedItemKey)) && (!this.getItemsReference().keySet().contains(selectedItemKey))) { throw new MUnexpectedMessageWebException(String.format("Invalid message: %s: selected item key parameter not recognized.", selectedItemKey)); } this.onBlur(selectedItemKey); @@ -318,7 +318,7 @@ public class MWebComboBox extends MWebDirectWidget { if (null == selectedItemKey) { throw new MUnexpectedMessageWebException("Invalid message: selected item key parameter not available."); } - else if ((!"".equals(selectedItemKey)) && (!this.getItemsReference().keySet().contains(selectedItemKey))) { + else if ((!MText.isEmpty(selectedItemKey)) && (!this.getItemsReference().keySet().contains(selectedItemKey))) { throw new MUnexpectedMessageWebException(String.format("Invalid message: %s: selected item key parameter not recognized.", selectedItemKey)); } this.onChange(selectedItemKey); diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebDateBox.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebDateBox.java index 2504e4a..1c750d5 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebDateBox.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebDateBox.java @@ -63,7 +63,7 @@ public class MWebDateBox extends MWebTextBox { public Date getDate() throws MFormatConversionException { Date date = null; String text = this.getText(); - if (!"".equals(text)) { + if (!MText.isEmpty(text)) { return this.getDateConverterReference().getDateFromString(text); } return date; @@ -73,7 +73,7 @@ public class MWebDateBox extends MWebTextBox { public void validate() throws MValidationWebException { String text = this.getText(); - if (!"".equals(text)) { + if (!MText.isEmpty(text)) { try { MDateConverter dateConverter = this.getDateConverterReference(); this.setText(dateConverter.getStringFromDate(dateConverter.getDateFromString(text))); diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebDisplayWidget.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebDisplayWidget.java index f0c12ed..bf69ef0 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebDisplayWidget.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebDisplayWidget.java @@ -6,6 +6,8 @@ package com.marcozanon.macaco.attic.web.ui; +import com.marcozanon.macaco.text.MText; + public abstract class MWebDisplayWidget extends MWebWidget { public static enum Side { @@ -84,7 +86,7 @@ public abstract class MWebDisplayWidget extends MWebWidget { } protected void setCustomClasses(String customClasses, boolean refreshMode) { - if ("".equals(customClasses)) { + if (MText.isEmpty(customClasses)) { throw new IllegalArgumentException("Invalid 'customClasses': empty."); } // @@ -693,7 +695,7 @@ public abstract class MWebDisplayWidget extends MWebWidget { /* Display widgets */ protected MWebDisplayWidget getDisplayWidgetReferenceById(String id) throws MDisplayWidgetNotFoundWebException { - if ((null == id) || ("".equals(id))) { + if (MText.isBlank(id)) { throw new IllegalArgumentException("Invalid 'id': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebFont.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebFont.java index 9d3407c..a219a5e 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebFont.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebFont.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.attic.web.ui; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; public class MWebFont extends MObject { @@ -92,7 +93,7 @@ public class MWebFont extends MObject { if (null == size) { throw new IllegalArgumentException("Invalid 'size': null."); } - if ((null == family) || ("".equals(family))) { + if (MText.isBlank(family)) { throw new IllegalArgumentException("Invalid 'family': null or empty."); } if (null == decoration) { diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebMessage.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebMessage.java index a43182a..fd8ccc5 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebMessage.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebMessage.java @@ -10,6 +10,7 @@ import com.marcozanon.macaco.MObject; import com.marcozanon.macaco.json.MInvalidValueJsonException; import com.marcozanon.macaco.json.MJsonObject; import com.marcozanon.macaco.json.MJsonString; +import com.marcozanon.macaco.text.MText; import java.util.LinkedHashMap; public class MWebMessage extends MObject { @@ -23,7 +24,7 @@ public class MWebMessage extends MObject { public MWebMessage(String message) throws MMessagingWebException { super(); // - if ((null == message) || "".equals(message)) { + if (MText.isBlank(message)) { throw new IllegalArgumentException("Invalid 'message': null or empty."); } // @@ -50,7 +51,7 @@ public class MWebMessage extends MObject { } try { String temporaryEvent = ((MJsonString)jsonMessage.getValue("event")).getValue(); - if ("".equals(temporaryEvent)) { + if (MText.isEmpty(temporaryEvent)) { throw new MMessagingWebException("Invalid 'message': event empty."); } this.event = temporaryEvent; diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebNumberBox.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebNumberBox.java index 22a949d..917fc03 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebNumberBox.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebNumberBox.java @@ -63,7 +63,7 @@ public class MWebNumberBox extends MWebTextBox { public BigDecimal getNumber() throws MFormatConversionException { BigDecimal number = null; String text = this.getText(); - if (!"".equals(text)) { + if (!MText.isEmpty(text)) { return this.getNumberConverterReference().getNumberFromString(text); } return number; @@ -73,7 +73,7 @@ public class MWebNumberBox extends MWebTextBox { public void validate() throws MValidationWebException { String text = this.getText(); - if (!"".equals(text)) { + if (!MText.isEmpty(text)) { try { MNumberConverter numberConverter = this.getNumberConverterReference(); this.setText(numberConverter.getStringFromNumber(numberConverter.getNumberFromString(text))); diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebTable.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebTable.java index f5eaed8..2332d94 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebTable.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebTable.java @@ -40,7 +40,7 @@ public abstract class MWebTable extends MWebDirectWidget { } else { for (String columnKey: columnHeaders.keySet()) { - if ((null == columnKey) || ("".equals(columnKey))) { + if (MText.isBlank(columnKey)) { throw new IllegalArgumentException("Invalid 'columnHeaders': column key null or empty."); } else if (null == columnHeaders.get(columnKey)) { @@ -48,7 +48,7 @@ public abstract class MWebTable extends MWebDirectWidget { } } } - if ((null == primaryKey) || ("".equals(primaryKey))) { + if (MText.isBlank(primaryKey)) { throw new IllegalArgumentException("Invalid 'primaryKey': null or empty."); } // @@ -92,7 +92,7 @@ public abstract class MWebTable extends MWebDirectWidget { } protected void setSortKey(String sortKey, boolean ascendingSortMode, boolean refreshMode) { - if ("".equals(sortKey)) { + if (MText.isEmpty(sortKey)) { throw new IllegalArgumentException("Invalid 'sortKey': empty."); } // @@ -234,7 +234,7 @@ public abstract class MWebTable extends MWebDirectWidget { throw new IllegalArgumentException("Invalid 'rows': row null."); } for (String columnKey: row.keySet()) { - if ((null == columnKey) || ("".equals(columnKey))) { + if (MText.isBlank(columnKey)) { throw new IllegalArgumentException("Invalid 'rows': column key null or empty."); } } @@ -397,7 +397,7 @@ public abstract class MWebTable extends MWebDirectWidget { } protected void setRowSelectedMode(String primaryKeyValue, boolean selectedMode, boolean refreshMode) { - if ((null == primaryKeyValue) || ("".equals(primaryKeyValue))) { + if (MText.isBlank(primaryKeyValue)) { throw new IllegalArgumentException("Invalid 'primaryKeyValue': null or empty."); } // @@ -426,7 +426,7 @@ public abstract class MWebTable extends MWebDirectWidget { } public boolean getRowSelectedMode(String primaryKeyValue) { - if ((null == primaryKeyValue) || ("".equals(primaryKeyValue))) { + if (MText.isBlank(primaryKeyValue)) { throw new IllegalArgumentException("Invalid 'primaryKeyValue': null or empty."); } // @@ -537,7 +537,7 @@ public abstract class MWebTable extends MWebDirectWidget { } for (String columnKey: columnHeaders.keySet()) { String onSortFunction = ""; - if (!"".equals(columnHeaders.get(columnKey).getText())) { + if (!MText.isEmpty(columnHeaders.get(columnKey).getText())) { onSortFunction = String.format("javascript: m_messageInterface.fireMessage('%s', 'onSort', {'sortKey': '%s'});", this.getId(), MText.getJavascriptEscapedString(columnKey)); } content.append(String.format("", customClasses, MText.getXhtmlEscapedString(onSortFunction), columnHeaders.get(columnKey).getId())); @@ -660,7 +660,7 @@ public abstract class MWebTable extends MWebDirectWidget { if (null == selectedPage) { throw new MUnexpectedMessageWebException("Invalid message: selected page parameter not available."); } - else if ((!"".equals(selectedPage)) && ((Integer.parseInt(selectedPage) < 1) || (Integer.parseInt(selectedPage) > (int)Math.ceil((float)this.getRowCount() / (float)this.getRowsPerPage())))) { + else if ((!MText.isEmpty(selectedPage)) && ((Integer.parseInt(selectedPage) < 1) || (Integer.parseInt(selectedPage) > (int)Math.ceil((float)this.getRowCount() / (float)this.getRowsPerPage())))) { throw new MUnexpectedMessageWebException(String.format("Invalid message: %s: selected page parameter out of range.", selectedPage)); } this.onPageSelection(selectedPage); @@ -709,7 +709,7 @@ public abstract class MWebTable extends MWebDirectWidget { } public void onPageSelection(String selectedPage) { - if ("".equals(selectedPage)) { + if (MText.isEmpty(selectedPage)) { this.setSelectedPage(null); } else { diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebTableCell.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebTableCell.java index b628c8a..73e70f0 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebTableCell.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebTableCell.java @@ -102,7 +102,7 @@ public class MWebTableCell extends MWebCellWidget { } protected void setExternalLinkPrefix(String externalLinkPrefix, boolean refreshMode) { - if ("".equals(externalLinkPrefix)) { + if (MText.isEmpty(externalLinkPrefix)) { throw new IllegalArgumentException("Invalid 'externalLinkPrefix': empty."); } // diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebVerticalMenu.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebVerticalMenu.java index a83abb7..17a7e30 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebVerticalMenu.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebVerticalMenu.java @@ -81,7 +81,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { } else { for (String k: items.keySet()) { - if ((null == k) || ("".equals(k))) { + if (MText.isBlank(k)) { throw new IllegalArgumentException("Invalid 'items': item key null or empty."); } else if (null == items.get(k)) { @@ -136,7 +136,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { } protected void setSelectedItem(String selectedItemKey, boolean refreshMode) { - if ("".equals(selectedItemKey)) { + if (MText.isEmpty(selectedItemKey)) { throw new IllegalArgumentException("Invalid 'selectedItemKey': empty."); } else if ((null != selectedItemKey) && (!this.getItemsReference().containsKey(selectedItemKey))) { @@ -169,7 +169,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { /* Refresh */ protected String getItemContent(String parentItemKey) throws MNoWidgetIdWebException { // code partly taken from http://www.codecodex.com/wiki/Count_the_number_of_occurrences_of_a_specific_character_in_a_string - if ("".equals(parentItemKey)) { + if (MText.isEmpty(parentItemKey)) { throw new IllegalArgumentException("Invalid 'parentItemKey': empty."); } // @@ -199,7 +199,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { } itemContent.append(String.format("", customClasses)); String text = this.getItemsReference().get(itemKey).getText(); - if (!"".equals(text)) { + if (!MText.isEmpty(text)) { String imageSource = this.getItemsReference().get(itemKey).getImageSource(); if (null == imageSource) { imageSource = String.format("%s/null", this.getApplicationContextReference().getRequestReference().getRequestURL()); @@ -221,7 +221,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { // if ((!this.getAccordionMode()) || (this.getAccordionMode() && (null != this.getSelectedItemKey()) && (this.getSelectedItemKey().startsWith(itemKey)))) { String childItemContent = this.getItemContent(itemKey); - if (!"".equals(childItemContent.toString())) { + if (!MText.isEmpty(childItemContent.toString())) { itemContent.append(String.format("", customClasses)); itemContent.append(String.format("", customClasses)); itemContent.append(String.format("%s", customClasses, this.getId() + MText.getXhtmlEscapedString(itemKey) + "-childCell", childItemContent)); @@ -231,8 +231,8 @@ public class MWebVerticalMenu extends MWebDirectWidget { } // StringBuilder content = new StringBuilder(""); - if (!"".equals(itemContent.toString())) { - if ("".equals(parentItemKey)) { + if (!MText.isEmpty(itemContent.toString())) { + if (MText.isEmpty(parentItemKey)) { content.append(String.format("", customClasses, this.getId())); } else { @@ -248,7 +248,7 @@ public class MWebVerticalMenu extends MWebDirectWidget { this.checkPresence(); // String content = this.getItemContent(null); - if ("".equals(content)) { + if (MText.isEmpty(content)) { content = String.format("
", this.getId()); } this.getApplicationContextReference().addPlainTextResponseContent(String.format("if ($('%s')) { $('%s').parentNode.innerHTML = '%s'; }", this.getId(), this.getId(), MText.getJavascriptEscapedString(content))); diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebView.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebView.java index 76c7d4f..db18708 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebView.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebView.java @@ -35,7 +35,7 @@ public class MWebView extends MObject implements Runnable { if (null == applicationContext) { throw new IllegalArgumentException("Invalid 'applicationContext': null."); } - if ((null == breadcrumb) || ("".equals(breadcrumb))) { + if (MText.isBlank(breadcrumb)) { throw new IllegalArgumentException("Invalid 'breadcrumb': null or empty."); } // @@ -202,7 +202,7 @@ public class MWebView extends MObject implements Runnable { } public MWebDownloader getDownloaderReferenceById(String id) throws MDownloaderNotFoundWebException { - if ((null == id) || ("".equals(id))) { + if (MText.isBlank(id)) { throw new IllegalArgumentException("Invalid 'id': null or empty."); } // @@ -381,7 +381,7 @@ public class MWebView extends MObject implements Runnable { String widgetId = message.getWidgetId(); String event = message.getEvent(); LinkedHashMap parameters = message.getParameters(); - if ("".equals(widgetId)) { // no widget id = view + if (MText.isEmpty(widgetId)) { // no widget id = view if ("onRefresh".equals(event)) { this.onRefresh(); } diff --git a/src/java/com/marcozanon/macaco/attic/web/ui/MWebWidget.java b/src/java/com/marcozanon/macaco/attic/web/ui/MWebWidget.java index 80f5933..2dcb690 100644 --- a/src/java/com/marcozanon/macaco/attic/web/ui/MWebWidget.java +++ b/src/java/com/marcozanon/macaco/attic/web/ui/MWebWidget.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.attic.web.ui; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.util.LinkedHashMap; public abstract class MWebWidget extends MObject { @@ -77,7 +78,7 @@ public abstract class MWebWidget extends MObject { /* Messages */ protected void processMessage(String event, LinkedHashMap parameters) throws MUnexpectedMessageWebException { - if ((null == event) || ("".equals(event))) { + if (MText.isBlank(event)) { throw new IllegalArgumentException("Invalid 'event': null or empty."); } if (null == parameters) { diff --git a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java index 65da9ec..b85cabf 100644 --- a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java +++ b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.conversion; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -130,7 +131,7 @@ public class MDateConverter extends MObject { /* Conversion */ protected static void checkDateFormat(String dateFormat) { - if ((null == dateFormat) || ("".equals(dateFormat))) { + if (MText.isBlank(dateFormat)) { throw new IllegalArgumentException("Invalid 'dateFormat': null or empty."); } // @@ -143,7 +144,7 @@ public class MDateConverter extends MObject { } protected static Date getDateFromStringByParameters(String x, String inputDateFormat, Locale inputLocale, TimeZone inputTimeZone) throws MFormatConversionException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } MDateConverter.checkDateFormat(inputDateFormat); diff --git a/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java b/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java index a152da1..6b61ce6 100644 --- a/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java +++ b/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.conversion; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -104,7 +105,7 @@ public class MNumberConverter extends MObject { /* Conversion */ protected static void checkNumberFormat(String numberFormat) { - if ((null == numberFormat) || ("".equals(numberFormat))) { + if (MText.isBlank(numberFormat)) { throw new IllegalArgumentException("Invalid 'numberFormat': null or empty."); } // @@ -117,7 +118,7 @@ public class MNumberConverter extends MObject { } protected static BigDecimal getNumberFromStringByParameters(String x, String inputNumberFormat, Locale inputLocale) throws MFormatConversionException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } MNumberConverter.checkNumberFormat(inputNumberFormat); diff --git a/src/java/com/marcozanon/macaco/json/MJsonBoolean.java b/src/java/com/marcozanon/macaco/json/MJsonBoolean.java index b6db40d..ca288fb 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonBoolean.java +++ b/src/java/com/marcozanon/macaco/json/MJsonBoolean.java @@ -6,6 +6,8 @@ package com.marcozanon.macaco.json; +import com.marcozanon.macaco.text.MText; + public class MJsonBoolean extends MJsonValue { protected Boolean value = null; @@ -63,7 +65,7 @@ public class MJsonBoolean extends MJsonValue { } public void parseString(String x) throws MInvalidValueJsonException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/json/MJsonNull.java b/src/java/com/marcozanon/macaco/json/MJsonNull.java index a8bc959..af6d549 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonNull.java +++ b/src/java/com/marcozanon/macaco/json/MJsonNull.java @@ -6,6 +6,8 @@ package com.marcozanon.macaco.json; +import com.marcozanon.macaco.text.MText; + public class MJsonNull extends MJsonValue { /* */ @@ -44,7 +46,7 @@ public class MJsonNull extends MJsonValue { } public void parseString(String x) throws MInvalidValueJsonException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/json/MJsonNumber.java b/src/java/com/marcozanon/macaco/json/MJsonNumber.java index b8c4682..886e854 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonNumber.java +++ b/src/java/com/marcozanon/macaco/json/MJsonNumber.java @@ -6,6 +6,7 @@ package com.marcozanon.macaco.json; +import com.marcozanon.macaco.text.MText; import java.math.BigDecimal; public class MJsonNumber extends MJsonValue { @@ -84,7 +85,7 @@ public class MJsonNumber extends MJsonValue { } public void parseString(String x) throws MInvalidValueJsonException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/json/MJsonObject.java b/src/java/com/marcozanon/macaco/json/MJsonObject.java index 3e5fa56..29e9830 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonObject.java +++ b/src/java/com/marcozanon/macaco/json/MJsonObject.java @@ -6,6 +6,7 @@ package com.marcozanon.macaco.json; +import com.marcozanon.macaco.text.MText; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -47,7 +48,7 @@ public class MJsonObject extends MJsonValue { /* Values handlers */ public void setValue(String key, MJsonValue x) { - if ((null == key) || ("".equals(key))) { + if (MText.isBlank(key)) { throw new IllegalArgumentException("Invalid 'key': null or empty."); } if (null == x) { @@ -62,7 +63,7 @@ public class MJsonObject extends MJsonValue { } public MJsonValue getValue(String key) { - if ((null == key) || ("".equals(key))) { + if (MText.isBlank(key)) { throw new IllegalArgumentException("Invalid 'key': null or empty."); } // @@ -77,7 +78,7 @@ public class MJsonObject extends MJsonValue { } public void removeValue(String key) { - if ((null == key) || ("".equals(key))) { + if (MText.isBlank(key)) { throw new IllegalArgumentException("Invalid 'key': null or empty."); } // @@ -92,7 +93,7 @@ public class MJsonObject extends MJsonValue { } public boolean containsKey(String key) { - if ((null == key) || ("".equals(key))) { + if (MText.isBlank(key)) { throw new IllegalArgumentException("Invalid 'key': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/json/MJsonString.java b/src/java/com/marcozanon/macaco/json/MJsonString.java index 5662a74..af913a0 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonString.java +++ b/src/java/com/marcozanon/macaco/json/MJsonString.java @@ -6,6 +6,8 @@ package com.marcozanon.macaco.json; +import com.marcozanon.macaco.text.MText; + public class MJsonString extends MJsonValue { protected boolean extendedEscapeMode = false; @@ -267,7 +269,7 @@ public class MJsonString extends MJsonValue { } public void parseString(String x) throws MInvalidValueJsonException { - if ((null == x) || ("".equals(x))) { + if (MText.isBlank(x)) { throw new IllegalArgumentException("Invalid 'x': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java b/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java index ad795f7..a5c0d0e 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java +++ b/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.logging; import com.marcozanon.macaco.MInformation; +import com.marcozanon.macaco.text.MText; import java.io.BufferedWriter; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -27,7 +28,7 @@ public class MLogPlainTextFile extends MLogTarget { public MLogPlainTextFile(String file) throws MLoggingException { super(); // - if ((null == file) || ("".equals(file))) { + if (MText.isBlank(file)) { throw new IllegalArgumentException("Invalid 'file': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java index d6eff4b..bdcf530 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.sql; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; @@ -35,10 +36,10 @@ public class MSqlConnection extends MObject { public MSqlConnection(String driver, String url, String username, String password) throws MConnectionSqlException { super(); // - if ((null == driver) || ("".equals(driver))) { + if (MText.isBlank(driver)) { throw new IllegalArgumentException("Invalid 'driver': null or empty."); } - if ((null == url) || ("".equals(url))) { + if (MText.isBlank(url)) { throw new IllegalArgumentException("Invalid 'url': null or empty."); } if (null == username) { @@ -199,7 +200,7 @@ public class MSqlConnection extends MObject { } public MSqlStatementResults executePreparedStatement(String statement, LinkedList parameters) throws MStatementSqlException { - if ((null == statement) || ("".equals(statement))) { + if (MText.isBlank(statement)) { throw new IllegalArgumentException("Invalid 'statement': null or empty."); } if (null == parameters) { diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java index d8676e6..ce9dbd0 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.sql; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; public class MSqlConnectionGenerator extends MObject { @@ -20,10 +21,10 @@ public class MSqlConnectionGenerator extends MObject { public MSqlConnectionGenerator(String driver, String url, String username, String password) { super(); // - if ((null == driver) || ("".equals(driver))) { + if (MText.isBlank(driver)) { throw new IllegalArgumentException("Invalid 'driver': null or empty."); } - if ((null == url) || ("".equals(url))) { + if (MText.isBlank(url)) { throw new IllegalArgumentException("Invalid 'url': null or empty."); } if (null == username) { diff --git a/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java b/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java index a013eb9..fb085a8 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.sql; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -115,7 +116,7 @@ public class MSqlStatementResults extends MObject { } public LinkedList getRecordsByField(String field) { - if ((null == field) || ("".equals(field))) { + if (MText.isBlank(field)) { throw new IllegalArgumentException("Invalid 'field': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/sql/MSqlTable.java b/src/java/com/marcozanon/macaco/sql/MSqlTable.java index 64914ab..f7bfd14 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlTable.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlTable.java @@ -7,6 +7,7 @@ package com.marcozanon.macaco.sql; import com.marcozanon.macaco.MObject; +import com.marcozanon.macaco.text.MText; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -24,10 +25,10 @@ public class MSqlTable extends MObject { if (null == connection) { throw new IllegalArgumentException("Invalid 'connection': null."); } - if ((null == table) || ("".equals(table))) { + if (MText.isBlank(table)) { throw new IllegalArgumentException("Invalid 'table': null or empty."); } - if ((null == primaryKey) || ("".equals(primaryKey))) { + if (MText.isBlank(primaryKey)) { throw new IllegalArgumentException("Invalid 'primaryKey': null or empty."); } // diff --git a/src/java/com/marcozanon/macaco/text/MTranslator.java b/src/java/com/marcozanon/macaco/text/MTranslator.java index 06ee12a..24f6330 100644 --- a/src/java/com/marcozanon/macaco/text/MTranslator.java +++ b/src/java/com/marcozanon/macaco/text/MTranslator.java @@ -49,7 +49,7 @@ public class MTranslator extends MObject { } public void parseFile(String file) throws MTranslationFileParsingTextException { - if ((null == file) || ("".equals(file))) { + if (MText.isBlank(file)) { throw new IllegalArgumentException("Invalid 'file': null or empty."); } // @@ -76,7 +76,7 @@ public class MTranslator extends MObject { break; } line = line.trim(); - if ("".equals(line)) { + if (MText.isEmpty(line)) { message = null; continue; } @@ -130,7 +130,7 @@ public class MTranslator extends MObject { } protected String getTranslation(String message, Locale locale, boolean strictMode) throws MTranslationValueNotFoundTextException { - if ((null == message) || ("".equals(message))) { + if (MText.isBlank(message)) { throw new IllegalArgumentException("Invalid 'message': null or empty."); } if (null == locale) { -- 2.30.2