Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

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

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -42 +43 @@
     public static Set<RelationMember> getMembersForCurrentSelection(Relation r) {
         Set<RelationMember> members = new HashSet<>();
-        if (Main.isDisplayingMapView()) {
+        if (MainApplication.isDisplayingMapView()) {
             OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
             if (editLayer != null && editLayer.data != null) {
@@ -61 +62 @@
      */
     public static void launchEditor(Relation toEdit) {
-        if (toEdit == null || toEdit.isDeleted() || !Main.isDisplayingMapView()) return;
+        if (toEdit == null || toEdit.isDeleted() || !MainApplication.isDisplayingMapView()) return;
         RelationEditor.getEditor(Main.getLayerManager().getEditLayer(), toEdit,
                 getMembersForCurrentSelection(toEdit)).setVisible(true);