Changeset 20463 in osm for applications/editors

Timestamp:

2010-03-14T00:20:50+01:00 (14 years ago)

Author:

bastik

Message:

fixed josm bug 4674 - Crash when activating OSB-Layer

Location:

applications/editors/josm/plugins/openstreetbugs

Files:

• images/dialogs/icon_error22.png (deleted)
• images/dialogs/icon_error24.png (added)
• src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (modified) (1 diff)

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

@@ -70 +70 @@
         initConfig();
         dataSet = new DataSet();
-        uploadHook = new OsbUploadHook();
-        dialog = new OsbDialog(this);
-        MapView.addLayerChangeListener(dialog);
-        MapView.addLayerChangeListener(this);
+    }
+
+    @Override
+    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+        if (newFrame != null) {
+            dialog = new OsbDialog(this);
+            newFrame.addToggleDialog(dialog);
+
+            MapView.addLayerChangeListener(dialog);
+            MapView.addLayerChangeListener(this);
+            
+            uploadHook = new OsbUploadHook();
+            UploadAction.registerUploadHook(uploadHook);
+        } else {
+                MapView.removeLayerChangeListener(this);
+                UploadAction.unregisterUploadHook(uploadHook);
+                uploadHook = null;
+        }
     }
 
@@ -196 +210 @@
     }
 
-    @Override
-    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        if (oldFrame==null && newFrame!=null) { // map frame added
-            // add the dialog
-            newFrame.addToggleDialog(dialog);
-
-            // add the upload hook
-            UploadAction.registerUploadHook(uploadHook);
-        } else if (oldFrame!=null && newFrame==null ) { // map frame removed
-
-        }
-    }
-
     public static ImageIcon loadIcon(String name) {
         return ImageProvider.get(name);

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

@@ -101 +101 @@
 
     public OsbDialog(final OsbPlugin plugin) {
-        super(tr("Open OpenStreetBugs"), "icon_error22",
+        super(tr("Open OpenStreetBugs"), "icon_error24",
                 tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut(
                         "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_O,