Changeset 23943 in osm

Timestamp:

2010-10-31T01:03:00+02:00 (14 years ago)

Author:

oliverw

Message:

• Bugfix: Action states were not updated on selection change.
• Trigger selection state on container changes.

File:

• applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AbstractAddressEditAction.java (modified) (7 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AbstractAddressEditAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
+import org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener;
+import org.openstreetmap.josm.plugins.fixAddresses.INodeEntity;
 
 /**
@@ -26 +28 @@
  * container or on selection items.
  * Most actions will work in both cases, so it is recommended to have one single method which
- * accepts a list of addresses or streets and executes the tasks to be done by this action. 
+ * accepts a list of addresses or streets and executes the tasks to be done by this action.
+ *  
  * @author Oliver Wieland <oliver.wieland@online.de>
- * 
  */
 
 @SuppressWarnings("serial")
-public abstract class AbstractAddressEditAction extends JosmAction {
+public abstract class AbstractAddressEditAction extends JosmAction implements IAddressEditContainerListener {   
         private AddressEditSelectionEvent event;
         protected AddressEditContainer container;
@@ -54 +56 @@
         
         /**
+         * Gets the current address container.
          * @return the container
          */
@@ -64 +67 @@
          */
         public void setContainer(AddressEditContainer container) {
+                if (container != null) { // remove old listener first
+                        container.removeChangedListener(this);
+                }
                 this.container = container;
                 updateEnabledState();
+                if (container != null) {
+                        container.addChangedListener(this);
+                }
         }
 
@@ -80 +89 @@
         protected void setEvent(AddressEditSelectionEvent event) {
                 this.event = event;
+                updateEnabledState();
+        }
+        
+        /* (non-Javadoc)
+         * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+         */
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+                if (event != null) { // use the event acquired previously.
+                        addressEditActionPerformed(event);      
+                        event = null; // consume event
+                } else {
+                        if (container != null) {
+                                addressEditActionPerformed(container);
+                        } else { // call super class hook
+                                actionPerformed(arg0);
+                        }
+                }
         }
 
@@ -106 +133 @@
         
         /**
-         * Updates 'enabled' state depending on the given address container object.
-         * @param container The address container (maybe null).
+         * Updates 'enabled' state depending on the current selection.
+         * @param container The selection event.
          * @return
          */
         protected abstract void updateEnabledState(AddressEditSelectionEvent event);
-
-        /* (non-Javadoc)
-         * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-         */
-        @Override
-        public void actionPerformed(ActionEvent arg0) {
-                if (event != null) { // use the event acquired previously.
-                        addressEditActionPerformed(event);      
-                        event = null; // consume event
-                } else {
-                        if (container != null) {
-                                addressEditActionPerformed(container);
-                        } else { // call super class hook
-                                actionPerformed(arg0);
-                        }
-                }
-        }
-        
 
         /**
@@ -143 +152 @@
         
         
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener#containerChanged(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer)
+         */
+        @Override
+        public void containerChanged(AddressEditContainer container) {
+                updateEnabledState();
+        }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener#entityChanged(org.openstreetmap.josm.plugins.fixAddresses.INodeEntity)
+         */
+        @Override
+        public void entityChanged(INodeEntity node) {
+                updateEnabledState();           
+        }
 }