Changeset 11315 in josm for trunk/src/org

Timestamp:

2016-11-26T00:30:08+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - UC_USELESS_OBJECT

File:

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

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

@@ -1094 +1094 @@
     public static List<AssembledPolygon> findBoundaryPolygons(Collection<WayInPolygon> multigonWays,
             List<Way> discardedResult) {
-        //first find all discardable ways, by getting outer shells.
-        //this will produce incorrect boundaries in some cases, but second pass will fix it.
-        List<WayInPolygon> discardedWays = new ArrayList<>();
-
         // In multigonWays collection, some way are just a point (i.e. way like nodeA-nodeA)
         // This seems to appear when is apply over invalid way like #9911 test-case
@@ -1103 +1099 @@
         List<WayInPolygon> cleanMultigonWays = new ArrayList<>();
         for (WayInPolygon way: multigonWays) {
-            if (way.way.getNodesCount() == 2 && way.way.isClosed())
-                discardedWays.add(way);
-            else
+            if (way.way.getNodesCount() != 2 || !way.way.isClosed())
                 cleanMultigonWays.add(way);
         }