Changeset 24094 in osm for applications/editors/josm/plugins

Timestamp:

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

Author:

oliverw

Message:

StreetSegmentNode -> OSMStreetSegment

Location:

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

Files:

• AddressEditContainer.java (modified) (1 diff)
• NodeFactory.java (modified) (1 diff)
• OSMStreet.java (modified) (2 diffs)
• OSMStreetSegment.java (moved) (moved from applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StreetSegmentNode.java ) (1 diff)

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

@@ -290 +290 @@
                 if (ne != null) {
                         // Node is a street (segment)
-                        if (ne instanceof StreetSegmentNode) {
-                                StreetSegmentNode newSegment = (StreetSegmentNode) ne;
+                        if (ne instanceof OSMStreetSegment) {
+                                OSMStreetSegment newSegment = (OSMStreetSegment) ne;
 
                                 if (newSegment != null) {

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

@@ -51 +51 @@
         public static IOSMEntity createNodeFromWay(Way way) {
                 if (TagUtils.hasHighwayTag(way)) {
-                        return new StreetSegmentNode(way);
+                        return new OSMStreetSegment(way);
                 }
                 

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

@@ -45 +45 @@
          * @param segment
          */
-        public void addStreetSegment(StreetSegmentNode segment) {
+        public void addStreetSegment(OSMStreetSegment segment) {
                 lazyCreateChildren();
                 
@@ -100 +100 @@
                 int sc = 0;
                 for (IOSMEntity node : children) {
-                        if (node instanceof StreetSegmentNode) {
+                        if (node instanceof OSMStreetSegment) {
                                 sc++;
                         }

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

@@ -26 +26 @@
  */
 
-public class StreetSegmentNode extends OSMEntityBase {
+public class OSMStreetSegment extends OSMEntityBase {
 
-        public StreetSegmentNode(OsmPrimitive osmObject) {
+        public OSMStreetSegment(OsmPrimitive osmObject) {
                 super(osmObject);
         }