Changeset 33694 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

2017-10-03T22:34:26+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15320

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (5 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
@@ -85 +86 @@
         List<OsmPrimitive> newSelection = new ArrayList<>();
         List<Command> commands = new ArrayList<>();
-        Command relationDeleteCommand = DeleteCommand.delete(
-                MainApplication.getLayerManager().getEditLayer(), Collections.singleton(r), true, true);
+        Command relationDeleteCommand = DeleteCommand.delete(Collections.singleton(r), true, true);
         if (relationDeleteCommand == null)
             return;
 
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         for (JoinedPolygon p : mpc.outerWays) {
 
@@ -123 +124 @@
                 }
                 if (relationReused) {
-                    commands.add(new AddCommand(n));
+                    commands.add(new AddCommand(ds, n));
                 } else {
                     relationReused = true;
@@ -189 +190 @@
             result.setKeys(tags);
             newSelection.add(candidateWay == null ? result : candidateWay);
-            commands.add(candidateWay == null ? new AddCommand(result) : new ChangeCommand(candidateWay, result));
+            commands.add(candidateWay == null ? new AddCommand(ds, result) : new ChangeCommand(candidateWay, result));
         }
 
@@ -199 +200 @@
         MainApplication.undoRedo.add(new SequenceCommand(tr("Reconstruct polygons from relation {0}",
                 r.getDisplayName(DefaultNameFormatter.getInstance())), commands));
-        MainApplication.getLayerManager().getEditDataSet().setSelected(newSelection);
+        ds.setSelected(newSelection);
     }