Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• AddPrimitivesCommand.java (modified) (4 diffs)
• ChangePropertyCommand.java (modified) (3 diffs)
• ChangePropertyKeyCommand.java (modified) (2 diffs)
• Command.java (modified) (3 diffs)
• DeleteCommand.java (modified) (10 diffs)
• MoveCommand.java (modified) (2 diffs)
• PurgeCommand.java (modified) (3 diffs)
• RemoveNodesCommand.java (modified) (1 diff)
• SequenceCommand.java (modified) (1 diff)
• TransformNodesCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -24 +24 @@
 public class AddPrimitivesCommand extends Command {
 
-    private List<PrimitiveData> data = new ArrayList<PrimitiveData>();
-    private Collection<PrimitiveData> toSelect = new ArrayList<PrimitiveData>();
+    private List<PrimitiveData> data = new ArrayList<>();
+    private Collection<PrimitiveData> toSelect = new ArrayList<>();
 
     // only filled on undo
@@ -71 +71 @@
         Collection<OsmPrimitive> primitivesToSelect;
         if (createdPrimitives == null) { // first time execution
-            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(data.size());
-            primitivesToSelect = new ArrayList<OsmPrimitive>(toSelect.size());
+            List<OsmPrimitive> newPrimitives = new ArrayList<>(data.size());
+            primitivesToSelect = new ArrayList<>(toSelect.size());
 
             for (PrimitiveData pd : data) {
@@ -115 +115 @@
 
         if (createdPrimitives == null) {
-            createdPrimitives = new ArrayList<OsmPrimitive>(data.size());
-            createdPrimitivesToSelect = new ArrayList<OsmPrimitive>(toSelect.size());
+            createdPrimitives = new ArrayList<>(data.size());
+            createdPrimitivesToSelect = new ArrayList<>(toSelect.size());
 
             for (PrimitiveData pd : data) {
@@ -162 +162 @@
             return createdPrimitives;
 
-        Collection<OsmPrimitive> prims = new HashSet<OsmPrimitive>();
+        Collection<OsmPrimitive> prims = new HashSet<>();
         for (PrimitiveData d : data) {
             OsmPrimitive osm = getLayer().data.getPrimitiveById(d);

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -49 +49 @@
      */
     public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, AbstractMap<String, String> tags) {
-        this.objects = new LinkedList<OsmPrimitive>();
+        this.objects = new LinkedList<>();
         this.tags = tags;
         init(objects);
@@ -62 +62 @@
      */
     public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, String key, String value) {
-        this.objects = new LinkedList<OsmPrimitive>();
-        this.tags = new HashMap<String, String>(1);
+        this.objects = new LinkedList<>();
+        this.tags = new HashMap<>(1);
         this.tags.put(key, value);
         init(objects);
@@ -201 +201 @@
         if (objects.size() == 1)
             return null;
-        List<PseudoCommand> children = new ArrayList<PseudoCommand>();
+        List<PseudoCommand> children = new ArrayList<>();
         for (final OsmPrimitive osm : objects) {
             children.add(new PseudoCommand() {

trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java

@@ -54 +54 @@
      */
     public ChangePropertyKeyCommand(Collection<? extends OsmPrimitive> objects, String key, String newKey) {
-        this.objects = new LinkedList<OsmPrimitive>(objects);
+        this.objects = new LinkedList<>(objects);
         this.key = key;
         this.newKey = newKey;
@@ -101 +101 @@
         if (objects.size() == 1)
             return null;
-        List<PseudoCommand> children = new ArrayList<PseudoCommand>();
+        List<PseudoCommand> children = new ArrayList<>();
 
         final NameVisitor v = new NameVisitor();

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -39 +39 @@
 
     private static final class CloneVisitor extends AbstractVisitor {
-        public final Map<OsmPrimitive, PrimitiveData> orig = new LinkedHashMap<OsmPrimitive, PrimitiveData>();
+        public final Map<OsmPrimitive, PrimitiveData> orig = new LinkedHashMap<>();
 
         @Override
@@ -76 +76 @@
 
     /** the map of OsmPrimitives in the original state to OsmPrimitives in cloned state */
-    private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<OsmPrimitive, PrimitiveData>();
+    private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<>();
 
     /** the layer which this command is applied to */
@@ -106 +106 @@
     public boolean executeCommand() {
         CloneVisitor visitor = new CloneVisitor();
-        Collection<OsmPrimitive> all = new ArrayList<OsmPrimitive>();
+        Collection<OsmPrimitive> all = new ArrayList<>();
         fillModifiedData(all, all, all);
         for (OsmPrimitive osm : all) {

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -51 +51 @@
      */
     private final Collection<? extends OsmPrimitive> toDelete;
-    private final Map<OsmPrimitive, PrimitiveData> clonedPrimitives = new HashMap<OsmPrimitive, PrimitiveData>();
+    private final Map<OsmPrimitive, PrimitiveData> clonedPrimitives = new HashMap<>();
 
     /**
@@ -150 +150 @@
 
     private Set<OsmPrimitiveType> getTypesToDelete() {
-        Set<OsmPrimitiveType> typesToDelete = new HashSet<OsmPrimitiveType>();
+        Set<OsmPrimitiveType> typesToDelete = new HashSet<>();
         for (OsmPrimitive osm : toDelete) {
             typesToDelete.add(OsmPrimitiveType.from(osm));
@@ -201 +201 @@
             return null;
         else {
-            List<PseudoCommand> children = new ArrayList<PseudoCommand>(toDelete.size());
+            List<PseudoCommand> children = new ArrayList<>(toDelete.size());
             for (final OsmPrimitive osm : toDelete) {
                 children.add(new PseudoCommand() {
@@ -278 +278 @@
      */
     protected static Collection<Node> computeNodesToDelete(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
-        Collection<Node> nodesToDelete = new HashSet<Node>();
+        Collection<Node> nodesToDelete = new HashSet<>();
         for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) {
             for (Node n : way.getNodes()) {
@@ -339 +339 @@
             return null;
 
-        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
+        Set<OsmPrimitive> primitivesToDelete = new HashSet<>(selection);
 
         Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class);
@@ -345 +345 @@
             return null;
 
-        Collection<Way> waysToBeChanged = new HashSet<Way>();
+        Collection<Way> waysToBeChanged = new HashSet<>();
 
         if (alsoDeleteNodesInWay) {
@@ -359 +359 @@
         waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
 
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
         for (Way w : waysToBeChanged) {
             Way wnew = new Way(w);
@@ -415 +415 @@
             // the way shouldn't be splitted
 
-            List<Node> n = new ArrayList<Node>();
+            List<Node> n = new ArrayList<>();
 
             n.addAll(ws.way.getNodes().subList(ws.lowerIndex + 1, ws.way.getNodesCount() - 1));
@@ -426 +426 @@
         }
 
-        List<Node> n1 = new ArrayList<Node>(), n2 = new ArrayList<Node>();
+        List<Node> n1 = new ArrayList<>(), n2 = new ArrayList<>();
 
         n1.addAll(ws.way.getNodes().subList(0, ws.lowerIndex + 1));
@@ -440 +440 @@
             return new ChangeCommand(ws.way, wnew);
         } else {
-            List<List<Node>> chunks = new ArrayList<List<Node>>(2);
+            List<List<Node>> chunks = new ArrayList<>(2);
             chunks.add(n1);
             chunks.add(n2);

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -30 +30 @@
      * The objects that should be moved.
      */
-    private Collection<Node> nodes = new LinkedList<Node>();
+    private Collection<Node> nodes = new LinkedList<>();
     /**
      * Starting position, base command point, current (mouse-drag) position = startEN + (x,y) =
@@ -51 +51 @@
      * List of all old states of the objects.
      */
-    private List<OldNodeState> oldState = new LinkedList<OldNodeState>();
+    private List<OldNodeState> oldState = new LinkedList<>();
 
     /**

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -68 +68 @@
 
     protected final void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) {
-        makeIncompleteData = new Storage<PrimitiveData>(new Storage.PrimitiveIdHash());
+        makeIncompleteData = new Storage<>(new Storage.PrimitiveIdHash());
         makeIncompleteData_byPrimId = makeIncompleteData.foreignKey(new Storage.PrimitiveIdHash());
 
@@ -143 +143 @@
      */
     public static List<OsmPrimitive> topoSort(Collection<OsmPrimitive> sel) {
-        Set<OsmPrimitive> in = new HashSet<OsmPrimitive>(sel);
-
-        List<OsmPrimitive> out = new ArrayList<OsmPrimitive>(in.size());
+        Set<OsmPrimitive> in = new HashSet<>(sel);
+
+        List<OsmPrimitive> out = new ArrayList<>(in.size());
 
         // Nodes not deleted in the first pass
-        Set<OsmPrimitive> remainingNodes = new HashSet<OsmPrimitive>(in.size());
+        Set<OsmPrimitive> remainingNodes = new HashSet<>(in.size());
 
         /**
@@ -198 +198 @@
         @SuppressWarnings({ "unchecked", "rawtypes" })
         Set<Relation> inR = (Set) in;
-        Set<Relation> childlessR = new HashSet<Relation>();
-        List<Relation> outR = new ArrayList<Relation>(inR.size());
-
-        HashMap<Relation, Integer> numChilds = new HashMap<Relation, Integer>();
+        Set<Relation> childlessR = new HashSet<>();
+        List<Relation> outR = new ArrayList<>(inR.size());
+
+        HashMap<Relation, Integer> numChilds = new HashMap<>();
 
         // calculate initial number of childs

trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java

@@ -37 +37 @@
     public RemoveNodesCommand(Way way, List<Node> rmNodes) {
         this.way = way;
-        this.rmNodes = new HashSet<Node>(rmNodes);
+        this.rmNodes = new HashSet<>(rmNodes);
     }
 

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -108 +108 @@
     @Override
     public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
-        Collection<OsmPrimitive> prims = new HashSet<OsmPrimitive>();
+        Collection<OsmPrimitive> prims = new HashSet<>();
         for (Command c : sequence) {
             prims.addAll(c.getParticipatingPrimitives());

trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

@@ -27 +27 @@
      * The nodes to transform.
      */
-    protected Collection<Node> nodes = new LinkedList<Node>();
+    protected Collection<Node> nodes = new LinkedList<>();
 
 
@@ -33 +33 @@
      * List of all old states of the nodes.
      */
-    protected Map<Node, OldNodeState> oldStates = new HashMap<Node, OldNodeState>();
+    protected Map<Node, OldNodeState> oldStates = new HashMap<>();
 
     /**