Changeset 86 in josm for src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) (5 diffs)

src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -11 +11 @@
 
 /**
- * Helper that collect all line segments a node is part of, all ways
- * a node or line segment is part of and all areas a node is part of. 
+ * Helper that collect all segments a node is part of, all ways
+ * a node or segment is part of and all areas a node is part of. 
  * 
  * Deleted objects are not collected.
@@ -38 +38 @@
         public void visit(Node n) {
                 for (Way t : ds.ways) {
-                        if (t.isDeleted())
+                        if (t.deleted)
                                 continue;
-                        for (LineSegment ls : t.segments) {
+                        for (Segment ls : t.segments) {
                                 if (ls.incomplete)
                                         continue;
@@ -49 +49 @@
                         }
                 }
-                for (LineSegment ls : ds.lineSegments) {
-                        if (ls.isDeleted() || ls.incomplete)
+                for (Segment ls : ds.segments) {
+                        if (ls.deleted || ls.incomplete)
                                 continue;
                         if (ls.from == n || ls.to == n)
@@ -56 +56 @@
                 }
         }
-        public void visit(LineSegment ls) {
+        public void visit(Segment ls) {
                 for (Way t : ds.ways) {
-                        if (t.isDeleted())
+                        if (t.deleted)
                                 continue;
                         if (t.segments.contains(ls))