Changeset 4734 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

Timestamp:

2011-12-28T20:40:46+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #7194 - Reworking of osmChange downloads (Fail to update a way loaded from osmChange that have been deleted after)

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -22 +22 @@
  * It can either download the object including or not including its immediate children.
  * The former case is called a "full download".
+ * 
+ * It can also download a specific version of the object (however, "full" download is not possible
+ * in that case).
  *
  */
@@ -29 +32 @@
     /** true if a full download is required, i.e. a download including the immediate children */
     private boolean full;
+    /** the specific version number, if required (incompatible with full), or -1 else */
+    private int version;
 
     /**
@@ -41 +46 @@
      */
     public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) throws IllegalArgumentException {
+        this(id, type, full, -1);
+    }
+
+    /**
+     * Creates a new server object reader for a given id and a primitive type.
+     *
+     * @param id the object id. > 0 required.
+     * @param type the type. Must not be null.
+     * @param version the specific version number, if required; -1, otherwise
+     * @throws IllegalArgumentException thrown if id <= 0
+     * @throws IllegalArgumentException thrown if type is null
+     */
+    public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) throws IllegalArgumentException {
+        this(id, type, false, version);
+    }
+
+    protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) throws IllegalArgumentException {
         if (id <= 0)
             throw new IllegalArgumentException(MessageFormat.format("Expected value > 0 for parameter ''{0}'', got {1}", "id", id));
@@ -46 +68 @@
         this.id = new SimplePrimitiveId(id, type);
         this.full = full;
+        this.version = version;
     }
 
@@ -58 +81 @@
      */
     public OsmServerObjectReader(PrimitiveId id, boolean full) {
+        this(id, full, -1);
+    }
+
+    /**
+     * Creates a new server object reader for an object with the given <code>id</code>
+     *
+     * @param id the object id. Must not be null. Unique id > 0 required.
+     * @param version the specific version number, if required; -1, otherwise
+     * @throws IllegalArgumentException thrown if id is null
+     * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0
+     */
+    public OsmServerObjectReader(PrimitiveId id, int version) {
+        this(id, false, version);
+    }
+
+    protected OsmServerObjectReader(PrimitiveId id, boolean full, int version) {
         CheckParameterUtil.ensureValidPrimitiveId(id, "id");
         this.id = id;
         this.full = full;
+        this.version = version;
     }
 
@@ -87 +127 @@
             if (full && ! id.getType().equals(OsmPrimitiveType.NODE)) {
                 sb.append("/full");
+            } else if (version > 0) {
+                sb.append("/"+version);
             }