Changeset 86 in josm for src/org/openstreetmap/josm/io/OsmWriter.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/io/OsmWriter.java (modified) (5 diffs)

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -8 +8 @@
 
 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;
@@ -51 +51 @@
                 for (Node n : ds.nodes)
                         writer.visit(n);
-                for (LineSegment ls : ds.lineSegments)
+                for (Segment ls : ds.segments)
                         writer.visit(ls);
                 for (Way w : ds.ways)
@@ -80 +80 @@
         }
 
-        public void visit(LineSegment ls) {
+        public void visit(Segment ls) {
                 if (ls.incomplete)
-                        return; // Do not write an incomplete line segment
+                        return; // Do not write an incomplete segment
                 addCommon(ls, "segment");
                 out.print(" from='"+getUsedId(ls.from)+"' to='"+getUsedId(ls.to)+"'");
@@ -91 +91 @@
                 addCommon(w, "way");
                 out.println(">");
-                for (LineSegment ls : w.segments)
+                for (Segment ls : w.segments)
                         out.println("    <seg id='"+getUsedId(ls)+"' />");
                 addTags(w, "way", false);
@@ -130 +130 @@
                 if (!osmConform) {
                         String action = null;
-                        if (osm.isDeleted())
+                        if (osm.deleted)
                                 action = "delete";
-                        else if (osm.modified && osm.modifiedProperties)
+                        else if (osm.modified)
                                 action = "modify";
-                        else if (osm.modified && !osm.modifiedProperties)
-                                action = "modify/object";
-                        else if (!osm.modified && osm.modifiedProperties)
-                                action = "modify/property";
                         if (action != null)
                                 out.print(" action='"+action+"'");
                 }
-                if (osm.lastModified != null) {
-                        String time = new SimpleDateFormat("y-M-d H:m:s").format(osm.lastModified);
+                if (osm.timestamp != null) {
+                        String time = new SimpleDateFormat("y-M-d H:m:s").format(osm.timestamp);
                         out.print(" timestamp='"+time+"'");
                 }