Changeset 5519 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2012-09-30T17:36:39+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8090 - Removing saved non-uploadable layer asks for confirmation

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)

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

@@ -28 +28 @@
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.AbstractAction;
@@ -165 +166 @@
         void commandChanged(int queueSize, int redoSize);
     }
+    
+    /**
+     * Listener called when a state of this layer has changed.
+     */
+    public interface LayerStateChangeListener {
+        /**
+         * Notifies that the "upload discouraged" (upload=no) state has changed.
+         * @param layer The layer that has been modified
+         * @param newValue The new value of the state
+         */
+        void uploadDiscouragedChanged(OsmDataLayer layer, boolean newValue);
+    }
+    
+    private final CopyOnWriteArrayList<LayerStateChangeListener> layerStateChangeListeners = new CopyOnWriteArrayList<LayerStateChangeListener>();
+    
+    /**
+     * Adds a layer state change listener
+     *
+     * @param listener the listener. Ignored if null or already registered.
+     * @since 5519
+     */
+    public void addLayerStateChangeListener(LayerStateChangeListener listener) {
+        if (listener != null) {
+            layerStateChangeListeners.addIfAbsent(listener);
+        }
+    }
+    
+    /**
+     * Removes a layer property change listener
+     *
+     * @param listener the listener. Ignored if null or already registered.
+     * @since 5519
+     */
+    public void removeLayerPropertyChangeListener(LayerStateChangeListener listener) {
+        layerStateChangeListeners.remove(listener);
+    }
 
     /**
@@ -742 +779 @@
 
     public final void setUploadDiscouraged(boolean uploadDiscouraged) {
-        data.setUploadDiscouraged(uploadDiscouraged);
+        if (uploadDiscouraged ^ isUploadDiscouraged()) {
+            data.setUploadDiscouraged(uploadDiscouraged);
+            for (LayerStateChangeListener l : layerStateChangeListeners) {
+                l.uploadDiscouragedChanged(this, uploadDiscouraged);
+            }
+        }
     }