Changeset 9496 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-01-17T02:54:22+01:00 (10 years ago)

Author:

Don-vip

Message:

massive refactoring of GenericRelationEditor. As JDialog cannot be instantiated in headless mode, extract all actions to separate classes in new package gui.dialogs.relation.actions in order to test them with JUnit

File:

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

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -331 +331 @@
      *
      * @param layer the layer in whose context the relations are deleted. Must not be null.
-     * @param toDelete  the relations to be deleted. Must not be null.
+     * @param toDelete the relations to be deleted. Must not be null.
      * @throws IllegalArgumentException if layer is null
      * @throws IllegalArgumentException if toDelete is null
@@ -344 +344 @@
             Main.main.undoRedo.add(cmd);
             for (Relation relation : toDelete) {
-                if (getCurrentDataSet().getSelectedRelations().contains(relation)) {
-                    getCurrentDataSet().toggleSelected(relation);
+                if (layer.data.getSelectedRelations().contains(relation)) {
+                    layer.data.toggleSelected(relation);
                 }
                 RelationDialogManager.getRelationDialogManager().close(layer, relation);