Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -59 +59 @@
         this.sourceDataSet = sourceDataSet;
         conflicts = new ConflictCollection();
-        mergedMap = new HashMap<PrimitiveId, PrimitiveId>();
-        objectsWithChildrenToMerge = new HashSet<PrimitiveId>();
-        objectsToDelete = new HashSet<OsmPrimitive>();
+        mergedMap = new HashMap<>();
+        objectsWithChildrenToMerge = new HashSet<>();
+        objectsToDelete = new HashSet<>();
     }
 
@@ -137 +137 @@
 
     protected void addConflict(OsmPrimitive my, OsmPrimitive their) {
-        addConflict(new Conflict<OsmPrimitive>(my, their));
+        addConflict(new Conflict<>(my, their));
     }
 
@@ -238 +238 @@
             throw new IllegalStateException(tr("Missing merge target for way with id {0}", source.getUniqueId()));
 
-        List<Node> newNodes = new ArrayList<Node>(source.getNodesCount());
+        List<Node> newNodes = new ArrayList<>(source.getNodesCount());
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node)getMergeTarget(sourceNode);
@@ -264 +264 @@
         if (target == null)
             throw new IllegalStateException(tr("Missing merge target for relation with id {0}", source.getUniqueId()));
-        LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
+        LinkedList<RelationMember> newMembers = new LinkedList<>();
         for (RelationMember sourceMember : source.getMembers()) {
             OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());
@@ -272 +272 @@
             newMembers.add(newMember);
             if (targetMember.isDeleted() && !conflicts.hasConflictForMy(targetMember)) {
-                addConflict(new Conflict<OsmPrimitive>(targetMember, sourceMember.getMember(), true));
+                addConflict(new Conflict<>(targetMember, sourceMember.getMember(), true));
                 targetMember.setDeleted(false);
             }
@@ -326 +326 @@
             for (OsmPrimitive referrer: source.getReferrers()) {
                 if (targetDataSet.getPrimitiveById(referrer.getPrimitiveId()) == null) {
-                    addConflict(new Conflict<OsmPrimitive>(target, source, true));
+                    addConflict(new Conflict<>(target, source, true));
                     target.setDeleted(false);
                     break;
@@ -403 +403 @@
         targetDataSet.beginUpdate();
         try {
-            List<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
+            List<? extends OsmPrimitive> candidates = new ArrayList<>(targetDataSet.getNodes());
             for (Node node: sourceDataSet.getNodes()) {
                 mergePrimitive(node, candidates);
@@ -411 +411 @@
             }
             candidates.clear();
-            candidates = new ArrayList<Way>(targetDataSet.getWays());
+            candidates = new ArrayList<>(targetDataSet.getWays());
             for (Way way: sourceDataSet.getWays()) {
                 mergePrimitive(way, candidates);
@@ -419 +419 @@
             }
             candidates.clear();
-            candidates = new ArrayList<Relation>(targetDataSet.getRelations());
+            candidates = new ArrayList<>(targetDataSet.getRelations());
             for (Relation relation: sourceDataSet.getRelations()) {
                 mergePrimitive(relation, candidates);