Changeset 14817 in osm for applications/editors

Timestamp:

2009-04-29T14:18:12+02:00 (16 years ago)

Author:

hampelratte

Message:

fixed NPE and improved gui update behaviour: if the osm layer has been closed, while we are requesting the osb db, the gui does not have to be updated, when the request is done

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb

Files:

• OsbLayer.java (modified) (1 diff)
• OsbPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java

@@ -78 +78 @@
         });
 
-        Main.map.mapView.addMouseListener(this);
+        // if the map layer has been closed, while we are requesting the osb db,
+        // the mapframe is null, so we check that, before installing the mouse listener
+        if(Main.map != null && Main.map.mapView != null) { 
+            Main.map.mapView.addMouseListener(this);
+        }
     }
 

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java

@@ -152 +152 @@
             // display the parsed data
             if(!dataSet.nodes.isEmpty()) {
-                updateGui();
+                // if the map layer has been closed, while we are requesting the osb db,
+                // we don't have to update the gui, because the user is not interested
+                // in this area anymore
+                if(Main.map != null && Main.map.mapView != null) {
+                    updateGui();
+                }
             }
         } catch (Exception e) {