Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.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/data/osm/FilterMatcher.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

@@ -6 +6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
@@ -12 +11 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.Not;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -224 +225 @@
 
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
-
+        MapFrame map = MainApplication.getMap();
         if (primitive.isIncomplete() ||
-                (Main.map != null && Main.map.mapMode != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
+                (map != null && map.mapMode != null && map.mapMode.getPreservedPrimitives().contains(primitive)))
             return FilterType.NOT_FILTERED;