Changeset 8880 in josm for trunk/src/org


Ignore:
Timestamp:
2015-10-15T00:11:11+02:00 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

    r8871 r8880  
    118118    @Override
    119119    public String toString() {
    120         return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId() + " => " + decision;
     120        return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId()
     121            + " => " + decision;
    121122    }
    122123}
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r8874 r8880  
    320320        @Override
    321321        protected boolean matches(Environment env) {
    322             for (Map.Entry<String,String> kv: env.osm.getKeys().entrySet()) {
     322            for (Map.Entry<String, String> kv: env.osm.getKeys().entrySet()) {
    323323                if (keyPattern.matcher(kv.getKey()).find() && pattern.matcher(kv.getValue()).find()) {
    324324                    return true;
Note: See TracChangeset for help on using the changeset viewer.