Changeset 17374 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java

Timestamp:

2020-11-29T10:33:58+01:00 (3 years ago)

Author:

GerdP

Message:

see #20167: [patch] Improve code readability by replacing indexed loops with foreach
Patch by gaben, slightly modified
I removed the changes for

• GpxImageCorrelation.java, they introduce a TODO
• ConnectivityRelations.java (no improvement in readability)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (modified) (2 diffs)

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

@@ -220 +220 @@
             StringBuilder expression = new StringBuilder();
             int maxLength = 0;
-            for (int i = 0; i < words.length; i++) {
-                if (words[i].length() > maxLength) {
-                    maxLength = words[i].length();
+            for (String word : words) {
+                if (word.length() > maxLength) {
+                    maxLength = word.length();
                 }
                 if (expression.length() > 0) {
                     expression.append('|');
                 }
-                expression.append(Pattern.quote(words[i]));
+                expression.append(Pattern.quote(word));
             }
             this.regExpr = Pattern.compile(expression.toString(), CASE_INSENSITIVE + UNICODE_CASE);
@@ -243 +243 @@
             // which word matches?
             String part = "";
-            for (int i = 0; i < words.length; i++) {
-                String word = words[i];
+            for (String word : words) {
                 if (start + word.length() <= name.length()) {
                     part = name.substring(start, start + word.length());