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

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()

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• DeleteRelationsAction.java (modified) (2 diffs)
• DownloadMembersAction.java (modified) (2 diffs)
• DownloadSelectedIncompleteMembersAction.java (modified) (2 diffs)
• EditRelationAction.java (modified) (3 diffs)
• RecentRelationsAction.java (modified) (2 diffs)
• SelectInRelationListAction.java (modified) (2 diffs)
• SelectMembersAction.java (modified) (2 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.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -35 +37 @@
         DeleteAction.deleteRelations(layer, toDelete);
         // clear selection after deletion
-        if (Main.map.relationListDialog != null)
-                Main.map.relationListDialog.selectRelations(null);
+        MapFrame map = MainApplication.getMap();
+        if (map.relationListDialog != null)
+            map.relationListDialog.selectRelations(null);
     }
 

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -33 +34 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+        if (!isEnabled() || relations.isEmpty() || !MainApplication.isDisplayingMapView()) return;
         Main.worker.submit(new DownloadRelationTask(relations, Main.getLayerManager().getEditLayer()));
     }

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -49 +50 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+        if (!isEnabled() || relations.isEmpty() || !MainApplication.isDisplayingMapView()) return;
         Main.worker.submit(new DownloadRelationMemberTask(
                 relations,

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);

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -123 +124 @@
      */
     public static List<Relation> getRecentRelationsOnActiveLayer() {
-        if (!Main.isDisplayingMapView())
+        if (!MainApplication.isDisplayingMapView())
             return Collections.emptyList();
         Layer activeLayer = Main.getLayerManager().getActiveLayer();

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -26 +27 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || relations.isEmpty() || Main.map == null || Main.map.relationListDialog == null) return;
-        Main.map.relationListDialog.unfurlDialog();
-        Main.map.relationListDialog.selectRelations(relations);
+        MapFrame map = MainApplication.getMap();
+        if (!isEnabled() || relations.isEmpty() || map == null || map.relationListDialog == null) return;
+        map.relationListDialog.unfurlDialog();
+        map.relationListDialog.selectRelations(relations);
     }
 }

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -36 +37 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+        if (!isEnabled() || relations.isEmpty() || !MainApplication.isDisplayingMapView()) return;
 
         Set<OsmPrimitive> members = new HashSet<>();