Changeset 13016 in josm

Timestamp:

2017-10-17T21:49:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15443 - make sure dataset is always properly initialized in JoinAreasAction

File:

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

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

@@ -109 +109 @@
          */
         public Multipolygon(Way way) {
-            outerWay = way;
+            outerWay = Objects.requireNonNull(way, "way");
             innerWays = new ArrayList<>();
         }
@@ -536 +536 @@
 
         try {
-            // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,
-            // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
-            // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
-            ds = ways.iterator().next().getDataSet();
-
             // Do the job of joining areas
             JoinAreasResult result = joinAreas(areas);
@@ -601 +596 @@
      */
     public JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
+
+        // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,
+        // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
+        // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
+        if (!areas.isEmpty()) {
+            ds = areas.iterator().next().getOuterWay().getDataSet();
+        }
 
         boolean hasChanges = false;