Changeset 19072 in osm for applications/editors/josm/plugins/validator/src/org

Timestamp:

2009-12-12T18:46:54+01:00 (15 years ago)

Author:

guggis

Message:

'Updated to JOSM 2621'

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• ErrorLayer.java (modified) (3 diffs)
• OSMValidatorPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 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.validator.util.Bag;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -37 +37 @@
         super(tr("Validation errors"));
         this.plugin = plugin;
-        Layer.listeners.add(this);
+        MapView.addLayerChangeListener(this);
     }
 
@@ -138 +138 @@
             Main.map.mapView.removeLayer(this);
         } else if (oldLayer == this) {
+            MapView.removeLayerChangeListener(this);
             OSMValidatorPlugin.errorLayer = null;
         }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 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.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -167 +168 @@
             if (Main.pref.hasKey(PreferenceEditor.PREF_DEBUG + ".grid"))
                 Main.main.addLayer(new GridLayer(tr("Grid")));
-            Layer.listeners.add(this);
+            MapView.addLayerChangeListener(this);            
         } else
-            Layer.listeners.remove(this);
-
+                MapView.removeLayerChangeListener(this);
         if (newFrame != null) {
                 UploadAction.registerUploadHook(uploadHook = new ValidateUploadHook(this));