Changeset 8510 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) (27 diffs)

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

@@ -52 +52 @@
     protected void ensureSelected(DefaultListSelectionModel model, Object... idx) {
         if (idx == null) return;
-        for (int i=0; i < idx.length; i++) {
+        for (int i = 0; i < idx.length; i++) {
             if (idx[i] instanceof Integer) {
-                int j = (Integer)idx[i];
+                int j = (Integer) idx[i];
                 assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
                 break;
             }
             try {
-                int rows[] = (int[])idx[i];
+                int rows[] = (int[]) idx[i];
                 if (rows.length != 2) {
                     fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows));
@@ -69 +69 @@
                     assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
                 }
-            } catch(ClassCastException e) {
+            } catch (ClassCastException e) {
                 fail("illegal selection range:" + idx[i]);
             }
@@ -95 +95 @@
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
         ensureSelected(mergedSelection, 0);
-
-    }
-
+    }
 
     @Test
@@ -123 +121 @@
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
         ensureSelected(mergedSelection, 0);
-
     }
 
@@ -167 +164 @@
         mergedNodes.add(new Node(1));
 
-        model.copyMyToTop(new int[]{1,2}); // copy node 3 and 4
+        model.copyMyToTop(new int[]{1, 2}); // copy node 3 and 4
 
         mergedNodes = inspectNodeList(model, "Merged");
@@ -176 +173 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 0,1); // first two rows selected
-    }
-
+        ensureSelected(mergedSelection, 0, 1); // first two rows selected
+    }
 
     @Test
@@ -269 +265 @@
         mergedNodes.add(new Node(1));
 
-        model.copyMyToEnd(new int[]{1,2}); // copy node 3 and 4
+        model.copyMyToEnd(new int[]{1, 2}); // copy node 3 and 4
 
         mergedNodes = inspectNodeList(model, "Merged");
@@ -279 +275 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 1,2); // last two rows selected
+        ensureSelected(mergedSelection, 1, 2); // last two rows selected
     }
 
@@ -313 +309 @@
     }
 
-
     @Test
     public void test_copyMyNodesBeforeCurrent_2() {
@@ -329 +324 @@
         mergedNodes.add(new Node(12));
 
-        model.copyMyBeforeCurrent(new int[]{0,1}, 0);
+        model.copyMyBeforeCurrent(new int[]{0, 1}, 0);
 
         assertEquals(5, mergedNodes.size());
@@ -339 +334 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 0,1); // position 0 and 1 selected
+        ensureSelected(mergedSelection, 0, 1); // position 0 and 1 selected
     }
 
@@ -358 +353 @@
 
         try {
-            model.copyMyBeforeCurrent(new int[]{0,1}, -1);
+            model.copyMyBeforeCurrent(new int[]{0, 1}, -1);
             fail("expected IllegalArgumentException");
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             // OK
         }
 
         try {
-            model.copyMyBeforeCurrent(new int[]{0,1}, 4);
+            model.copyMyBeforeCurrent(new int[]{0, 1}, 4);
             fail("expected IllegalArgumentException");
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             // OK
         }
@@ -402 +397 @@
     }
 
-
     @Test
     public void test_copyMyNodesAfterCurrent_2() {
@@ -419 +413 @@
         mergedNodes.add(new Node(12));
 
-        model.copyMyAfterCurrent(new int[]{0,1}, 2);
+        model.copyMyAfterCurrent(new int[]{0, 1}, 2);
 
         assertEquals(5, mergedNodes.size());
@@ -428 +422 @@
         assertEquals(2, mergedNodes.get(4).getId());  // copied node 2 at position 4
 
-
-        DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 3,4); // position 3,4 selected
+        DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
+        ensureSelected(mergedSelection, 3, 4); // position 3,4 selected
     }
 
@@ -449 +442 @@
         mergedNodes.add(new Node(12));
 
-        model.copyMyAfterCurrent(new int[]{0,2}, 0);
+        model.copyMyAfterCurrent(new int[]{0, 2}, 0);
 
         assertEquals(5, mergedNodes.size());
@@ -459 +452 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 1,2); // position 1,2 selected
+        ensureSelected(mergedSelection, 1, 2); // position 1,2 selected
     }
 
@@ -509 +502 @@
         mergedNodes.add(new Node(14));
 
-        model.moveUpMerged(new int[]{1,4});
+        model.moveUpMerged(new int[]{1, 4});
 
         assertEquals(5, mergedNodes.size());
@@ -519 +512 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 0,3); // position 0 and 3 selecte0
+        ensureSelected(mergedSelection, 0, 3); // position 0 and 3 selecte0
     }
 
@@ -539 +532 @@
         mergedNodes.add(new Node(14));
 
-        model.moveUpMerged(new int[]{1,2,3,4});
+        model.moveUpMerged(new int[]{1, 2, 3, 4});
 
         assertEquals(5, mergedNodes.size());
@@ -549 +542 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 0,1,2,3);
+        ensureSelected(mergedSelection, 0, 1, 2, 3);
     }
 
@@ -598 +591 @@
         mergedNodes.add(new Node(14));
 
-        model.moveDownMerged(new int[]{1,3});
+        model.moveDownMerged(new int[]{1, 3});
 
         assertEquals(5, mergedNodes.size());
@@ -608 +601 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 2,4);
+        ensureSelected(mergedSelection, 2, 4);
     }
 
@@ -628 +621 @@
         mergedNodes.add(new Node(14));
 
-        model.moveDownMerged(new int[]{1,2,3});
+        model.moveDownMerged(new int[]{1, 2, 3});
 
         assertEquals(5, mergedNodes.size());
@@ -638 +631 @@
 
         DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel");
-        ensureSelected(mergedSelection, 2,3,4);
+        ensureSelected(mergedSelection, 2, 3, 4);
     }
 
@@ -712 +705 @@
             }
         }
+
         MyListener listener = new MyListener();
         model.addPropertyChangeListener(listener);
@@ -722 +716 @@
         assertEquals(!oldValue, listener.events.get(0).getNewValue());
     }
-
 }