Changeset 8338 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2015-05-07T01:27:41+02:00 (9 years ago)

Author:

Don-vip

Message:

fix squid:S1319 - Declarations should use Java collection interfaces rather than specific implementation classes

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DrawAction.java (modified) (1 diff)
• ExtrudeAction.java (modified) (2 diffs)
• ParallelWays.java (modified) (2 diffs)
• SelectAction.java (modified) (1 diff)

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

@@ -950 +950 @@
 
     private static void pruneSuccsAndReverse(List<Integer> is) {
-        HashSet<Integer> is2 = new HashSet<>();
+        Set<Integer> is2 = new HashSet<>();
         for (int i : is) {
             if (!is2.contains(i - 1) && !is2.contains(i + 1)) {

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

@@ -101 +101 @@
      * Collection of nodes that is moved
      */
-    private ArrayList<Node> movingNodeList;
+    private List<Node> movingNodeList;
 
     /**
@@ -626 +626 @@
         boolean segmentAngleZero = prevNode != null && Math.abs(Geometry.getCornerAngle(prevNode.getEastNorth(), initialN1en, newN1en)) < 1e-5;
         boolean hasOtherWays = hasNodeOtherWays(selectedSegment.getFirstNode(), selectedSegment.way);
-        ArrayList<Node> changedNodes = new ArrayList<>();
+        List<Node> changedNodes = new ArrayList<>();
         if (nodeOverlapsSegment && !alwaysCreateNodes && !hasOtherWays) {
             //move existing node

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

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
@@ -40 +41 @@
         // Make a deep copy of the ways, keeping the copied ways connected
         // TODO: This assumes the first/last nodes of the ways are the only possible shared nodes.
-        HashMap<Node, Node> splitNodeMap = new HashMap<>(sourceWays.size());
+        Map<Node, Node> splitNodeMap = new HashMap<>(sourceWays.size());
         for (Way w : sourceWays) {
             if (!splitNodeMap.containsKey(w.firstNode())) {

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

@@ -248 +248 @@
         determineMapMode(!c.isEmpty());
 
-        HashSet<OsmPrimitive> newHighlights = new HashSet<>();
+        Set<OsmPrimitive> newHighlights = new HashSet<>();
 
         virtualManager.clear();