Changeset 8510 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair

Files:

• nodes/NodeListMergerTest.java (modified) (3 diffs)
• properties/PropertiesMergerTest.java (modified) (1 diff)
• relation/RelationMemberMergerTest.java (modified) (1 diff)
• tags/TagMergerTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java

@@ -22 +22 @@
         Node n1;
         w1.addNode(n1 = new Node(1));
-        for (int i=0; i < 20; i++) {
+        for (int i = 0; i < 20; i++) {
             n1.put("key" + i, "value" + i);
         }
         StringBuilder note = new StringBuilder();
-        for (int i=0; i < 50; i++) {
+        for (int i = 0; i < 50; i++) {
             note.append(" A very long text ");
         }
@@ -49 +49 @@
 
         Way w2 = new Way();
-        for (int i = 1; i < 200; i+=2) {
+        for (int i = 1; i < 200; i += 2) {
             w2.addNode(new Node(i));
         }
@@ -72 +72 @@
     static public void main(String args[]) {
         NodeListMergerTest test = new NodeListMergerTest();
-        test.setSize(600,600);
+        test.setSize(600, 600);
         test.setVisible(true);
     }

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -28 +28 @@
     protected void populate() {
         Node my = new Node(1);
-        my.setCoor(new LatLon(1,1));
+        my.setCoor(new LatLon(1, 1));
         my.setDeleted(true);
 
         Node their = new Node(2);
-        their.setCoor(new LatLon(10,10));
+        their.setCoor(new LatLon(10, 10));
 
         merger.getModel().populate(new Conflict<OsmPrimitive>(my, their));

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java

@@ -51 +51 @@
     static public void main(String args[]) {
         RelationMemberMergerTest test = new RelationMemberMergerTest();
-        test.setSize(600,600);
+        test.setSize(600, 600);
         test.setVisible(true);
     }

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java

@@ -29 +29 @@
         tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf",
                 "a very long value asdfasdf"));
-        for (int i=0; i< 50; i++) {
+        for (int i = 0; i < 50; i++) {
           tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue"));
         }
@@ -36 +36 @@
     public static void main(String args[]) {
         TagMergerTest test  = new TagMergerTest();
-        test.setSize(600,600);
+        test.setSize(600, 600);
         test.setVisible(true);
     }