Changeset 2598 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-12-09T21:24:32+01:00 (15 years ago)

Author:

Gubaer

Message:

comment to follow in a later commit
Have to break up a commit because of SSL problem in SVN (filed a ticket - #4093)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (3 diffs)
• osm/Changeset.java (modified) (3 diffs)
• osm/PrimitiveData.java (modified) (1 diff)
• osm/PrimitiveId.java (modified) (1 diff)
• osm/RelationMember.java (modified) (1 diff)
• osm/RelationMemberData.java (modified) (1 diff)
• osm/SimplePrimitiveId.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -14 +14 @@
 import java.util.logging.Logger;
 
+import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -21 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
-
 /**
  * Represents a collection of {@see OsmPrimitive}s which should be uploaded to the
  * API.
- * The collection is derived from the modified primitives of an {@see DataSet}.
+ * The collection is derived from the modified primitives of an {@see DataSet} and it provides methods
+ * for sorting the objects in upload order.
  *
  */
@@ -212 +212 @@
 
     /**
+     * Replies the number of objects to upload
+     * 
+     * @return the number of objects to upload
+     */
+    public int getSize() {
+        return toAdd.size() + toUpdate.size() + toDelete.size();
+    }
+
+    public void removeProcessed(Collection<OsmPrimitive> processed) {
+        if (processed == null) return;
+        toAdd.removeAll(processed);
+        toUpdate.removeAll(processed);
+        toDelete.removeAll(processed);
+    }
+
+    /**
      * Adjusts the upload order for new relations. Child relations are uploaded first,
      * parent relations second.

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Martijn van Oosterhout and others
 package org.openstreetmap.josm.data.osm;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.Collection;
@@ -100 +98 @@
     }
 
-    public String getLocalName(){
-        return tr("Changeset {0}",getId());
-    }
-
     public String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);
@@ -308 +302 @@
         return tags.keySet();
     }
+
+    public boolean isNew() {
+        return id <= 0;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -173 +173 @@
     }
 
+    public boolean isNew() {
+        return id <= 0;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java

@@ -5 +5 @@
 
     long getUniqueId();
-
     OsmPrimitiveType getType();
 
+    /**
+     * Replies true if this id represents a new primitive.
+     * 
+     * @return true if this id represents a new primitive.
+     */
+    boolean isNew();
+
 }

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -171 +171 @@
         return member.getUniqueId();
     }
+
+    public boolean isNew() {
+        return member.isNew();
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

@@ -51 +51 @@
     }
 
+    public boolean isNew() {
+        return memberId <= 0;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java

@@ -18 +18 @@
     public long getUniqueId() {
         return id;
+    }
+
+    public boolean isNew() {
+        return id <= 0;
     }