Changeset 23924 in osm for applications/editors/josm/plugins

Timestamp:

2010-10-30T19:27:18+02:00 (14 years ago)

Author:

oliverw

Message:

• Revised AbstractAddressEditAction
• Added "select in map" action

Location:

applications/editors/josm/plugins/AddressEdit

Files:

• images/dialogs/applyguesses_24.png (added)
• images/dialogs/guessstreets_24.png (added)
• src/org/openstreetmap/josm/plugins/addressEdit/FixUnresolvedStreetsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/SelectAddressesInMapAction.java (added)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/FixUnresolvedStreetsAction.java

@@ -48 +48 @@
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+                /* this changes the dialog contents, so we do nothing here
                 this.newSelection = newSelection;
                 if (addressEditContainer != null) {
                         addressEditContainer.invalidate(newSelection);
-                }
+                }*/
         }
 

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AbstractAddressEditAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
 
+/**
+ * Base class for all address related action. An action can work as well on all addresses collected by the
+ * container or on the active selection.
+ * By default, the action is disabled and the updateEnabledState(...) have to be implemented by
+ * subclasses. There are also two separate <tt>actionPerformedXX</tt> methods to do the action on
+ * 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. 
+ * @author Oliver Wieland <oliver.wieland@online.de>
+ * 
+ */
+
+@SuppressWarnings("serial")
 public abstract class AbstractAddressEditAction extends JosmAction {
-
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 3080414353417044998L;
-
         private AddressEditSelectionEvent event;
         protected AddressEditContainer container;
@@ -114 +121 @@
                         event = null; // consume event
                 } else {
-                        actionPerformed(arg0);
+                        if (container != null) {
+                                addressEditActionPerformed(container);
+                        } else { // call super class hook
+                                actionPerformed(arg0);
+                        }
                 }
         }
@@ -120 +131 @@
 
         /**
-         * Redirected action handler
+         * Redirected action handler for doing actions on a address selection.
          * @param ev
          */
         public abstract void addressEditActionPerformed(AddressEditSelectionEvent ev);
         
+        /**
+         * Redirected action handler for doing actions on an address container.
+         * @param ev
+         */
+        public abstract void addressEditActionPerformed(AddressEditContainer container);
+        
         
 

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -56 +56 @@
 import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
 import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
-
+import org.openstreetmap.josm.tools.ImageProvider;
+
+@SuppressWarnings("serial")
 public class AddressEditDialog extends JDialog implements ActionListener, ListSelectionListener, IAddressEditContainerListener {
         private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
         private static final String STREET_HEADER_FMT = tr("Streets (%d)");
         private static final String OK_COMMAND = tr("Close");
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 6251676464816335631L;
+        private static final String SELECT_AND_CLOSE = tr("Select and close");
+        
         private AddressEditContainer editContainer;
         private JTable unresolvedTable;
@@ -73 +73 @@
         private ApplyAllGuessesAction applyAllGuessesAction = new ApplyAllGuessesAction();
         private GuessAddressDataAction guessAddressAction = new GuessAddressDataAction();
+        private SelectAddressesInMapAction selectAddressesInMapAction = new SelectAddressesInMapAction();
         
         private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
                 resolveAction,
                 guessAddressAction,
-                applyAllGuessesAction
+                applyAllGuessesAction,
+                selectAddressesInMapAction
         };
         private JLabel streetLabel;
