Changeset 8552 in josm

Timestamp:

2015-07-01T21:11:45+02:00 (9 years ago)

Author:

bastiK

Message:

applied #11632 - Synchronized access to temporary layers and added a getter. (based on patch by michael2402)

File:

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

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

@@ -26 +26 @@
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.LinkedList;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.ListIterator;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -35 +35 @@
 import javax.swing.ActionMap;
 import javax.swing.InputMap;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -268 +269 @@
     public MouseEvent lastMEvent = new MouseEvent(this, 0, 0, 0, 0, 0, 0, false); // In case somebody reads it before first mouse move
 
-    private final transient List<MapViewPaintable> temporaryLayers = new LinkedList<>();
+    /**
+     * Temporary layers (selection rectangle, etc.) that are never cached and
+     * drawn on top of regular layers.
+     * Access must be synchronized.
+     */
+    private final transient Set<MapViewPaintable> temporaryLayers = new LinkedHashSet<>();
 
     private transient BufferedImage nonChangedLayersBuffer;
@@ -782 +788 @@
         }
 
-        for (MapViewPaintable mvp : temporaryLayers) {
-            mvp.paint(tempG, this, box);
+        synchronized (temporaryLayers) {
+            for (MapViewPaintable mvp : temporaryLayers) {
+                mvp.paint(tempG, this, box);
+            }
         }
 
@@ -1063 +1071 @@
     }
 
+    /**
+     * Adds a new temporary layer.
+     * <p>
+     * A temporary layer is a layer that is painted above all normal layers. Layers are painted in the order they are added.
+     *
+     * @param mvp The layer to paint.
+     * @return <code>true</code> if the layer was added.
+     */
     public boolean addTemporaryLayer(MapViewPaintable mvp) {
-        if (temporaryLayers.contains(mvp)) return false;
-        return temporaryLayers.add(mvp);
-    }
-
+        synchronized (temporaryLayers) {
+            return temporaryLayers.add(mvp);
+        }
+    }
+
+    /**
+     * Removes a layer previously added as temporary layer.
+     * @param mvp The layer to remove.
+     * @return <code>true</code> if that layer was removed.
+     */
     public boolean removeTemporaryLayer(MapViewPaintable mvp) {
-        return temporaryLayers.remove(mvp);
+        synchronized (temporaryLayers) {
+            return temporaryLayers.remove(mvp);
+        }
+    }
+
+    /**
+     * Gets a list of temporary layers.
+     * @return The layers in the order they are added.
+     */
+    public List<MapViewPaintable> getTemporaryLayers() {
+        synchronized (temporaryLayers) {
+            return Collections.unmodifiableList(new ArrayList<>(temporaryLayers));
+        }
     }
 
@@ -1140 +1174 @@
         }
         nonChangedLayers.clear();
-        temporaryLayers.clear();
+        synchronized (temporaryLayers) {
+            temporaryLayers.clear();
+        }
     }