Changeset 2563 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

Timestamp:

03.12.2009 19:02:25 (2 years ago)

Author:

Gubaer

Message:

fixed #3400: relation editor: improvement to highlight an element
fixed #3873: Feature request: download selected elements in relation editor
New: Dbl-Click in member table to set the map selection to this member
New: Ctrl-Dbl-Clik in member table to add the member to the the map selection
New: Download selected incomplete members only

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -16 +18 @@
 
 public abstract class RelationEditor extends ExtendedDialog {
+    /** the property name for the current relation.
+     * @see #setRelation(Relation)
+     * @see #getRelation()
+     */
+    static public final String RELATION_PROP = RelationEditor.class.getName() + ".relation";
+
+    /** the property name for the current relation snapshot
+     * @see #getRelationSnapshot()
+     */
+    static public final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot";
 
     /** the list of registered relation editor classes */
@@ -62 +74 @@
      * then an instance of that class will be used.
      *
+     * @param layer the data layer the relation is a member of
      * @param r the relation to be edited
+     * @param selectedMembers a collection of relation members which shall be selected when the
+     * editor is first launched
      * @return an instance of RelationEditor suitable for editing that kind of relation
      */
@@ -139 +154 @@
      */
     protected void setRelation(Relation relation) {
-        this.relationSnapshot = (relation == null) ? null : new Relation(relation);
+        setRelationSnapshot((relation == null) ? null : new Relation(relation));
+        Relation oldValue = this.relation;
         this.relation = relation;
+        if (this.relation != oldValue) {
+            support.firePropertyChange(RELATION_PROP, oldValue, this.relation);
+        }
         updateTitle();
     }
@@ -164 +183 @@
     }
 
+    protected void setRelationSnapshot(Relation snapshot) {
+        Relation oldValue = relationSnapshot;
+        relationSnapshot = snapshot;
+        if (relationSnapshot != oldValue) {
+            support.firePropertyChange(RELATION_SNAPSHOT_PROP, oldValue, relationSnapshot);
+        }
+    }
+
     /**
      * Replies true if the currently edited relation has been changed elsewhere.
@@ -175 +202 @@
         return ! relation.hasEqualSemanticAttributes(relationSnapshot);
     }
+
+
+    /* ----------------------------------------------------------------------- */
+    /* property change support                                                 */
+    /* ----------------------------------------------------------------------- */
+    final private PropertyChangeSupport support = new PropertyChangeSupport(this);
+
+    @Override
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        this.support.addPropertyChangeListener(listener);
+    }
+
+    @Override
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        this.support.removePropertyChangeListener(listener);
+    }
 }