Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

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

Author:

Don-vip

Message:

Sonar/FindBugs - Loose coupling

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (6 diffs)

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

@@ -457 +457 @@
         commitCommands(marktr("Added node on all intersections"));
 
-        ArrayList<RelationRole> relations = new ArrayList<RelationRole>();
+        List<RelationRole> relations = new ArrayList<RelationRole>();
 
         // Remove ways from all relations so ways can be combined/split quietly
@@ -467 +467 @@
         boolean warnAboutRelations = !relations.isEmpty() && allStartingWays.size() > 1;
 
-        ArrayList<WayInPolygon> preparedWays = new ArrayList<WayInPolygon>();
+        List<WayInPolygon> preparedWays = new ArrayList<WayInPolygon>();
 
         for (Way way : outerStartingWays) {
-            ArrayList<Way> splitWays = splitWayOnNodes(way, nodes);
+            List<Way> splitWays = splitWayOnNodes(way, nodes);
             preparedWays.addAll(markWayInsideSide(splitWays, false));
         }
 
         for (Way way : innerStartingWays) {
-            ArrayList<Way> splitWays = splitWayOnNodes(way, nodes);
+            List<Way> splitWays = splitWayOnNodes(way, nodes);
             preparedWays.addAll(markWayInsideSide(splitWays, true));
         }
 
         // Find boundary ways
-        ArrayList<Way> discardedWays = new ArrayList<Way>();
+        List<Way> discardedWays = new ArrayList<Way>();
         List<AssembledPolygon> bounadries = findBoundaryPolygons(preparedWays, discardedWays);
 
@@ -659 +659 @@
      * @return list of parts, marked with the inside orientation.
      */
-    private ArrayList<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
-
-        ArrayList<WayInPolygon> result = new ArrayList<WayInPolygon>();
+    private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
+
+        List<WayInPolygon> result = new ArrayList<WayInPolygon>();
 
         //prepare prev and next maps
@@ -829 +829 @@
      * @return list of split ways (or original ways if no splitting is done).
      */
-    private ArrayList<Way> splitWayOnNodes(Way way, Set<Node> nodes) {
-
-        ArrayList<Way> result = new ArrayList<Way>();
+    private List<Way> splitWayOnNodes(Way way, Set<Node> nodes) {
+
+        List<Way> result = new ArrayList<Way>();
         List<List<Node>> chunks = buildNodeChunks(way, nodes);
 
@@ -1344 +1344 @@
      * @return List of relations with roles the primitives was part of
      */
-    private ArrayList<RelationRole> removeFromAllRelations(OsmPrimitive osm) {
-        ArrayList<RelationRole> result = new ArrayList<RelationRole>();
+    private List<RelationRole> removeFromAllRelations(OsmPrimitive osm) {
+        List<RelationRole> result = new ArrayList<RelationRole>();
 
         for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
@@ -1383 +1383 @@
      * @param relationsToDelete set of relations to delete.
      */
-    private void fixRelations(ArrayList<RelationRole> rels, Way outer, RelationRole ownMultipol, Set<Relation> relationsToDelete) {
-        ArrayList<RelationRole> multiouters = new ArrayList<RelationRole>();
-
-        if (ownMultipol != null){
+    private void fixRelations(List<RelationRole> rels, Way outer, RelationRole ownMultipol, Set<Relation> relationsToDelete) {
+        List<RelationRole> multiouters = new ArrayList<RelationRole>();
+
+        if (ownMultipol != null) {
             multiouters.add(ownMultipol);
         }