Changeset 11121 in josm

Timestamp:

2016-10-12T01:40:24+02:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Changeset.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -209 +209 @@
         CheckParameterUtil.ensureParameterNotNull(keys, "keys");
         keys.values().stream()
-                .filter(value -> (value != null && value.length() > MAX_CHANGESET_TAG_LENGTH))
+                .filter(value -> value != null && value.length() > MAX_CHANGESET_TAG_LENGTH)
                 .findFirst()
                 .ifPresent(value -> {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -226 +226 @@
         synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
-            listeners.forEach((listener) -> {
-                listener.propertyChange(evt);
-            });
+            listeners.forEach(listener -> listener.propertyChange(evt));
             }
         }

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.Date;
+import java.util.Set;
+
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.Assert;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
+import org.openstreetmap.josm.data.osm.history.HistoryNode;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Date;
-import java.util.Set;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.history.HistoryNode;
-import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 
 /**
@@ -38 +40 @@
             Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
         } catch (IllegalArgumentException e) {
+            Main.trace(e);
             // Was expected
         }
-        
+
         // empty object, a modification type => empty list
         Assert.assertTrue(
@@ -47 +50 @@
                     ChangesetModificationType.CREATED).isEmpty()
         );
-        
+
         // object with various items and modification types, fetch for CREATED
         // => list containing only the CREATED item
@@ -60 +63 @@
         Assert.assertEquals("We should have found only one item.", 1, result.size());
         Assert.assertTrue("The item found is prim1.", result.contains(prim1));
-        
     }
 }

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.openstreetmap.josm.data.osm.Changeset.MAX_CHANGESET_TAG_LENGTH;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import static org.openstreetmap.josm.data.osm.Changeset.MAX_CHANGESET_TAG_LENGTH;
 
 /**
@@ -35 +38 @@
             Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
         } catch (IllegalArgumentException e) {
+            Main.trace(e);
             // Was expected
         }
-        
+
         // Add a map with no values
         // => the key list is empty
         Map<String, String> keys = new HashMap<>();
-        
+
         // Add a map with valid values : null and short texts
         // => all the items are in the keys
@@ -48 +52 @@
         cs.setKeys(keys);
         Assert.assertEquals("Both valid keys should have been put in the ChangeSet.", 2, cs.getKeys().size());
-        
+
         // Add a map with too long values => IllegalArgumentException
         keys = new HashMap<>();
         StringBuilder b = new StringBuilder(MAX_CHANGESET_TAG_LENGTH + 1);
-        for (int i = 0; i < MAX_CHANGESET_TAG_LENGTH + 1; i++){
+        for (int i = 0; i < MAX_CHANGESET_TAG_LENGTH + 1; i++) {
            b.append("x");
         }
@@ -60 +64 @@
             Assert.fail("Should have thrown an IllegalArgumentException as we gave a too long value.");
         } catch (IllegalArgumentException e) {
+            Main.trace(e);
             // Was expected
         }
-                
     }
 }