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

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/data

Files:

• CustomConfigurator.java (modified) (6 diffs)
• validation/routines/InetAddressValidator.java (modified) (1 diff)
• validation/routines/UrlValidator.java (modified) (1 diff)
• validation/tests/RelationChecker.java (modified) (1 diff)
• validation/tests/TagChecker.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -178 +178 @@
     public static int askForOption(String text, String opts) {
         Integer answer;
-        if (opts.length()>0) {
+        if (!opts.isEmpty()) {
             String[] options = opts.split(";");
             answer = JOptionPane.showOptionDialog(Main.parent, text, "Question", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, 0);
@@ -189 +189 @@
     public static String askForText(String text) {
         String s = JOptionPane.showInputDialog(Main.parent, text, tr("Enter text"), JOptionPane.QUESTION_MESSAGE);
-        if (s!=null && (s=s.trim()).length()>0) {
+        if (s!=null && !(s=s.trim()).isEmpty()) {
             return s;
         } else {
@@ -558 +558 @@
             PreferencesUtils.showPrefs(tmpPref);
 
-            if (id.length()>0) {
+            if (!id.isEmpty()) {
                 try {
                     String fragmentVar = "API.fragments['"+id+"']";
@@ -621 +621 @@
             String text = evalVars(elem.getAttribute("text"));
             String locText = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".text"));
-            if (locText!=null && locText.length()>0) text=locText;
+            if (locText!=null && !locText.isEmpty()) text=locText;
 
             String type = evalVars(elem.getAttribute("type"));
@@ -630 +630 @@
             String text = evalVars(elem.getAttribute("text"));
             String locText = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".text"));
-            if (locText.length()>0) text=locText;
+            if (!locText.isEmpty()) text=locText;
             String var = elem.getAttribute("var");
             if (var.isEmpty()) var="result";
@@ -640 +640 @@
                 String opts = evalVars(elem.getAttribute("options"));
                 String locOpts = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".options"));
-                if (locOpts.length()>0) opts=locOpts;
+                if (!locOpts.isEmpty()) opts=locOpts;
                 setVar(var, String.valueOf(askForOption(text, opts)));
             }

trunk/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java

@@ -74 +74 @@
         for (int i = 0; i <= 3; i++) {
             String ipSegment = groups[i];
-            if (ipSegment == null || ipSegment.length() <= 0) {
+            if (ipSegment == null || ipSegment.isEmpty()) {
                 return false;
             }

trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java

@@ -405 +405 @@
 
         String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
-        if (extra != null && extra.trim().length() > 0){
+        if (extra != null && !extra.trim().isEmpty()){
             return false;
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -301 +301 @@
                 }));
 
-                if (key.length() > 0) {
+                if (!key.isEmpty()) {
                     String s = marktr("Role {0} unknown in templates {1}");
 

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -177 +177 @@
                 boolean isFirstLine = true;
                 String line;
-                while ((line = reader.readLine()) != null && (tagcheckerfile || line.length() != 0)) {
+                while ((line = reader.readLine()) != null && (tagcheckerfile || !line.isEmpty())) {
                     if (line.startsWith("#")) {
                         if (line.startsWith("# JOSM TagChecker")) {
@@ -218 +218 @@
                         }
                     } else if (tagcheckerfile) {
-                        if (line.length() > 0) {
+                        if (!line.isEmpty()) {
                             CheckerData d = new CheckerData();
                             String err = d.getData(line);
@@ -247 +247 @@
         }
 
-        if (errorSources.length() > 0)
+        if (!errorSources.isEmpty())
             throw new IOException(tr("Could not access data file(s):\n{0}", errorSources));
     }
@@ -382 +382 @@
                 withErrors.put(p, "HTML");
             }
-            if (checkValues && key != null && value != null && value.length() > 0 && presetsValueData != null) {
+            if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null) {
                 final Set<String> values = presetsValueData.get(key);
                 final boolean keyInPresets = values != null;
@@ -440 +440 @@
                 }
             }
-            if (checkFixmes && key != null && value != null && value.length() > 0) {
+            if (checkFixmes && key != null && value != null && !value.isEmpty()) {
                 if ((value.toLowerCase(Locale.ENGLISH).contains("fixme")
                         || value.contains("check and delete")