Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java (revision 24093) @@ -74,5 +74,5 @@ private Collection workingSet; /** The street dictionary collecting all streets to a set of unique street names. */ - private HashMap streetDict = new HashMap(100); + private HashMap streetDict = new HashMap(100); /** The unresolved addresses list. */ @@ -83,5 +83,5 @@ /** The shadow copy to assemble the street dict during update. */ - private HashMap shadowStreetDict = new HashMap(100); + private HashMap shadowStreetDict = new HashMap(100); /** The shadow copy to assemble the unresolved addresses during update. */ private List shadowUnresolvedAddresses = new ArrayList(100); @@ -297,9 +297,9 @@ 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,5 +344,5 @@ * @return */ - public HashMap getStreetDict() { + public HashMap getStreetDict() { return streetDict; } @@ -371,6 +371,6 @@ * @return the street list */ - public List getStreetList() { - ArrayList sortedList = new ArrayList(streetDict.values()); + public List getStreetList() { + ArrayList sortedList = new ArrayList(streetDict.values()); Collections.sort(sortedList); return sortedList; @@ -463,5 +463,5 @@ if (streetName != null && shadowStreetDict.containsKey(streetName)) { - StreetNode sNode = shadowStreetDict.get(streetName); + OSMStreet sNode = shadowStreetDict.get(streetName); sNode.addAddress(aNode); return true; @@ -524,5 +524,5 @@ incompleteAddresses = new ArrayList(shadowIncompleteAddresses); unresolvedAddresses = new ArrayList(shadowUnresolvedAddresses); - streetDict = new HashMap(shadowStreetDict); + streetDict = new HashMap(shadowStreetDict); // remove temp data shadowStreetDict.clear(); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java (revision 24093) @@ -320,5 +320,5 @@ * @param node */ - public void assignStreet(StreetNode node) { + public void assignStreet(OSMStreet node) { if (node == null || !node.hasName()) return; Index: plications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StreetNode.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StreetNode.java (revision 24092) +++ (revision ) @@ -1,156 +1,0 @@ -/* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program. - * If not, see . - */ -package org.openstreetmap.josm.plugins.fixAddresses; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.openstreetmap.josm.data.osm.OsmPrimitive; - -/** - * This class is the container for all street segments with the same name. Every street - * consists at least of one segment. - * - * @author Oliver Wieland - */ -public class StreetNode extends OSMEntityBase { - private List children; - private List addresses; - - /** - * @param osmPrimitive - */ - public StreetNode(OsmPrimitive osmPrimitive) { - super(osmPrimitive); - } - - public List getChildren() { - return children; - } - - /** - * Adds a street segment to the street node. - * @param segment - */ - public void addStreetSegment(StreetSegmentNode segment) { - lazyCreateChildren(); - - children.add(segment); - Collections.sort(children); - } - - private void lazyCreateChildren() { - if (children == null) { - children = new ArrayList(); - } - } - - public void addAddress(OSMAddress aNode) { - lazyCreateAddresses(); - addresses.add(aNode); - } - - private void lazyCreateAddresses() { - if (addresses == null) { - addresses = new ArrayList(); - } - } - - public boolean hasAddresses() { - return addresses != null && addresses.size() > 0; - } - - public List getAddresses() { - return addresses; - } - - public void setAddresses(List addresses) { - this.addresses = addresses; - } - - /** - * Gets the number of addresses associated with this street. - * @return - */ - public int getNumberOfAddresses() { - if (addresses == null) return 0; - - return addresses.size(); - } - - /** - * Gets the number of street segments of this street. - * @return - */ - public int getNumberOfSegments() { - if (children == null) return 0; - - int sc = 0; - for (IOSMEntity node : children) { - if (node instanceof StreetSegmentNode) { - sc++; - } - } - return sc; - } - - /** - * Gets the road type(s) of this street. If the street has different types, - * they are separated by comma. - * @return - */ - public String getType() { - List types = new ArrayList(); - - for (IOSMEntity seg : getChildren()) { - OsmPrimitive osmPrim = seg.getOsmObject(); - if (TagUtils.hasHighwayTag(osmPrim)) { - String val = osmPrim.get(TagUtils.HIGHWAY_TAG); - if (!types.contains(val)) { - types.add(val); - } - } - } - - StringBuffer sb = new StringBuffer(20); - for (String string : types) { - if (sb.length() > 0) { - sb.append(", "); - } - sb.append(string); - - } - return sb.toString(); - } - - /* (non-Javadoc) - * @see org.openstreetmap.josm.plugins.addressEdit.NodeEntityBase#toString() - */ - @Override - public String toString() { - StringBuffer sb = new StringBuffer(getName()); - - if (children != null) { - sb.append(String.format(", %d segments", children.size())); - } - - if (addresses != null) { - sb.append(String.format(", %d address entries", addresses.size())); - } - - return sb.toString(); - } - -} Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java (revision 24093) @@ -53,5 +53,5 @@ 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,5 +260,5 @@ clearMapViewer(); - StreetNode sNode = ev.getSelectedStreet(); + OSMStreet sNode = ev.getSelectedStreet(); if (sNode != null) { Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java (revision 24093) @@ -24,8 +24,8 @@ 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 streets; + private List streets; private List unresolvedAddresses; private List incompleteAddresses = new ArrayList(); @@ -38,5 +38,5 @@ * @param unresolvedAddresses */ - public AddressEditModel(List streets, + public AddressEditModel(List streets, List unresolvedAddresses) { super(); @@ -50,5 +50,5 @@ if (streetRoot == null) { streetRoot = new DefaultMutableTreeNode(); - for (StreetNode sNode : streets) { + for (OSMStreet sNode : streets) { DefaultMutableTreeNode treeStreetNode = new DefaultMutableTreeNode(sNode); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditSelectionEvent.java (revision 24093) @@ -22,5 +22,5 @@ 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,5 +72,5 @@ * @return */ - public StreetNode getSelectedStreet() { + public OSMStreet getSelectedStreet() { if (streetTable != null && addressContainer != null && addressContainer.getStreetList() != null) { int selRows = streetTable.getSelectedRow(); Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AssignAddressToStreetAction.java (revision 24093) @@ -18,5 +18,5 @@ 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,5 +42,5 @@ @Override public void addressEditActionPerformed(AddressEditSelectionEvent ev) { - StreetNode streetNode = ev.getSelectedStreet(); + OSMStreet streetNode = ev.getSelectedStreet(); if (streetNode != null && ev.getSelectedUnresolvedAddresses() != null) { Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java =================================================================== --- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 24092) +++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java (revision 24093) @@ -18,5 +18,5 @@ 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,5 +79,5 @@ @Override public Object getValueAt(int row, int column) { - StreetNode sNode = (StreetNode) getEntityOfRow(row); + OSMStreet sNode = (OSMStreet) getEntityOfRow(row); if (sNode == null) {