Changeset 24114 in osm for applications/editors/josm/plugins/FixAddresses

Timestamp:

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

Author:

oliverw

Message:

Added selection action to "incomplete addresses dialog" , extended SelectAddressesInMapAction to support incomplete addresses.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui

Files:

• AddressEditDialog.java (modified) (1 diff)
• AddressEditSelectionEvent.java (modified) (4 diffs)
• IncompleteAddressesDialog.java (modified) (3 diffs)
• actions/AbstractAddressEditAction.java (modified) (1 diff)
• actions/SelectAddressesInMapAction.java (modified) (3 diffs)

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

@@ -293 +293 @@
                 
                 AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(),
-                                streetTable, unresolvedTable, editContainer);
+                                streetTable, unresolvedTable, null, editContainer);
                 
                 for (AbstractAddressEditAction action : actions) {

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

@@ -31 +31 @@
         private JTable streetTable;
         private JTable unresolvedAddressTable;
+        private JTable incompleteAddressTable;
         private AddressEditContainer addressContainer;
         
@@ -37 +38 @@
          * @param source The event source.
          * @param selStreet The street table component.
-         * @param unresolvedAddr The unresolved addresses table component.
+         * @param unresolvedAddresses The unresolved addresses table component.
          * @param incomplete The incomplete addresses table component.
          * @param container The address container instance holding the entities for streets and addresses.
          */
-        public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddr, AddressEditContainer container) {
+        public AddressEditSelectionEvent(Object source, JTable selStreet, JTable unresolvedAddresses, JTable incompleteAddresses, AddressEditContainer container) {
                 super(source, -1, "");
                 this.streetTable = selStreet;
-                this.unresolvedAddressTable = unresolvedAddr;
+                this.unresolvedAddressTable = unresolvedAddresses;
+                this.incompleteAddressTable = incompleteAddresses;
                 this.addressContainer = container;
         }
@@ -63 +65 @@
                 return unresolvedAddressTable;
         }
+        
+        /**
+         * @return the incompleteAddressTable
+         */
+        protected JTable getIncompleteAddressTable() {
+                return incompleteAddressTable;
+        }
 
+        /**
+         * Gets the address container.
+         *
+         * @return the address container
+         */
         public AddressEditContainer getAddressContainer() {
                 return addressContainer;
@@ -106 +120 @@
                 return null;
         }
+        
+        /**
+         * Gets the selected incomplete addresses.
+         *
+         * @return the selected incomplete addresses
+         */
+        public List<OSMAddress> getSelectedIncompleteAddresses() {
+                if (incompleteAddressTable != null && 
+                                addressContainer != null && 
+                                addressContainer.getUnresolvedAddresses() != null) {
+                        
+                        int[] selRows = incompleteAddressTable.getSelectedRows();
+                        
+                        List<OSMAddress> nodes = new ArrayList<OSMAddress>();
+                        for (int i = 0; i < selRows.length; i++) {
+                                if (selRows[i] >= 0 && selRows[i] < addressContainer.getNumberOfIncompleteAddresses()) {
+                                        nodes.add(addressContainer.getIncompleteAddresses().get(selRows[i]));
+                                }
+                        }
+                        return nodes;
+                }
+                return null;
+        }
 }

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

@@ -21 +21 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -33 +35 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
+import org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener;
+import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.SelectAddressesInMapAction;
 
 @SuppressWarnings("serial")
