Changeset 24120 in osm for applications/editors/josm/plugins/FixAddresses/src/org

Timestamp:

2010-11-07T18:14:11+01:00 (14 years ago)

Author:

oliverw

Message:

Let ApplyAllGuessesAction also operate on incomplete addresses.

File:

• applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java (modified) (6 diffs)

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

@@ -44 +44 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent)
+         */
         @Override
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
-                if (ev == null || ev.getSelectedUnresolvedAddresses() == null) return;
-                // fix SELECTED items only
-                List<OSMAddress> addrToFix = ev.getSelectedUnresolvedAddresses();
-                applyGuesses(addrToFix);
+                if (ev == null) return;
+                
+                if (ev.getSelectedUnresolvedAddresses() != null) {
+                        // fix SELECTED items only
+                        List<OSMAddress> addrToFix = ev.getSelectedUnresolvedAddresses();
+                        applyGuesses(addrToFix);
+                }
+                
+                if (ev.getSelectedIncompleteAddresses() != null) {
+                        // fix SELECTED items only
+                        List<OSMAddress> addrToFix = ev.getSelectedIncompleteAddresses();
+                        applyGuesses(addrToFix);
+                }
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer)
+         */
         @Override
         protected void updateEnabledState(AddressEditContainer container) {
@@ -57 +72 @@
         }
 
+        /**
+         * Apply guesses.
+         *
+         * @param addrToFix the addr to fix
+         */
         private void applyGuesses(List<OSMAddress> addrToFix) {
                 beginTransaction(tr("Applied guessed values"));
@@ -68 +88 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.fixAddresses.gui.AddressEditSelectionEvent)
+         */
         @Override
         protected void updateEnabledState(AddressEditSelectionEvent event) {
-                // do nothing here
+                setEnabled(event.getSelectedIncompleteAddresses() != null ||
+                                event.getSelectedIncompleteAddresses() != null);
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction#addressEditActionPerformed(org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer)
+         */
         @Override
         public void addressEditActionPerformed(AddressEditContainer container) {
@@ -79 +106 @@
                 List<OSMAddress> addrToFix = container.getUnresolvedAddresses();
                 applyGuesses(addrToFix);                
+                
+                addrToFix = container.getIncompleteAddresses();
+                applyGuesses(addrToFix);
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
+         */
         @Override
         public void mouseClicked(MouseEvent e) {
@@ -94 +127 @@
                                         beginObjectTransaction(node);
                                         OSMAddress aNode = (OSMAddress) node;
-                                        if (aNode.hasGuessedStreetName()) {
-                                                aNode.applyAllGuesses();
-                                        }
+                                                                                
+                                        aNode.applyAllGuesses();
+                                        
                                         finishObjectTransaction(node);
                                         finishTransaction();
@@ -104 +137 @@
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
+         */
         @Override
         public void mouseEntered(MouseEvent arg0) {
-                // TODO Auto-generated method stub
-                
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent)
+         */
         @Override
         public void mouseExited(MouseEvent arg0) {
-                // TODO Auto-generated method stub
-                
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
+         */
         @Override
         public void mousePressed(MouseEvent arg0) {
-                // TODO Auto-generated method stub
-                
         }
 
+        /* (non-Javadoc)
+         * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
+         */
         @Override
         public void mouseReleased(MouseEvent arg0) {
-                // TODO Auto-generated method stub
-                
         }
 }