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

Timestamp:

2015-11-25T01:21:14+01:00 (9 years ago)

Author:

Don-vip

Message:

Sonar - squid:S1941 - Variables should not be declared before they are relevant

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• DeleteCommand.java (modified) (2 diffs)
• PurgeCommand.java (modified) (3 diffs)

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

@@ -374 +374 @@
             return null;
 
-        Collection<Way> waysToBeChanged = new HashSet<>();
-
         if (alsoDeleteNodesInWay) {
             // delete untagged nodes only referenced by primitives in primitivesToDelete, too
@@ -386 +384 @@
             return null;
 
-        waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
+        Collection<Way> waysToBeChanged = new HashSet<>(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
 
         Collection<Command> cmds = new LinkedList<>();

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

@@ -200 +200 @@
         @SuppressWarnings({ "unchecked", "rawtypes" })
         Set<Relation> inR = (Set) in;
-        Set<Relation> childlessR = new HashSet<>();
-        List<Relation> outR = new ArrayList<>(inR.size());
 
         Map<Relation, Integer> numChilds = new HashMap<>();
@@ -219 +217 @@
             }
         }
+        Set<Relation> childlessR = new HashSet<>();
         for (Relation r : inR) {
             if (numChilds.get(r).equals(0)) {
@@ -225 +224 @@
         }
 
+        List<Relation> outR = new ArrayList<>(inR.size());
         while (!childlessR.isEmpty()) {
             // Identify one childless Relation and