Changeset 29058 in osm for applications/editors/josm/plugins/OsmInspectorPlugin/src

Timestamp:

2012-12-09T16:07:26+01:00 (12 years ago)

Author:

donvip

Message:

[josm_osminspector] Fix NPE, warnings

File:

• applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java (modified) (6 diffs)

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorPlugin.java

@@ -6 +6 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.ArrayList;
 import java.util.List;
 
@@ -13 +12 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -27 +24 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.osminspector.gui.OsmInspectorDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -39 +35 @@
 
     /** The bounding box from where the MapDust bugs are down-loaded */
-    private Bounds bBox;
+    //private Bounds bBox;
 
     private OsmInspectorLayer inspectorLayer;
@@ -61 +57 @@
         Shortcut shortcut = Shortcut.registerShortcut("OsmInspector", tr("Toggle: {0}", tr("Open OsmInspector")),
                 KeyEvent.VK_1, Shortcut.ALT_SHIFT);
-        String name = "Osm Inspector error reports";
-        String tooltip = "Activates the Osm Inspector reporter plugin";
+        //String name = "Osm Inspector error reports";
+        //String tooltip = "Activates the Osm Inspector reporter plugin";
         
         /* add default values for static variables */
@@ -137 +133 @@
         //
         public void mouseClicked(MouseEvent arg0) {
-                inspectorLayer.selectFeatures(arg0.getX(), arg0.getY());
+            if (inspectorLayer != null) {
+                inspectorLayer.selectFeatures(arg0.getX(), arg0.getY());
+            }
         }