Changeset 23816 in osm for applications/editors

Timestamp:

2010-10-24T19:57:27+02:00 (14 years ago)

Author:

oliverw

Message:

• Added README, removed REVISION
• INodeEntity implements Comparable
• Sort/render street tree

Location:

applications/editors/josm/plugins/AddressEdit

Files:

• README (added)
• REVISION (deleted)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/AddressVisitor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/INodeEntity.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/addressEdit/NodeEntityBase.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/StreetNode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java (modified) (3 diffs)

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

@@ -94 +94 @@
          */
         public String getCountry() {
+                if (!TagUtils.hasAddrCountryTag(osmObject)) {
+                        return MISSING_TAG;
+                }
                 return TagUtils.getAddrCountryValue(osmObject);
         }
         
+        
+        
+        @Override
+        public int compareTo(INodeEntity o) {
+                if (o == null || !(o instanceof AddressNode)) {
+                        return -1;
+                }
+                AddressNode other = (AddressNode) o;
+                
+                int cc = 0;
+                cc = this.getCountry().compareTo(other.getCountry());
+                if ( cc  == 0) {
+                        cc = this.getState().compareTo(other.getState());
+                        
+                        if (cc  == 0) {
+                                cc = this.getCity().compareTo(other.getCity());
+                                
+                                if (cc  == 0) {
+                                        cc = this.getStreet().compareTo(other.getStreet());
+                                        
+                                        if (cc  == 0) {
+                                                cc = this.getHouseNumber().compareTo(other.getHouseNumber());
+                                        }
+                                }
+                        }
+                }
+                
+                return cc;
+        }
+
         @Override
         public String toString() {

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

@@ -30 +30 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -131 +132 @@
         
         public List<StreetNode> getStreetList() {
-                return new ArrayList<StreetNode>(streetDict.values());
+                
+                ArrayList<StreetNode> sortedList = new ArrayList<StreetNode>(streetDict.values());
+                Collections.sort(sortedList);
+                return sortedList;
         }
 

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
-public interface INodeEntity {
+public interface INodeEntity extends Comparable<INodeEntity> {
         /**
          * Gets the underlying OSM object.

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
-public class NodeEntityBase implements INodeEntity {
+public class NodeEntityBase implements INodeEntity, Comparable<INodeEntity> {
         public static final String ANONYMOUS = tr("No name");
         
@@ -74 +74 @@
         }
 
+        @Override
+        public int compareTo(INodeEntity o) {
+                if (o == null || !(o instanceof NodeEntityBase)) return -1;
+                return this.getName().compareTo(o.getName());
+        }
+
         
 }

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

@@ -15 +15 @@
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
@@ -48 +49 @@
                 
                 children.add(segment);
+                Collections.sort(children);
         }
         

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

@@ -36 +36 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreeSelectionModel;
 
 public class AddressEditDialog extends JFrame implements ActionListener, TreeSelectionListener {
@@ -72 +72 @@
                 setLocation(100, 100);
 
+                // TODO: Proper init, if model is null
                 if (model != null) {
                         JPanel streetPanel = new JPanel(new BorderLayout());
                         streetsTree = new JTree(new DefaultTreeModel(model.getStreetsTree()));
+                        streetsTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
                         streetsTree.addTreeSelectionListener(this);
+                        streetsTree.setCellRenderer(new StreetTreeCellRenderer());
+                        
                         JScrollPane scroll1 = new JScrollPane(streetsTree);
                         streetPanel.add(scroll1, BorderLayout.CENTER);
@@ -84 +88 @@
                         unresolvedTree = new JTree(new DefaultTreeModel(model.getUnresolvedAddressesTree()));
                         unresolvedTree.addTreeSelectionListener(this);
+                        
                         JScrollPane scroll2 = new JScrollPane(unresolvedTree);
                         unresolvedPanel.add(scroll2, BorderLayout.CENTER);