Changeset 8880 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-10-15T00:11:11+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle + remove call to org.hamcrest.CoreMatchers.is (generating a deprecation warning)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/RelationMemberConflictDecision.java (modified) (1 diff)
• mappaint/mapcss/Condition.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

@@ -118 +118 @@
     @Override
     public String toString() {
-        return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId() + " => " + decision;
+        return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId()
+            + " => " + decision;
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -320 +320 @@
         @Override
         protected boolean matches(Environment env) {
-            for (Map.Entry<String,String> kv: env.osm.getKeys().entrySet()) {
+            for (Map.Entry<String, String> kv: env.osm.getKeys().entrySet()) {
                 if (keyPattern.matcher(kv.getKey()).find() && pattern.matcher(kv.getValue()).find()) {
                     return true;