Changeset 1890 in josm for trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

Timestamp:

2009-08-02T23:15:26+02:00 (15 years ago)

Author:

Gubaer

Message:

update: rewrite of layer dialog
new: allows multiple selection of layers in the dialog
new: move up, move down, toggle visibility, and delete on multiple layers
new: merge from an arbitrary layer into another layer, not only from the first into the second
new: new action for merging of the currently selected primitives on an arbitrary layer
new: make "active" layer explicit (special icon); activating a layer automatically moves it in the first position
refactoring: public fields 'name' and 'visible' on Layer are @deprecated. Use the setter/getters instead, Layer now emits PropertyChangeEvents if name or visibility are changed.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (7 diffs)

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

@@ -8 +8 @@
 import java.awt.Graphics;
 import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.util.Collection;
@@ -39 +41 @@
  */
 abstract public class Layer implements Destroyable, MapViewPaintable {
+    static public final String VISIBLE_PROP = Layer.class.getName() + ".visible";
+    static public final String NAME_PROP = Layer.class.getName() + ".name";
+
+    /** keeps track of property change listeners */
+    private PropertyChangeSupport propertyChangeSupport;
 
     /**
@@ -58 +65 @@
     /**
      * The visibility state of the layer.
-     */
+     * 
+     * @deprecated use {@see #setVisible(boolean)} and {@see #isVisible()} instead. This field
+     * is going to be private (or protected) in a future release.
+     */
+    @Deprecated
     public boolean visible = true;
 
@@ -68 +79 @@
     /**
      * The name of this layer.
-     */
+     * 
+     * @deprecated use {@see #getName()} and {@see #setName(String)} instead. This field
+     * is going to be private  (or protected) in the future.
+     */
+    @Deprecated
     public String name;
     /**
@@ -79 +94 @@
      */
     public Layer(String name) {
-        this.name = name;
+        this.propertyChangeSupport = new PropertyChangeSupport(this);
+        setName(name);
     }
 
@@ -140 +156 @@
     public String getName() {
         return name;
+    }
+
+    /**
+     * Sets the name of the layer
+     *
+     *@param name the name. If null, the name is set to the empty string.
+     *
+     */
+    public void setName(String name) {
+        if (name == null) {
+            name = "";
+        }
+        String oldValue = this.name;
+        this.name = name;
+        if (!oldValue.equals(this.name)) {
+            propertyChangeSupport.firePropertyChange(NAME_PROP, oldValue, this.name);
+        }
     }
 
@@ -189 +222 @@
     }
 
+    /**
+     * Sets the visibility of this layer. Emits property change event for
+     * property {@see #VISIBLE_PROP}.
+     * 
+     * @param visible true, if the layer is visible; false, otherwise.
+     */
+    public void setVisible(boolean visible) {
+        boolean oldValue = this.visible;
+        this.visible  = visible;
+        if (oldValue != this.visible) {
+            fireVisibleChanged(oldValue, this.visible);
+        }
+    }
+
+    /**
+     * Replies true if this layer is visible. False, otherwise.
+     * @return  true if this layer is visible. False, otherwise.
+     */
+    public boolean isVisible() {
+        return visible;
+    }
+
+    /**
+     * Toggles the visibility state of this layer.
+     */
+    public void toggleVisible() {
+        setVisible(!isVisible());
+    }
+
+    /**
+     * Adds a {@see PropertyChangeListener}
+     * 
+     * @param listener the listener
+     */
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * Removes a {@see PropertyChangeListener}
+     * 
+     * @param listener the listener
+     */
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+
+    /**
+     * fires a property change for the property {@see #VISIBLE_PROP}
+     * 
+     * @param oldValue the old value
+     * @param newValue the new value
+     */
+    protected void fireVisibleChanged(boolean oldValue, boolean newValue) {
+        propertyChangeSupport.firePropertyChange(VISIBLE_PROP, oldValue, newValue);
+    }
 }