Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.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/search/SearchAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -51 +51 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSException;
@@ -696 +698 @@
         public void receiveSearchResult(DataSet ds, Collection<OsmPrimitive> result, int foundMatches, SearchSetting setting) {
             ds.setSelected(result);
+            MapFrame map = MainApplication.getMap();
             if (foundMatches == 0) {
                 final String msg;
@@ -710 +713 @@
                     msg = null;
                 }
-                if (Main.map != null) {
-                    Main.map.statusLine.setHelpText(msg);
+                if (map != null) {
+                    map.statusLine.setHelpText(msg);
                 }
                 if (!GraphicsEnvironment.isHeadless()) {
@@ -722 +725 @@
                 }
             } else {
-                Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches));
+                map.statusLine.setHelpText(tr("Found {0} matches", foundMatches));
             }
         }