Changeset 19060 in osm for applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap

Timestamp:

2009-12-12T18:25:56+01:00 (16 years ago)

Author:

guggis

Message:

'Updated to JOSM 2621; updated build.xml'

Location:

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

Files:

• OsbPlugin.java (modified) (3 diffs)
• gui/OsbDialog.java (modified) (1 diff)

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

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.osb.api.DownloadAction;
@@ -72 +72 @@
         uploadHook = new OsbUploadHook();
         dialog = new OsbDialog(this);
-        Layer.listeners.add(dialog);
-        Layer.listeners.add(this);
+        MapView.addLayerChangeListener(dialog);
+        MapView.addLayerChangeListener(this);
     }
 
@@ -222 +222 @@
     public void layerRemoved(Layer oldLayer) {
         if(oldLayer == layer) {
+                MapView.removeLayerChangeListener(this);
+                MapView.removeLayerChangeListener(dialog);
             layer = null;
         }

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

@@ -61 +61 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.DataChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 import org.openstreetmap.josm.plugins.osb.OsbObserver;