-public class IncompleteAddressesDialog extends ToggleDialog implements DataSetListener {
+public class IncompleteAddressesDialog extends ToggleDialog implements DataSetListener, ListSelectionListener, IAddressEditContainerListener {
+        private static final String FIXED_DIALOG_TITLE = tr("Incomplete Addresses");
+
+
         private AddressEditContainer container;
 
+        
+        private SelectAddressesInMapAction selectAction = new SelectAddressesInMapAction();
+        
+        private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[]{
+                        selectAction
+        };
+
+
+        private JTable incompleteAddr;
+        
         /**
-         * @param name
-         * @param iconName
-         * @param tooltip
-         * @param shortcut
-         * @param preferredHeight
-         * @param container
+         * Instantiates a new "incomplete addresses" dialog.
+         *
          */
         public IncompleteAddressesDialog() {
-                super(tr("Incomplete Addresses"), "incompleteaddress_24", tr("Show incomplete addresses"), null, 150);
+                super(FIXED_DIALOG_TITLE, "incompleteaddress_24", tr("Show incomplete addresses"), null, 150);
+                
                 this.container = new AddressEditContainer();
+                container.addChangedListener(this);
                 
                 JPanel p = new JPanel(new BorderLayout());
                 
-                JTable incompleteAddr = new JTable(new IncompleteAddressesTableModel(container));
+                incompleteAddr = new JTable(new IncompleteAddressesTableModel(container));
+                incompleteAddr.getSelectionModel().addListSelectionListener(this);
+                
                 JScrollPane sp = new JScrollPane(incompleteAddr);
                 p.add(sp, BorderLayout.CENTER);
                 this.add(p);
+                
+                JPanel buttonPanel = getButtonPanel(5);
+                
+                SideButton sb = new SideButton(selectAction);
+                buttonPanel.add(sb);
+                
+                this.add(buttonPanel, BorderLayout.SOUTH);
+                
+                for (AbstractAddressEditAction action : actions) {
+                        action.setContainer(container);
+                }
         }
         
@@ -124 +155 @@
                 container.invalidate();         
         }
+
+        /* (non-Javadoc)
+         * @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent)
+         */
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+                AddressEditSelectionEvent event = new AddressEditSelectionEvent(e, null, null, incompleteAddr, container);
+                
+                for (AbstractAddressEditAction action : actions) {
+                        action.setEvent(event);
+                }               
+        }
+
+        @Override
+        public void containerChanged(AddressEditContainer container) {
+                if (container != null && container.getNumberOfIncompleteAddresses() > 0) {
+                        setTitle(String.format("%s (%d %s)", FIXED_DIALOG_TITLE, container.getNumberOfIncompleteAddresses(), tr("items")));
+                } else {
+                        setTitle(String.format("%s (%s)", FIXED_DIALOG_TITLE, tr("no items")));                 
+                }
+        }
+
+        @Override
+        public void entityChanged(IOSMEntity node) {
+                // TODO Auto-generated method stub
+                
+        }
         
         

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

@@ -113 +113 @@
                         if (container != null) {
                                 addressEditActionPerformed(container);
-                        } else { // call super class hook
-                                actionPerformed(arg0);
+                        } else { 
+                                throw new RuntimeException("AbstractAddressEditAction has no container or event");
                         }
                 }

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

@@ -60 +60 @@
                 if (ev == null) return;
                 
-                internalSelectAddresses(ev.getSelectedUnresolvedAddresses());
+                if (ev.getSelectedUnresolvedAddresses() != null) {
+                        internalSelectAddresses(ev.getSelectedUnresolvedAddresses());
+                } else if (ev.getSelectedIncompleteAddresses() != null) {
+                        internalSelectAddresses(ev.getSelectedIncompleteAddresses());
+                }
         }
 
         @Override
         public void addressEditActionPerformed(AddressEditContainer container) {
-                internalSelectAddresses(container.getUnresolvedAddresses());            
+                // do nothing           
         }
 
@@ -73 +77 @@
         @Override
         protected void updateEnabledState(AddressEditContainer container) {
-                setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
+                setEnabled(false);
         }
 
@@ -81 +85 @@
         @Override
         protected void updateEnabledState(AddressEditSelectionEvent event) {
-                setEnabled(event != null && event.getSelectedUnresolvedAddresses() != null);
+                setEnabled(event != null && (event.getSelectedUnresolvedAddresses() != null || event.getSelectedIncompleteAddresses() != null));
         }