Changeset 12014 in josm

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.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (6 diffs)
• data/osm/HighlightUpdateListener.java (added)
• gui/layer/AbstractMapViewPaintable.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (8 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));
     }
 

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

@@ -88 +88 @@
     /**
      * This needs to be called whenever the content of this view was invalidated.
+     * It triggers a repaint of the components that display this layer.
      */
     public void invalidate() {

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

@@ -66 +66 @@
 import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
+import org.openstreetmap.josm.data.osm.HighlightUpdateListener;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
@@ -117 +118 @@
  * @since 17
  */
-public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener {
+public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener, HighlightUpdateListener {
     private static final int HATCHED_SIZE = 15;
     /** Property used to know if this layer has to be saved on disk */
@@ -126 +127 @@
     private boolean requiresSaveToFile;
     private boolean requiresUploadToServer;
-    private int highlightUpdateCount;
 
     /**
@@ -364 +364 @@
         data.addDataSetListener(new DataSetListenerAdapter(this));
         data.addDataSetListener(MultipolygonCache.getInstance());
+        data.addHighlightUpdateListener(this);
         DataSet.addSelectionListener(this);
         if (name != null && name.startsWith(createLayerName("")) && Character.isDigit(
@@ -400 +401 @@
      */
     @Override public void paint(final Graphics2D g, final MapView mv, Bounds box) {
-        highlightUpdateCount = data.getHighlightUpdateCount();
-
         boolean active = mv.getLayerManager().getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
@@ -908 +907 @@
 
     @Override
-    public boolean isChanged() {
-        return highlightUpdateCount != data.getHighlightUpdateCount();
-    }
-
-    @Override
     public void onPostSaveToFile() {
         setRequiresSaveToFile(false);
@@ -952 +946 @@
         super.destroy();
         DataSet.removeSelectionListener(this);
+        data.removeHighlightUpdateListener(this);
     }
 
@@ -1102 +1097 @@
         return v.getBounds();
     }
+
+    @Override
+    public void highlightUpdated(HighlightUpdateEvent e) {
+        invalidate();
+    }
 }