Changeset 10031 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2016-03-23T21:30:27+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12654 - Add layer invalidation listener (patch by michael2402)

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -55 +55 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -60 +61 @@
 import org.openstreetmap.josm.gui.layer.LayerPositionStrategy;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -125 +128 @@
     }
 
+    /**
+     * An invalidation listener that simply calls repaint() for now.
+     * @author Michael Zangl
+     */
+    private class LayerInvalidatedListener implements PaintableInvalidationListener {
+        private boolean ignoreRepaint;
+        @Override
+        public void paintablInvalidated(PaintableInvalidationEvent event) {
+            ignoreRepaint = true;
+            repaint();
+        }
+
+        /**
+         * Temporary until all {@link MapViewPaintable}s support this.
+         * @param p The paintable.
+         */
+        public void addTo(MapViewPaintable p) {
+            if (p instanceof AbstractMapViewPaintable) {
+                ((AbstractMapViewPaintable) p).addInvalidationListener(this);
+            }
+        }
+        /**
+         * Temporary until all {@link MapViewPaintable}s support this.
+         * @param p The paintable.
+         */
+        public void removeFrom(MapViewPaintable p) {
+            if (p instanceof AbstractMapViewPaintable) {
+                ((AbstractMapViewPaintable) p).removeInvalidationListener(this);
+            }
+        }
+
+        /**
+         * Attempts to trace repaints that did not originate from this listener. Good to find missed {@link MapView#repaint()}s in code.
+         */
+        protected synchronized void traceRandomRepaint() {
+            if (!ignoreRepaint) {
+                System.err.println("Repaint:");
+                Thread.dumpStack();
+            }
+            ignoreRepaint = false;
+        }
+    }
+
     public boolean viewportFollowing;
 
@@ -269 +315 @@
 
     /**
+     * The listener that listens to invalidations of all layers.
+     */
+    private final LayerInvalidatedListener invalidatedListener = new LayerInvalidatedListener();
+
+    /**
      * Constructs a new {@code MapView}.
      * @param contentPane The content pane used to register shortcuts in its
@@ -382 +433 @@
 
             layer.addPropertyChangeListener(this);
+            invalidatedListener.addTo(layer);
             Main.addProjectionChangeListener(layer);
             AudioPlayer.reset();
@@ -506 +558 @@
             Main.removeProjectionChangeListener(layer);
             layer.removePropertyChangeListener(this);
+            invalidatedListener.removeFrom(layer);
             layer.destroy();
             AudioPlayer.reset();
@@ -1035 +1088 @@
     public boolean addTemporaryLayer(MapViewPaintable mvp) {
         synchronized (temporaryLayers) {
-            return temporaryLayers.add(mvp);
+            boolean added = temporaryLayers.add(mvp);
+            if (added) {
+                invalidatedListener.addTo(mvp);
+            }
+            return added;
         }
     }
@@ -1046 +1103 @@
     public boolean removeTemporaryLayer(MapViewPaintable mvp) {
         synchronized (temporaryLayers) {
-            return temporaryLayers.remove(mvp);
+            boolean removed = temporaryLayers.remove(mvp);
+            if (removed) {
+                invalidatedListener.removeFrom(mvp);
+            }
+            return removed;
         }
     }
@@ -1206 +1267 @@
         super.repaint(tm, x, y, width, height);
     }
+
+    @Override
+    public void repaint() {
+        if (Main.isTraceEnabled()) {
+            invalidatedListener.traceRandomRepaint();
+        }
+        super.repaint();
+    }
 }