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

Timestamp:

2014-05-09T04:49:54+02:00 (10 years ago)

Author:

Don-vip

Message:

fixes for unit tests

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MirroredInputStream.java (modified) (1 diff)
• OsmApi.java (modified) (1 diff)
• OsmReader.java (modified) (4 diffs)

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

@@ -228 +228 @@
     }
 
+    /**
+     * Replies the local file.
+     * @return The local file on disk
+     */
     public File getFile() {
         return file;

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

@@ -615 +615 @@
                 url = new URL(new URL(getBaseUrl()), urlSuffix);
                 Main.info(requestMethod + " " + url + "... ");
+                Main.debug(requestBody);
                 // fix #5369, see http://www.tikalk.com/java/forums/httpurlconnection-disable-keep-alive
                 activeConnection = Utils.openHttpConnection(url, false);

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

@@ -439 +439 @@
         }
 
-        // user attribute added in 0.4 API
         String user = parser.getAttributeValue(null, "user");
-        // uid attribute added in 0.6 API
         String uid = parser.getAttributeValue(null, "uid");
         current.setUser(createUser(uid, user));
 
-        // visible attribute added in 0.4 API
         String visible = parser.getAttributeValue(null, "visible");
         if (visible != null) {
@@ -474 +471 @@
         } else {
             // version expected for OSM primitives with an id assigned by the server (id > 0), since API 0.6
-            //
             if (!current.isNew() && ds.getVersion() != null && "0.6".equals(ds.getVersion())) {
                 throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.getUniqueId())));
@@ -497 +493 @@
             try {
                 current.setChangesetId(Integer.parseInt(v));
-            } catch(NumberFormatException e) {
+            } catch (IllegalArgumentException e) {
+                Main.debug(e.getMessage());
                 if (current.isNew()) {
                     // for a new primitive we just log a warning
@@ -506 +503 @@
                     throwException(tr("Illegal value for attribute ''changeset''. Got {0}.", v), e);
                 }
-            }
-            if (current.getChangesetId() <=0) {
+            } catch (IllegalStateException e) {
+                // thrown for positive changeset id on new primitives
+                Main.info(e.getMessage());
+                current.setChangesetId(0);
+            }
+            if (current.getChangesetId() <= 0) {
                 if (current.isNew()) {
                     // for a new primitive we just log a warning