Changeset 23916 in osm for applications/editors

Timestamp:

2010-10-30T16:35:28+02:00 (14 years ago)

Author:

oliverw

Message:

Apply guessed street names via double click.

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditAction.java (modified) (1 diff)
• AddressNode.java (modified) (3 diffs)
• NodeEntityBase.java (modified) (1 diff)
• gui/AddressEditDialog.java (modified) (1 diff)
• gui/AddressEditTableModel.java (modified) (2 diffs)
• gui/IncompleteAddressesMouseListener.java (added)
• gui/IncompleteAddressesTableModel.java (modified) (3 diffs)
• gui/StreetTableModel.java (modified) (3 diffs)
• gui/UnresolvedAddressesTableModel.java (modified) (4 diffs)

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

@@ -8 +8 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.plugins.addressEdit.gui.GuessAddressDataAction;
 
 public class AddressNode extends NodeEntityBase {
@@ -77 +76 @@
                 this.guessedStreetName = guessedStreetName;
                 fireEntityChanged(this);
+        }
+        
+        public boolean hasGuessedStreetName() {
+                return !StringUtils.isNullOrEmpty(guessedStreetName);
         }
 
@@ -176 +179 @@
         }
         
+        /**
+         * Applies the guessed street name to the addr:street tag value.
+         */
         public void applyGuessedStreet() {
-                if (!StringUtils.isNullOrEmpty(getGuessedStreetName())) {
+                if (hasGuessedStreetName()) {
                         setOSMTag(TagUtils.ADDR_STREET_TAG, guessedStreetName);
                 }

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

@@ -112 +112 @@
                 newNode.put(tag, newValue);
                 Main.main.undoRedo.add( new ChangeCommand(oldNode, newNode));
+                fireEntityChanged(this);
         }
 

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

@@ -115 +115 @@
                         unresolvedTable.getSelectionModel().addListSelectionListener(this);
                         unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener());
+                        unresolvedTable.addMouseListener(new IncompleteAddressesMouseListener());                       
                         
                         JScrollPane scroll2 = new JScrollPane(unresolvedTable);

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
 
-public class AddressEditTableModel extends DefaultTableModel implements IAddressEditContainerListener{
+public abstract class AddressEditTableModel extends DefaultTableModel implements IAddressEditContainerListener{
 
         /**
@@ -43 +43 @@
                 fireTableDataChanged();
         }
+        
+        /**
+         * Gets the node entity for the given row or null; if row contains no entity.
+         * @param row The row to get the entity object for.
+         * @return
+         */
+        public abstract INodeEntity getEntityOfRow(int row);
 }

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
 import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
 import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
 
@@ -58 +59 @@
 
         @Override
-        public Object getValueAt(int row, int column) {
-                if (addressContainer == null || addressContainer.getIncompleteAddresses() == null) {
+        public Object getValueAt(int row, int column) {         
+                AddressNode aNode = (AddressNode) getEntityOfRow(row);
+                
+                if (aNode == null) {
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getNumberOfIncompleteAddresses()) {
-                        return null;
-                }
-                AddressNode aNode = addressContainer.getIncompleteAddresses().get(row);
                 
                 switch (column) {
@@ -100 +99 @@
                 return false;
         }
+
+        @Override
+        public INodeEntity getEntityOfRow(int row) {
+                if (addressContainer == null || addressContainer.getIncompleteAddresses() == null) {
+                        return null;
+                }
+                if (row < 0 || row > addressContainer.getNumberOfIncompleteAddresses()) {
+                        return null;
+                }
+                return addressContainer.getIncompleteAddresses().get(row);
+        }
 }

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

@@ -17 +17 @@
 
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
 import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
 
@@ -77 +78 @@
          */
         @Override
-        public Object getValueAt(int row, int column) {
-                if (addressContainer == null || addressContainer.getStreetList() == null) {
+        public Object getValueAt(int row, int column) {         
+                StreetNode sNode = (StreetNode) getEntityOfRow(row);
+                
+                if (sNode == null) {
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getNumberOfStreets()) {
-                        return null;
-                }
-                StreetNode sNode = addressContainer.getStreetList().get(row);
                 
                 switch (column) {
@@ -106 +105 @@
                 return false;
         }
+
+        @Override
+        public INodeEntity getEntityOfRow(int row) {
+                if (addressContainer == null || addressContainer.getStreetList() == null) {
+                        return null;
+                }
+                if (row < 0 || row > addressContainer.getNumberOfStreets()) {
+                        return null;
+                }
+                return addressContainer.getStreetList().get(row);       
+        }
 }

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

@@ -33 +33 @@
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
 import org.openstreetmap.josm.plugins.addressEdit.AddressNode;
-import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
+import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
 
 /**
@@ -83 +83 @@
         @Override
         public Object getValueAt(int row, int column) {
-                if (addressContainer == null || addressContainer.getUnresolvedAddresses() == null) {
+                AddressNode aNode = (AddressNode) getEntityOfRow(row);
+                
+                if (aNode == null) {
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getNumberOfUnresolvedAddresses()) {
-                        return null;
-                }
-                AddressNode aNode = addressContainer.getUnresolvedAddresses().get(row);
                 
                 switch (column) {
@@ -95 +93 @@
                         String guessed = aNode.getGuessedStreetName();
                         String cur = aNode.getStreet();
-                        if (!StringUtils.isNullOrEmpty(guessed) && 
-                                        AddressNode.MISSING_TAG.equals(cur)) {
-                                
+                        if (aNode.hasGuessedStreetName() && AddressNode.MISSING_TAG.equals(cur)) {                              
                                 return "*" + guessed;
                         } else {
@@ -126 +122 @@
                 return false;
         }
+
+        @Override
+        public INodeEntity getEntityOfRow(int row) {
+                if (addressContainer == null || addressContainer.getUnresolvedAddresses() == null) {
+                        return null;
+                }
+                if (row < 0 || row > addressContainer.getNumberOfUnresolvedAddresses()) {
+                        return null;
+                }
+                return addressContainer.getUnresolvedAddresses().get(row);      
+        }
 }