Changeset 24093 in osm

Timestamp:

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

Author:

oliverw

Message:

StreetNode -> OSMStreet

Location:

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

Files:

• AddressEditContainer.java (modified) (7 diffs)
• OSMAddress.java (modified) (1 diff)
• StreetNode.java (deleted)
• gui/AddressEditDialog.java (modified) (2 diffs)
• gui/AddressEditModel.java (modified) (3 diffs)
• gui/AddressEditSelectionEvent.java (modified) (2 diffs)
• gui/AssignAddressToStreetAction.java (modified) (2 diffs)
• gui/StreetTableModel.java (modified) (2 diffs)

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

@@ -74 +74 @@
         private Collection<? extends OsmPrimitive> workingSet;
         /** The street dictionary collecting all streets to a set of unique street names. */
-        private HashMap<String, StreetNode> streetDict = new HashMap<String, StreetNode>(100);
+        private HashMap<String, OSMStreet> streetDict = new HashMap<String, OSMStreet>(100);
         
         /** The unresolved addresses list. */
@@ -83 +83 @@
         
         /** The shadow copy to assemble the street dict during update. */
-        private HashMap<String, StreetNode> shadowStreetDict = new HashMap<String, StreetNode>(100);
+        private HashMap<String, OSMStreet> shadowStreetDict = new HashMap<String, OSMStreet>(100);
         /** The shadow copy to assemble the unresolved addresses during update. */
         private List<OSMAddress> shadowUnresolvedAddresses = new ArrayList<OSMAddress>(100);
@@ -297 +297 @@
                                         if (StringUtils.isNullOrEmpty(name)) return false;
 
-                                        StreetNode sNode = null;
+                                        OSMStreet sNode = null;
                                         if (shadowStreetDict.containsKey(name)) { // street exists?
                                                 sNode = shadowStreetDict.get(name);
                                         } else { // new street name -> add to dict
-                                                sNode = new StreetNode(w);
+                                                sNode = new OSMStreet(w);
                                                 shadowStreetDict.put(name, sNode);
                                         }
@@ -344 +344 @@
          * @return
          */
-        public HashMap<String, StreetNode> getStreetDict() {
+        public HashMap<String, OSMStreet> getStreetDict() {
                 return streetDict;
         }
@@ -371 +371 @@
          * @return the street list
          */
-        public List<StreetNode> getStreetList() {               
-                ArrayList<StreetNode> sortedList = new ArrayList<StreetNode>(streetDict.values());
+        public List<OSMStreet> getStreetList() {                
+                ArrayList<OSMStreet> sortedList = new ArrayList<OSMStreet>(streetDict.values());
                 Collections.sort(sortedList);
                 return sortedList;
@@ -463 +463 @@
                 
                 if (streetName != null && shadowStreetDict.containsKey(streetName)) {
-                        StreetNode sNode = shadowStreetDict.get(streetName);
+                        OSMStreet sNode = shadowStreetDict.get(streetName);
                         sNode.addAddress(aNode);
                         return true;
@@ -524 +524 @@
                         incompleteAddresses = new ArrayList<OSMAddress>(shadowIncompleteAddresses);
                         unresolvedAddresses = new ArrayList<OSMAddress>(shadowUnresolvedAddresses);
-                        streetDict = new HashMap<String, StreetNode>(shadowStreetDict);
+                        streetDict = new HashMap<String, OSMStreet>(shadowStreetDict);
                         // remove temp data
                         shadowStreetDict.clear();

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

@@ -320 +320 @@
          * @param node
          */
-        public void assignStreet(StreetNode node) {
+        public void assignStreet(OSMStreet node) {
                 if (node == null || !node.hasName()) return;
                 

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

@@ -53 +53 @@
 import org.openstreetmap.josm.plugins.fixAddresses.IAddressEditContainerListener;
 import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
-import org.openstreetmap.josm.plugins.fixAddresses.StreetNode;
+import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet;
 import org.openstreetmap.josm.plugins.fixAddresses.StringUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -260 +260 @@
                 
                 clearMapViewer();
-                StreetNode sNode = ev.getSelectedStreet();
+                OSMStreet sNode = ev.getSelectedStreet();
                 if (sNode != null) {
                                                 

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

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress;
 import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
-import org.openstreetmap.josm.plugins.fixAddresses.StreetNode;
+import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet;
 
 public class AddressEditModel {
-        private List<StreetNode> streets;
+        private List<OSMStreet> streets;
         private List<OSMAddress> unresolvedAddresses;
         private List<OSMAddress> incompleteAddresses = new ArrayList<OSMAddress>();
@@ -38 +38 @@
          * @param unresolvedAddresses
          */
-        public AddressEditModel(List<StreetNode> streets,
+        public AddressEditModel(List<OSMStreet> streets,
                         List<OSMAddress> unresolvedAddresses) {
                 super();
@@ -50 +50 @@
                 if (streetRoot == null) {
                         streetRoot = new DefaultMutableTreeNode();
-                        for (StreetNode sNode : streets) {
+                        for (OSMStreet sNode : streets) {
                                 DefaultMutableTreeNode treeStreetNode = new DefaultMutableTreeNode(sNode);
                                 

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

@@ -22 +22 @@
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
 import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress;
-import org.openstreetmap.josm.plugins.fixAddresses.StreetNode;
+import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet;
 
 public class AddressEditSelectionEvent extends ActionEvent {
@@ -72 +72 @@
          * @return
          */
-        public StreetNode getSelectedStreet() {
+        public OSMStreet getSelectedStreet() {
                 if (streetTable != null && addressContainer != null && addressContainer.getStreetList() != null) {
                         int selRows = streetTable.getSelectedRow();

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
 import org.openstreetmap.josm.plugins.fixAddresses.OSMAddress;
-import org.openstreetmap.josm.plugins.fixAddresses.StreetNode;
+import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet;
 
 /**
@@ -42 +42 @@
         @Override
         public void addressEditActionPerformed(AddressEditSelectionEvent ev) {          
-                StreetNode streetNode = ev.getSelectedStreet();
+                OSMStreet streetNode = ev.getSelectedStreet();
                                                 
                 if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) {

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.fixAddresses.AddressEditContainer;
 import org.openstreetmap.josm.plugins.fixAddresses.IOSMEntity;
-import org.openstreetmap.josm.plugins.fixAddresses.StreetNode;
+import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet;
 
 public class StreetTableModel extends AddressEditTableModel {
@@ -79 +79 @@
         @Override
         public Object getValueAt(int row, int column) {         
-                StreetNode sNode = (StreetNode) getEntityOfRow(row);
+                OSMStreet sNode = (OSMStreet) getEntityOfRow(row);
                 
                 if (sNode == null) {