Changeset 5251 in josm

Timestamp:

May 28, 2012 10:10:47 PM (12 months ago)

Author:

bastiK

Message:

applied #7720 - fix for OsmServerBackreferenceReader

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (3 diffs)
• io/OsmServerBackreferenceReader.java (modified) (3 diffs)

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

@@ -27 +27 @@
     /**
      * This flag shows, that the properties have been changed by the user
-     * and on upload the object will be send to the server
+     * and on upload the object will be send to the server.
      */
     protected static final int FLAG_MODIFIED = 1 << 0;
 
     /**
-     * The visible flag indicates, that an object is marked
+     * This flag is false, if the object is marked
      * as deleted on the server.
      */
@@ -54 +54 @@
 
     /**
-     * Put several boolean flag to one short int field to save memory.
+     * Put several boolean flags to one short int field to save memory.
      * Other bits of this field are used in subclasses.
      */
@@ -67 +67 @@
      * An id of 0 means an unknown id. The object has not been uploaded yet to
      * know what id it will get.
-     *
      */
     protected long id = 0;

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

@@ -203 +203 @@
      *
      * <ul>
-     *   <li>if this reader reads referers for an {@see Node}, referring ways are always
+     *   <li>if this reader reads referers for a {@see Node}, referring ways are always
      *     read individually from the server</li>
      *   <li>if this reader reads referers for an {@see Way} or a {@see Relation}, referring relations
@@ -222 +222 @@
             if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
                 for (Way way: waysToCheck) {
-                    if (!way.isNew() && way.isIncomplete()) {
+                    if (!way.isNew() && way.hasIncompleteNodes()) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
@@ -233 +233 @@
                 Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.getRelations());
                 for (Relation relation: relationsToCheck) {
-                    if (!relation.isNew() && relation.isIncomplete()) {
+                    if (!relation.isNew() && relation.hasIncompleteMembers()) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));