Changeset 12014 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2017-04-28T14:36:21+02:00 (7 years ago)

Author:

michael2402

Message:

See #14120: Use a listener to get notified of way segment / virtual node highlight changes.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (6 diffs)

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

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -156 +157 @@
     private Collection<WaySegment> highlightedVirtualNodes = new LinkedList<>();
     private Collection<WaySegment> highlightedWaySegments = new LinkedList<>();
+    private final ListenerList<HighlightUpdateListener> highlightUpdateListeners = ListenerList.create();
 
     // Number of open calls to beginUpdate
@@ -161 +163 @@
     // Events that occurred while dataset was locked but should be fired after write lock is released
     private final List<AbstractDatasetChangedEvent> cachedEvents = new ArrayList<>();
-
-    private int highlightUpdateCount;
 
     private UploadPolicy uploadPolicy;
@@ -267 +267 @@
     public Lock getReadLock() {
         return lock.readLock();
-    }
-
-    /**
-     * This method can be used to detect changes in highlight state of primitives. If highlighting was changed
-     * then the method will return different number.
-     * @return the current highlight counter
-     */
-    public int getHighlightUpdateCount() {
-        return highlightUpdateCount;
     }
 
@@ -726 +717 @@
     public Collection<WaySegment> getHighlightedWaySegments() {
         return Collections.unmodifiableCollection(highlightedWaySegments);
+    }
+
+    /**
+     * Adds a listener that gets notified whenever way segment / virtual nodes highlights change.
+     * @param listener The Listener
+     * @since 12014
+     */
+    public void addHighlightUpdateListener(HighlightUpdateListener listener) {
+        highlightUpdateListeners.addListener(listener);
+    }
+
+    /**
+     * Removes a listener that was added with {@link #addHighlightUpdateListener(HighlightUpdateListener)}
+     * @param listener The Listener
+     * @since 12014
+     */
+    public void removeHighlightUpdateListener(HighlightUpdateListener listener) {
+        highlightUpdateListeners.removeListener(listener);
     }
 
@@ -1335 +1344 @@
 
     void fireHighlightingChanged() {
-        highlightUpdateCount++;
+        HighlightUpdateListener.HighlightUpdateEvent e = new HighlightUpdateListener.HighlightUpdateEvent(this);
+        highlightUpdateListeners.fireEvent(l -> l.highlightUpdated(e));
     }