Changeset 10345 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

Timestamp:

2016-06-08T23:17:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12937 - Use the new LayerChangeListener (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -39 +39 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.data.osm.NoteData;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.NoteSortDialog;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -99 +100 @@
         uploadAction = new UploadNotesAction();
         buildDialog();
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
     }
 
@@ -170 +171 @@
 
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        // Do nothing
-    }
-
-    @Override
-    public void layerAdded(Layer newLayer) {
-        if (newLayer instanceof NoteLayer) {
-            noteData = ((NoteLayer) newLayer).getNoteData();
+    public void layerAdded(LayerAddEvent e) {
+        if (e.getAddedLayer() instanceof NoteLayer) {
+            noteData = ((NoteLayer) e.getAddedLayer()).getNoteData();
             model.setData(noteData.getNotes());
             setNotes(noteData.getSortedNotes());
@@ -184 +180 @@
 
     @Override
-    public void layerRemoved(Layer oldLayer) {
-        if (oldLayer instanceof NoteLayer) {
+    public void layerRemoving(LayerRemoveEvent e) {
+        if (e.getRemovedLayer() instanceof NoteLayer) {
             noteData = null;
             model.clearData();
@@ -192 +188 @@
             }
         }
+    }
+
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+        // ignored
     }