Changeset 17374 in josm for trunk/test/unit/org/openstreetmap/josm/gui

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/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -76 +76 @@
     protected void ensureSelected(DefaultListSelectionModel model, Object... idx) {
         if (idx == null) return;
-        for (int i = 0; i < idx.length; i++) {
-            if (idx[i] instanceof Integer) {
-                int j = (Integer) idx[i];
+        for (Object object : idx) {
+            if (object instanceof Integer) {
+                int j = (Integer) object;
                 assertTrue(model.isSelectedIndex(j), "expected row " + j + " to be selected");
                 break;
             }
-            int[] rows = (int[]) idx[i];
+            int[] rows = (int[]) object;
             if (rows.length != 2) {
                 fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows));