Changeset 33265 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Timestamp:

2017-04-17T19:27:17+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm14386 - StackOverflowError

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Files:

• FindRelationAction.java (modified) (1 diff)
• ReconstructPolygonAction.java (modified) (4 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -202 +202 @@
      * I admit, some of it was copypasted from {@link org.openstreetmap.josm.gui.dialogs.RelationListDialog.RelationListModel}.
      */
-    protected class FindRelationListModel extends AbstractListModel<Relation> {
+    protected static class FindRelationListModel extends AbstractListModel<Relation> {
         private final ArrayList<Relation> relations = new ArrayList<>();
         private DefaultListSelectionModel selectionModel;

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -90 +90 @@
         for (JoinedPolygon p : mpc.outerWays) {
 
-            ArrayList<JoinedPolygon> myInnerWays = new ArrayList<JoinedPolygon>();
+            ArrayList<JoinedPolygon> myInnerWays = new ArrayList<>();
             for (JoinedPolygon i : mpc.innerWays) {
                 // if the first point of any inner ring is contained in this
-                // outer ring, then this inner ring belongs to us. This 
+                // outer ring, then this inner ring belongs to us. This
                 // assumption only works if multipolygons have valid geometries
                 EastNorth en = i.ways.get(0).firstNode().getEastNorth();
@@ -102 +102 @@
 
             if (!myInnerWays.isEmpty()) {
-                // this ring has inner rings, so we leave a multipolygon in 
-                // place and don't reconstruct the rings. 
+                // this ring has inner rings, so we leave a multipolygon in
+                // place and don't reconstruct the rings.
                 Relation n = null;
                 if (relationReused) {
@@ -131 +131 @@
 
             // move all tags from relation and common tags from ways
-            // start with all tags from first way but only if area tags are 
-            // present
+            // start with all tags from first way but only if area tags are present
             Map<String, String> tags = p.ways.get(0).getKeys();
             if (!p.ways.get(0).hasAreaTags()) {
@@ -209 +208 @@
         if (newRelation == null || !"multipolygon".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0)
             return false;
-        else {
+        else
             return true;
-        }
     }
 }