Changeset 10453 in josm for trunk/src/org/openstreetmap/josm/actions/relation

Timestamp:

2016-06-22T00:48:51+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13023 - Replace uses of hasEditLayer() with new layer manager (patch by michael2402, modified) - gsoc-core

File:

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

trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -28 +29 @@
 
     protected void deleteRelation(Collection<Relation> toDelete) {
-        if (toDelete == null)
+        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+        if (toDelete == null || layer == null)
             return;
-        DeleteAction.deleteRelations(Main.getLayerManager().getEditLayer(), toDelete);
+
+        DeleteAction.deleteRelations(layer, toDelete);
         // clear selection after deletion
         if (Main.map.relationListDialog != null)
@@ -38 +41 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || !Main.main.hasEditLayer())
+        if (!isEnabled())
             return;
         deleteRelation(relations);