Ignore:
Timestamp:
2016-07-23T00:26:24+02:00 (8 years ago)
Author:
Don-vip
Message:

see #11390 - sonar - squid:S2293 - improved use of diamond operator thanks to Java 8 (JEP 101: ​http://openjdk.java.net/jeps/101)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

    r10378 r10593  
    156156        mode = Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY;
    157157        tagsForAllPrimitives = tagsForAllPrimitives == null ? new TagCollection() : tagsForAllPrimitives;
    158         sourceStatistics = sourceStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : sourceStatistics;
    159         targetStatistics = targetStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : targetStatistics;
     158        sourceStatistics = sourceStatistics == null ? new HashMap<>() : sourceStatistics;
     159        targetStatistics = targetStatistics == null ? new HashMap<>() : targetStatistics;
    160160
    161161        // init the resolver
Note: See TracChangeset for help on using the changeset viewer.