Changeset 28813 in osm for applications

Timestamp:

2012-10-15T23:04:55+02:00 (12 years ago)

Author:

zverik

Message:

Fix #8062

Location:

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

Files:

• DeleteChosenRelationAction.java (modified) (2 diffs)
• ReconstructPolygonAction.java (modified) (1 diff)

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
+import java.util.Collections;
 import javax.swing.AbstractAction;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -25 +27 @@
         Relation r = rel.get();
         rel.clear();
-        Main.main.undoRedo.add(new DeleteCommand(r));
+        Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true);
+        if( c != null )
+            Main.main.undoRedo.add(c);
     }
 

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

@@ -64 +64 @@
         List<Way> newSelection = new ArrayList<Way>();
         List<Command> commands = new ArrayList<Command>();
-        commands.add(new DeleteCommand(r));
+        Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true);
+        if( c == null )
+            return;
+        commands.add(c);
         
         for( JoinedPolygon p : mpc.outerWays ) {