Changeset 6087 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2013-07-26T17:28:24+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PluginPreference.java (modified) (1 diff)
• SourceEditor.java (modified) (2 diffs)
• plugin/PluginListPanel.java (modified) (2 diffs)
• server/OsmApiUrlInputPanel.java (modified) (3 diffs)

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

@@ -441 +441 @@
         public void filter() {
             String expr = tfFilter.getText().trim();
-            if (expr.equals("")) {
+            if (expr.isEmpty()) {
                 expr = null;
             }

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

@@ -1083 +1083 @@
                         @Override
                         public int compare(String o1, String o2) {
-                            if (o1.equals("") && o2.equals(""))
+                            if (o1.isEmpty() && o2.isEmpty())
                                 return 0;
-                            if (o1.equals("")) return 1;
-                            if (o2.equals("")) return -1;
+                            if (o1.isEmpty()) return 1;
+                            if (o2.isEmpty()) return -1;
                             return o1.compareTo(o2);
                         }
@@ -1241 +1241 @@
 
                 while ((line = reader.readLine()) != null && !canceled) {
-                    if (line.trim().equals("")) {
+                    if (line.trim().isEmpty()) {
                         continue; // skip empty lines
                     }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -45 +45 @@
     protected String formatPluginRemoteVersion(PluginInformation pi) {
         StringBuilder sb = new StringBuilder();
-        if (pi.version == null || pi.version.trim().equals("")) {
+        if (pi.version == null || pi.version.trim().isEmpty()) {
             sb.append(tr("unknown"));
         } else {
@@ -58 +58 @@
     protected String formatPluginLocalVersion(PluginInformation pi) {
         if (pi == null) return tr("unknown");
-        if (pi.localversion == null || pi.localversion.trim().equals(""))
+        if (pi.localversion == null || pi.localversion.trim().isEmpty())
             return tr("unknown");
         return pi.localversion;

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

@@ -198 +198 @@
         protected void updateEnabledState() {
             boolean enabled =
-                !tfOsmServerUrl.getText().trim().equals("")
+                !tfOsmServerUrl.getText().trim().isEmpty()
                 && !tfOsmServerUrl.getText().trim().equals(lastTestedUrl);
             if (enabled) {
@@ -236 +236 @@
         @Override
         public boolean isValid() {
-            if (getComponent().getText().trim().equals(""))
+            if (getComponent().getText().trim().isEmpty())
                 return false;
 
@@ -249 +249 @@
         @Override
         public void validate() {
-            if (getComponent().getText().trim().equals("")) {
+            if (getComponent().getText().trim().isEmpty()) {
                 feedbackInvalid(tr("OSM API URL must not be empty. Please enter the OSM API URL."));
                 return;