Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.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/tags/PasteTagsConflictResolverDialog.java (modified) (4 diffs)

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

@@ -46 +46 @@
     private static final Map<OsmPrimitiveType, String> PANE_TITLES;
     static {
-        PANE_TITLES = new HashMap<OsmPrimitiveType, String>();
+        PANE_TITLES = new HashMap<>();
         PANE_TITLES.put(OsmPrimitiveType.NODE, tr("Tags from nodes"));
         PANE_TITLES.put(OsmPrimitiveType.WAY, tr("Tags from ways"));
@@ -78 +78 @@
         setTitle(tr("Conflicts in pasted tags"));
         allPrimitivesResolver = new TagConflictResolver();
-        resolvers = new HashMap<OsmPrimitiveType, TagConflictResolver>();
+        resolvers = new HashMap<>();
         for (OsmPrimitiveType type: OsmPrimitiveType.dataValues()) {
             resolvers.put(type, new TagConflictResolver());
@@ -360 +360 @@
 
         public StatisticsInfo() {
-            sourceInfo = new HashMap<OsmPrimitiveType, Integer>();
-            targetInfo = new HashMap<OsmPrimitiveType, Integer>();
+            sourceInfo = new HashMap<>();
+            targetInfo = new HashMap<>();
         }
     }
@@ -398 +398 @@
 
         public StatisticsTableModel() {
-            data = new ArrayList<StatisticsInfo>();
+            data = new ArrayList<>();
         }