Changeset 5740 in josm

Timestamp:

2013-02-21T23:58:58+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8449 - fix NPE but filter does not work as expected at JOSM restart (needs to be switched off/on)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (4 diffs)

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

@@ -1082 +1082 @@
         protected abstract Bounds getBounds();
         protected final boolean all;
-        protected final Bounds bounds;
 
         /**
@@ -1089 +1088 @@
         public InArea(boolean all) {
             this.all = all;
-            this.bounds = getBounds();
         }
 
@@ -1096 +1094 @@
             if (!osm.isUsable())
                 return false;
-            else if (osm instanceof Node)
-                return bounds.contains(((Node) osm).getCoor());
-            else if (osm instanceof Way) {
+            else if (osm instanceof Node) {
+                Bounds bounds = getBounds();
+                return bounds != null && bounds.contains(((Node) osm).getCoor());
+            } else if (osm instanceof Way) {
                 Collection<Node> nodes = ((Way) osm).getNodes();
                 return all ? forallMatch(nodes) : existsMatch(nodes);
@@ -1135 +1134 @@
         @Override
         protected Bounds getBounds() {
+            if (Main.map == null || Main.map.mapView == null) {
+                return null;
+            }
             return Main.map.mapView.getRealBounds();
         }