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

Timestamp:

2013-10-07T20:18:17+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Loose coupling

Location:

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

Files:

• DrawAction.java (modified) (2 diffs)
• ImproveWayAccuracyAction.java (modified) (1 diff)
• ParallelWayAction.java (modified) (4 diffs)
• ParallelWays.java (modified) (1 diff)

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

@@ -424 +424 @@
         Collection<OsmPrimitive> newSelection = new LinkedList<OsmPrimitive>(ds.getSelected());
 
-        ArrayList<Way> reuseWays = new ArrayList<Way>(),
+        List<Way> reuseWays = new ArrayList<Way>(),
                 replacedWays = new ArrayList<Way>();
         boolean newNode = false;
@@ -652 +652 @@
     }
 
-    private void insertNodeIntoAllNearbySegments(List<WaySegment> wss, Node n, Collection<OsmPrimitive> newSelection, Collection<Command> cmds, ArrayList<Way> replacedWays, ArrayList<Way> reuseWays) {
+    private void insertNodeIntoAllNearbySegments(List<WaySegment> wss, Node n, Collection<OsmPrimitive> newSelection, Collection<Command> cmds, List<Way> replacedWays, List<Way> reuseWays) {
         Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
         for (WaySegment ws : wss) {

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

@@ -613 +613 @@
      */
     private void updateStateByCurrentSelection() {
-        final ArrayList<Node> nodeList = new ArrayList<Node>();
-        final ArrayList<Way> wayList = new ArrayList<Way>();
+        final List<Node> nodeList = new ArrayList<Node>();
+        final List<Way> wayList = new ArrayList<Way>();
         final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
 

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -18 +19 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -40 +42 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Geometry;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -122 +123 @@
     private WaySegment referenceSegment;
     private ParallelWays pWays;
-    private LinkedHashSet<Way> sourceWays;
+    private Set<Way> sourceWays;
     private EastNorth helperLineStart;
     private EastNorth helperLineEnd;

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

@@ -178 +178 @@
 
     private List<Command> makeAddWayAndNodesCommandList() {
-        ArrayList<Command> commands = new ArrayList<Command>(sortedNodes.size() + ways.size());
+        List<Command> commands = new ArrayList<Command>(sortedNodes.size() + ways.size());
         for (int i = 0; i < sortedNodes.size() - (isClosedPath() ? 1 : 0); i++) {
             commands.add(new AddCommand(sortedNodes.get(i)));