Changeset 32 in josm for src/org/openstreetmap/josm/data

Timestamp:

2005-12-19T22:58:10+01:00 (18 years ago)

Author:

imi

Message:

• Fixed bugs in reading/writing
• Added correct extension filter to load/save
• Delete now moves to deleted. modified flag reintroduced

Location:

src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• visitor/AddVisitor.java (modified) (1 diff)
• visitor/DeleteVisitor.java (modified) (1 diff)

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -42 +42 @@
          */
         public Collection<Track> tracks = new LinkedList<Track>();
+
+        /**
+         * All deleted objects goes here.
+         */
+        public Collection<OsmPrimitive> deleted = new LinkedList<OsmPrimitive>();
 
         /**

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -32 +32 @@
         public long id = 0;
 
+        /**
+         * <code>true</code>, if the object has been modified since it was loaded from
+         * the server. In this case, on next upload, this object will be updated. Deleted
+         * objects are deleted from the server, even if they are modified. If the objects
+         * are added (id=0), the modified is ignored and the object is added to the server. 
+         */
+        public boolean modified = false;
+        
         /**
          * If set to true, this object is currently selected.

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

@@ -26 +26 @@
         public void visit(Node n) {
                 ds.nodes.add(n);
+                ds.deleted.remove(n); // remove if there.
         }
         public void visit(LineSegment ls) {
                 ds.lineSegments.add(ls);
+                ds.deleted.remove(ls); // remove if there.
         }
         public void visit(Track t) {
                 ds.tracks.add(t);
+                ds.deleted.remove(t); // remove if there.
         }
         public void visit(Key k) {}

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

@@ -25 +25 @@
         
         public void visit(Node n) {
-                ds.nodes.remove(n);
+                if (ds.nodes.remove(n))
+                        ds.deleted.add(n);
         }
         public void visit(LineSegment ls) {
-                ds.lineSegments.remove(ls);
+                if (ds.lineSegments.remove(ls))
+                        ds.deleted.add(ls);
         }
         public void visit(Track t) {
-                ds.tracks.remove(t);
+                if (ds.tracks.remove(t))
+                        ds.deleted.add(t);
         }
         public void visit(Key k) {}