Changeset 9070 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-11-30T08:36:35+01:00 (9 years ago)

Author:

Don-vip

Message:

Sonar - squid:S2293 - The diamond operator ("<>") should be used

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• mapmode/ExtrudeAction.java (modified) (1 diff)
• relation/AbstractRelationAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -188 +188 @@
         cmds.addAll(resolution);
         cmds.add(new DeleteCommand(deletedWays));
-        final SequenceCommand sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
+        final Command sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
                 trn("Combine {0} way", "Combine {0} ways", ways.size(), ways.size()), cmds);
 
-        return new Pair<Way, Command>(targetWay, sequenceCommand);
+        return new Pair<>(targetWay, sequenceCommand);
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -883 +883 @@
 
         // add direction perpendicular to the selected segment
-        possibleMoveDirections = new ArrayList<ReferenceSegment>();
+        possibleMoveDirections = new ArrayList<>();
         possibleMoveDirections.add(new ReferenceSegment(new EastNorth(
                 initialN1en.getY() - initialN2en.getY(),

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -24 +24 @@
             return Collections.<Relation>emptySet();
         } else {
-            return new SubclassFilteredCollection<OsmPrimitive, Relation>(
-                    primitives, OsmPrimitive.relationPredicate);
+            return new SubclassFilteredCollection<>(primitives, OsmPrimitive.relationPredicate);
         }
     }