Changeset 8461 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-06-03T14:05:30+02:00 (9 years ago)

Author:

Don-vip

Message:

global use of String.isEmpty()

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (1 diff)
• ExtendedDialog.java (modified) (1 diff)
• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (1 diff)
• download/PlaceSelection.java (modified) (1 diff)
• layer/NoteLayer.java (modified) (1 diff)
• oauth/FullyAutomaticAuthorizationUI.java (modified) (2 diffs)
• oauth/FullyAutomaticPropertiesPanel.java (modified) (1 diff)
• preferences/PreferenceTabbedPane.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (5 diffs)
• preferences/server/UserNameValidator.java (modified) (1 diff)
• tagging/ac/AutoCompletingComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -525 +525 @@
               .append("</strong>=");
             String value = tags.get(key);
-            while(value.length() != 0) {
+            while (!value.isEmpty()) {
                 sb.append(value.substring(0,Math.min(50, value.length())));
                 if (value.length() > 50) {

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -492 +492 @@
 
         // Ensure all required variables are available
-        if(rememberSizePref.length() != 0 && defaultWindowGeometry != null) {
+        if (!rememberSizePref.isEmpty() && defaultWindowGeometry != null) {
             if(visible) {
                 initWindowGeometry().applySafe(this);

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -1025 +1025 @@
         @Override
         public boolean isValid() {
-            return getComponent().getText().trim().length() > 0;
+            return !getComponent().getText().trim().isEmpty();
         }
 

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -305 +305 @@
 
         protected final void updateEnabledState() {
-            setEnabled(cbSearchExpression.getText().trim().length() > 0);
+            setEnabled(!cbSearchExpression.getText().trim().isEmpty());
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -117 +117 @@
                 String commentText = comment.getText();
                 //closing a note creates an empty comment that we don't want to show
-                if (commentText != null && commentText.trim().length() > 0) {
+                if (commentText != null && !commentText.trim().isEmpty()) {
                     sb.append("<hr/>");
                     String userName = XmlWriter.encode(comment.getUser().getName());

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -408 +408 @@
         @Override
         public boolean isValid() {
-            return getComponent().getText().trim().length() > 0;
+            return !getComponent().getText().trim().isEmpty();
         }
 
@@ -429 +429 @@
         @Override
         public boolean isValid() {
-            return getComponent().getText().trim().length() > 0;
+            return !getComponent().getText().trim().isEmpty();
         }
 

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

@@ -82 +82 @@
         @Override
         public boolean isValid() {
-            return getComponent().getText().trim().length() > 0;
+            return !getComponent().getText().trim().isEmpty();
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -489 +489 @@
                     // Get icon
                     String iconName = tps.getIconName();
-                    ImageIcon icon = iconName != null && iconName.length() > 0 ? ImageProvider.get("preferences", iconName) : null;
+                    ImageIcon icon = iconName != null && !iconName.isEmpty() ? ImageProvider.get("preferences", iconName) : null;
                     // See #6985 - Force icons to be 48x48 pixels
                     if (icon != null && (icon.getIconHeight() != 48 || icon.getIconWidth() != 48)) {

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -218 +218 @@
                     skip('=');
                     String paramValue = readTillChar(',',')');
-                    if (paramName.length() > 0 && paramValue.length() > 0) {
+                    if (!paramName.isEmpty() && !paramValue.isEmpty()) {
                         ActionParameter<?> actionParam = actionParams.get(paramName);
                         if (actionParam != null) {
@@ -235 +235 @@
                     skip('=');
                     String paramValue = readTillChar(',','}');
-                    if ("icon".equals(paramName) && paramValue.length() > 0) {
+                    if ("icon".equals(paramName) && !paramValue.isEmpty()) {
                         result.setIcon(paramValue);
-                    } else if("name".equals(paramName) && paramValue.length() > 0) {
+                    } else if("name".equals(paramName) && !paramValue.isEmpty()) {
                         result.setName(paramValue);
                     }
@@ -289 +289 @@
                 boolean first = true;
                 String tmp = action.getName();
-                if(tmp.length() != 0) {
+                if (!tmp.isEmpty()) {
                     result.append(first ? "{" : ",");
                     result.append("name=");
@@ -296 +296 @@
                 }
                 tmp = action.getIcon();
-                if(tmp.length() != 0) {
+                if (!tmp.isEmpty()) {
                     result.append(first ? "{" : ",");
                     result.append("icon=");
@@ -385 +385 @@
             ActionParameter<Object> param = getParam(paramIndex);
 
-            if (param != null && val.length() > 0) {
+            if (param != null && !val.isEmpty()) {
                 currentAction.getParameters().put(param.getName(), param.readFromString((String)aValue));
             }

trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java

@@ -23 +23 @@
     @Override
     public boolean isValid() {
-        return getComponent().getText().trim().length() > 0;
+        return !getComponent().getText().trim().isEmpty();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -104 +104 @@
                 try {
                     Long.parseLong(str);
-                    if (curText.length() != 0)
+                    if (!curText.isEmpty())
                         Long.parseLong(curText);
                     item = lookupItem(curText, true);