Changeset 12343 in josm for trunk/src

Timestamp:

2017-06-08T01:20:59+02:00 (7 years ago)

Author:

michael2402

Message:

Add the ability to listen to NoteData changes and use it to repaint notes layer.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/NoteData.java (modified) (6 diffs)
• gui/layer/NoteLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.tools.ListenerList;
 
 /**
@@ -22 +23 @@
 public class NoteData {
 
+    /**
+     * A listener that can be informed on note data changes.
+     * @author Michael Zangl
+     * @since 12343
+     */
+    public interface NoteDataUpdateListener {
+        /**
+         * Called when the note data is updated
+         * @param data The data that was changed
+         */
+        void noteDataUpdated(NoteData data);
+
+        /**
+         * The selected node was changed
+         * @param noteData The data of which the selected node was changed
+         */
+        void selectedNoteChanged(NoteData noteData);
+    }
+
     private long newNoteId = -1;
 
@@ -27 +47 @@
     private Note selectedNote;
     private Comparator<Note> comparator = Note.DEFAULT_COMPARATOR;
+
+    private final ListenerList<NoteDataUpdateListener> listeners = ListenerList.create();
 
     /**
@@ -77 +99 @@
         if (Main.map != null) {
             Main.map.noteDialog.selectionChanged();
-            Main.map.mapView.repaint();
-        }
+        }
+        listeners.fireEvent(l -> l.selectedNoteChanged(this));
     }
 
@@ -213 +235 @@
         if (Main.isDisplayingMapView()) {
             Main.map.noteDialog.setNotes(getSortedNotes());
-            Main.map.mapView.repaint();
-        }
+        }
+        listeners.fireEvent(l -> l.noteDataUpdated(this));
     }
 
@@ -256 +278 @@
         dataUpdated();
     }
+
+    /**
+     * Adds a listener that listens to node data changes
+     * @param listener The listener
+     */
+    public void addNoteDataUpdateListener(NoteDataUpdateListener listener) {
+        listeners.addListener(listener);
+    }
+
+    /**
+     * Removes a listener that listens to node data changes
+     * @param listener The listener
+     */
+    public void removeNoteDataUpdateListener(NoteDataUpdateListener listener) {
+        listeners.removeListener(listener);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.data.osm.NoteData.NoteDataUpdateListener;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -49 +50 @@
  * @since 7522
  */
-public class NoteLayer extends AbstractModifiableLayer implements MouseListener {
+public class NoteLayer extends AbstractModifiableLayer implements MouseListener, NoteDataUpdateListener {
 
     private final NoteData noteData;
@@ -61 +62 @@
         super(name);
         noteData = new NoteData(notes);
+        noteData.addNoteDataUpdateListener(this);
     }
 
@@ -71 +73 @@
     public void hookUpMapView() {
         Main.map.mapView.addMouseListener(this);
+    }
+
+    @Override
+    public synchronized void destroy() {
+        Main.map.mapView.removeMouseListener(this);
+        noteData.removeNoteDataUpdateListener(this);
+        super.destroy();
     }
 
@@ -260 +269 @@
         }
         noteData.setSelectedNote(closestNote);
-        invalidate();
     }
 
@@ -292 +300 @@
         // Do nothing
     }
+
+    @Override
+    public void noteDataUpdated(NoteData data) {
+        invalidate();
+    }
+
+    @Override
+    public void selectedNoteChanged(NoteData noteData) {
+        invalidate();
+    }
 }