Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified) (7 diffs)

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

@@ -22 +22 @@
     private PleaseWaitDialog pleaseWaitDlg;
 
-    public class OsmServerException extends IOException {
-        private OsmServerException(String e) {
-            super(e);
-        }
-    }
-
-    public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws IOException, OsmServerException {
+    public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws OsmTransferException {
         this.connection = con;
 
@@ -35 +29 @@
         } catch (IOException e) {
             if (con.getHeaderField("Error") != null)
-                throw new OsmServerException(tr(con.getHeaderField("Error")));
-            throw e;
+                throw new OsmTransferException(tr(con.getHeaderField("Error")));
+            throw new OsmTransferException(e);
         }
 
@@ -43 +37 @@
         if (pleaseWaitDlg == null)
             return;
-        if (contentLength > 0)
+        if (contentLength > 0) {
             pleaseWaitDlg.progress.setMaximum(contentLength);
-        else
+        } else {
             pleaseWaitDlg.progress.setMaximum(0);
+        }
         pleaseWaitDlg.progress.setValue(0);
     }
@@ -56 +51 @@
     @Override public int read(byte[] b, int off, int len) throws IOException {
         int read = in.read(b, off, len);
-        if (read != -1)
+        if (read != -1) {
             advanceTicker(read);
+        }
         return read;
     }
@@ -63 +59 @@
     @Override public int read() throws IOException {
         int read = in.read();
-        if (read != -1)
+        if (read != -1) {
             advanceTicker(1);
+        }
         return read;
     }
@@ -76 +73 @@
             return;
 
-        if (pleaseWaitDlg.progress.getMaximum() == 0 && connection.getContentLength() != -1)
+        if (pleaseWaitDlg.progress.getMaximum() == 0 && connection.getContentLength() != -1) {
             pleaseWaitDlg.progress.setMaximum(connection.getContentLength());
+        }
 
         readSoFar += amount;
@@ -89 +87 @@
             String cur = pleaseWaitDlg.currentAction.getText();
             int i = cur.indexOf(' ');
-            if (i != -1)
+            if (i != -1) {
                 cur = cur.substring(0, i) + progStr;
-            else
+            } else {
                 cur += progStr;
+            }
             pleaseWaitDlg.currentAction.setText(cur);
         }