Changeset 10997 in josm for trunk/src/org

Timestamp:

2016-09-13T14:47:35+02:00 (8 years ago)

Author:

michael2402

Message:

Make layer read access synchronized.

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• LayerManager.java (modified) (3 diffs)
• MainLayerManager.java (modified) (1 diff)

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

@@ -280 +280 @@
      * @return The list of layers.
      */
-    public List<Layer> getLayers() {
+    public synchronized List<Layer> getLayers() {
         return Collections.unmodifiableList(new ArrayList<>(layers));
     }
@@ -295 +295 @@
      * @return an unmodifiable list of layers of a certain type.
      */
-    public <T extends Layer> List<T> getLayersOfType(Class<T> ofType) {
+    public synchronized <T extends Layer> List<T> getLayersOfType(Class<T> ofType) {
         return new ArrayList<>(Utils.filteredCollection(getLayers(), ofType));
     }
@@ -418 +418 @@
      * @since 10432
      */
-    public void resetState() {
+    public synchronized void resetState() {
         // some layer remove listeners remove other layers.
         while (!getLayers().isEmpty()) {

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

@@ -372 +372 @@
 
     @Override
-    public void resetState() {
+    public synchronized void resetState() {
         // active and edit layer are unset automatically
         super.resetState();