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

Timestamp:

2013-10-07T22:45:15+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Loose coupling

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (4 diffs)
• OrthogonalizeAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -16 +15 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
@@ -427 +427 @@
         }
 
-        static public NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
+        public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
             NodeGraph graph = new NodeGraph();
             for (Way w: ways) {
@@ -437 +437 @@
         private Set<NodePair> edges;
         private int numUndirectedEges = 0;
-        private HashMap<Node, List<NodePair>> successors;
-        private HashMap<Node, List<NodePair>> predecessors;
+        private Map<Node, List<NodePair>> successors;
+        private Map<Node, List<NodePair>> predecessors;
 
         protected void rememberSuccessor(NodePair pair) {

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

@@ -17 +17 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
@@ -71 +72 @@
      * Remember movements, so the user can later undo it for certain nodes
      */
-    private static final HashMap<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
+    private static final Map<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
 
     /**

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

@@ -301 +301 @@
     // events for crossplatform key holding processing
     // thanks to http://www.arco.in-berlin.de/keyevent.html
-    private final TreeSet<Integer> set = new TreeSet<Integer>();
+    private final Set<Integer> set = new TreeSet<Integer>();
     private KeyEvent releaseEvent;
     private Timer timer;

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

@@ -367 +367 @@
     }
 
-    private boolean repaintIfRequired(HashSet<OsmPrimitive> newHighlights) {
+    private boolean repaintIfRequired(Set<OsmPrimitive> newHighlights) {
         if(!drawTargetHighlight)
             return false;