Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -41 +41 @@
 
     public TagMergeModel() {
-        tagMergeItems = new ArrayList<TagMergeItem>();
-        listeners = new ArrayList<PropertyChangeListener>();
+        tagMergeItems = new ArrayList<>();
+        listeners = new ArrayList<>();
     }
 
@@ -104 +104 @@
     public void populate(OsmPrimitive my, OsmPrimitive their) {
         tagMergeItems.clear();
-        Set<String> keys = new HashSet<String>();
+        Set<String> keys = new HashSet<>();
         keys.addAll(my.keySet());
         keys.addAll(their.keySet());