Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-10-11T16:37:08+02:00 (16 years ago)

Author:

jttt

Message:

Replace testing for id <= 0 with isNew() method

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (3 diffs)
• OsmApi.java (modified) (1 diff)
• OsmServerBackreferenceReader.java (modified) (3 diffs)
• OsmServerWriter.java (modified) (2 diffs)
• OsmWriter.java (modified) (2 diffs)

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

@@ -155 +155 @@
     public MultiFetchServerObjectReader append(Node node) {
         if (node == null) return this;
-        if (node.getId() == 0) return this;
+        if (node.isNew()) return this;
         remember(node.getId(), OsmPrimitiveType.NODE);
         return this;
@@ -169 +169 @@
     public MultiFetchServerObjectReader append(Way way) {
         if (way == null) return this;
-        if (way.getId() == 0) return this;
+        if (way.isNew()) return this;
         for (Node node: way.getNodes()) {
-            if (node.getId() > 0) {
+            if (!node.isNew()) {
                 remember(node.getId(), OsmPrimitiveType.NODE);
             }
@@ -188 +188 @@
     public MultiFetchServerObjectReader append(Relation relation) {
         if (relation == null) return this;
-        if (relation.getId() == 0) return this;
+        if (relation.isNew()) return this;
         remember(relation.getId(), OsmPrimitiveType.RELATION);
         for (RelationMember member : relation.getMembers()) {

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

@@ -555 +555 @@
                 String errorBody = responseBody == null ? null : responseBody.toString().trim();
                 switch(retCode) {
-                    case HttpURLConnection.HTTP_OK:
-                        break; // do nothing
-                    case HttpURLConnection.HTTP_GONE:
-                        throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
-                    default:
-                        throw new OsmApiException(retCode, errorHeader, errorBody);
+                case HttpURLConnection.HTTP_OK:
+                    break; // do nothing
+                case HttpURLConnection.HTTP_GONE:
+                    throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
+                default:
+                    throw new OsmApiException(retCode, errorHeader, errorBody);
 
                 }

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

@@ -51 +51 @@
         if (primitive == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive"));
-        if (primitive.getId() == 0)
+        if (primitive.isNew())
             throw new IllegalArgumentException(tr("ID parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitive", primitive.getId()));
         this.id = primitive.getId();
@@ -222 +222 @@
             if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
                 for (Way way: waysToCheck) {
-                    if (way.getId() > 0 && way.incomplete) {
+                    if (!way.isNew() && way.incomplete) {
                         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.relations);
                 for (Relation relation: relationsToCheck) {
-                    if (relation.getId() > 0 && relation.incomplete) {
+                    if (!relation.isNew() && relation.incomplete) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));

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

@@ -79 +79 @@
                 String msg = "";
                 switch(OsmPrimitiveType.from(osm)) {
-                    case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
-                    case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
-                    case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
+                case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
+                case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
                 }
                 progressMonitor.subTask(
@@ -178 +178 @@
         if (osm.isDeleted()) {
             api.deletePrimitive(osm, progressMonitor);
-        } else if (osm.getId() == 0) {
+        } else if (osm.isNew()) {
             api.createPrimitive(osm, progressMonitor);
         } else {

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

@@ -87 +87 @@
 
     private boolean shouldWrite(OsmPrimitive osm) {
-        return osm.getId() != 0 || !osm.isDeleted();
+        return !osm.isNew() || !osm.isDeleted();
     }
 
@@ -173 +173 @@
      */
     private long getUsedId(OsmPrimitive osm) {
-        if (osm.getId() != 0)
+        if (!osm.isNew())
             return osm.getId();
         if (usedNewIds.containsKey(osm))