@@ -89 +91 @@
          */
         public AddressEditDialog(AddressEditContainer addressEditContainer) throws HeadlessException  {
-                super(JOptionPane.getFrameForComponent(Main.parent), tr("Edit Addresses"), false);
+                super(JOptionPane.getFrameForComponent(Main.parent), tr("Fix unresolved addresses"), false);
         
                 this.editContainer = addressEditContainer; 
@@ -135 +137 @@
                                 SideButton applyAllGuesses = new SideButton(applyAllGuessesAction);                                                                                                                        
                                 unresolvedButtons.add(applyAllGuesses);
+                                
+                                unresolvedButtons.add(new JSeparator());
+                                SideButton selectInMap = new SideButton(selectAddressesInMapAction);                                                                                                                       
+                                unresolvedButtons.add(selectInMap);
                                 unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
                         } catch (Exception e) {                         
@@ -163 +169 @@
                 
                 JPanel buttonPanel = new JPanel(new GridLayout(1,10));
-                JButton ok = new JButton(OK_COMMAND);
+                JButton ok = new JButton(OK_COMMAND, ImageProvider.getIfAvailable(null, "ok"));
                 ok.addActionListener(this);
+                JButton selectAndClose = new JButton(SELECT_AND_CLOSE);
+                selectAndClose.addActionListener(this);
                 
                 // Murks

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/ApplyAllGuessesAction.java

@@ -44 +44 @@
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#actionPerformed(java.awt.event.ActionEvent)
-         */
-        @Override
-        public void actionPerformed(ActionEvent arg0) {
-                if (container == null || container.getUnresolvedAddresses() == null) return;
-                
-                List<AddressNode> addrToFix = container.getUnresolvedAddresses();
-                applyGuesses(addrToFix);
-        }
-
         private void applyGuesses(List<AddressNode> addrToFix) {
                 List<AddressNode> addrToFixShadow = new ArrayList<AddressNode>(addrToFix);
@@ -66 +55 @@
                 // do nothing here
         }
+
+        @Override
+        public void addressEditActionPerformed(AddressEditContainer container) {
+                if (container == null || container.getUnresolvedAddresses() == null) return;
+                
+                List<AddressNode> addrToFix = container.getUnresolvedAddresses();
+                applyGuesses(addrToFix);                
+        }
 }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AssignAddressToStreetAction.java

@@ -37 +37 @@
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {          
                 StreetNode streetNode = ev.getSelectedStreet();
-                
-                
+                                
                 if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) {
                         for (AddressNode addrNode : ev.getSelectedUnresolvedAddresses()) {
@@ -61 +60 @@
         }
 
+        @Override
+        public void addressEditActionPerformed(AddressEditContainer container) {
+                // we only accept a selection: nothing to do here               
+        }
+
 
 }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/GuessAddressDataAction.java

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
 
+/**
+ * Guesses address tags by picking the closest street node with a name. The same is done (some day)
+ * with city, post code, state,...
+ * @author Oliver Wieland <oliver.wieland@online.de>
+ * 
+ */
+
 @SuppressWarnings("serial")
 public class GuessAddressDataAction extends AbstractAddressEditAction {
@@ -33 +40 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
+         */
+        @Override
+        public void updateEnabledState(AddressEditSelectionEvent ev) {
+                setEnabled(ev != null && ev.getUnresolvedAddressTable() != null);
+        }
+
+        @Override
+        protected void updateEnabledState(AddressEditContainer container) {
+                setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
+        }
+
+        @Override
+        public void addressEditActionPerformed(AddressEditContainer container) {
+                if (container == null) return;
+                if (container.getUnresolvedAddresses() == null) return;
+                                
+                internalGuessAddresses(container.getIncompleteAddresses());
+        }
+
         @Override
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {
+                if (ev == null || ev.getSelectedUnresolvedAddresses() == null) return;
+                
+                // guess tags for selected addresses only
+                internalGuessAddresses(ev.getSelectedUnresolvedAddresses());
         }
         
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#actionPerformed(java.awt.event.ActionEvent)
+        /**
+         * Internal method to start several threads guessing tag values for the given list of addresses.
+         * @param addrNodes
          */
-        @Override
-        public void actionPerformed(ActionEvent arg0) {
-                if (container == null) return;
-                if (container.getUnresolvedAddresses() == null) return;
-                
+        private void internalGuessAddresses(List<AddressNode> nodes) {
+                // setup thread pool
                 for (int i = 0; i < threads.length; i++) {
                         threads[i] = new AddressFinderThread();
                 }
-                                                
-                List<AddressNode> addrNodes = new ArrayList<AddressNode>();             
-                addrNodes.addAll(container.getIncompleteAddresses());
+                
+                // work on a shadowed copy
+                List<AddressNode> addrNodes = new ArrayList<AddressNode>(nodes);
                 for (AddressNode aNode : addrNodes) {
                         if (aNode.hasStreetName()) continue;
@@ -76 +106 @@
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.addressEdit.gui.AbstractAddressEditAction#updateEnabledState(org.openstreetmap.josm.plugins.addressEdit.gui.AddressEditSelectionEvent)
-         */
-        @Override
-        public void updateEnabledState(AddressEditSelectionEvent ev) {
-                // do nothing here
-        }
-
-        @Override
-        protected void updateEnabledState(AddressEditContainer container) {
-                setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
-        }
-
-        
 }