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

Timestamp:

2015-12-26T23:42:03+01:00 (8 years ago)

Author:

simon04

Message:

see #12231 - Use HttpClient for OSM API calls

This requires adaptors to the OAuth library: SignpostAdapters

File:

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

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

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.HttpClient;
 
 /**
@@ -18 +19 @@
 
     private final InputStream in;
+    private final long size;
     private int readSoFar;
     private int lastDialogUpdate;
-    private boolean sizeKnown;
-    private final URLConnection connection;
     private final ProgressMonitor progressMonitor;
 
+    public ProgressInputStream(InputStream in, long size, ProgressMonitor progressMonitor) {
+        if (progressMonitor == null) {
+            progressMonitor = NullProgressMonitor.INSTANCE;
+        }
+        this.in = in;
+        this.size = size;
+        this.progressMonitor = progressMonitor;
+        progressMonitor.beginTask(tr("Contacting OSM Server..."), 1);
+        progressMonitor.indeterminateSubTask(null);
+        initProgressMonitor();
+    }
+
+    public ProgressInputStream(HttpClient.Response response, ProgressMonitor progressMonitor) throws IOException {
+        this(response.getContent(), response.getContentLength(), progressMonitor);
+    }
+
     public ProgressInputStream(URLConnection con, ProgressMonitor progressMonitor) throws OsmTransferException {
-        this.connection = con;
         if (progressMonitor == null) {
             progressMonitor = NullProgressMonitor.INSTANCE;
@@ -35 +50 @@
         try {
             this.in = con.getInputStream();
+            this.size = con.getContentLength();
         } catch (IOException e) {
             progressMonitor.finishTask();
@@ -41 +57 @@
             throw new OsmTransferException(e);
         }
+        initProgressMonitor();
+    }
 
-        updateSize();
-        if (!sizeKnown) {
+    protected void initProgressMonitor() {
+        if (size > 0) {
+            progressMonitor.subTask(tr("Downloading OSM data..."));
+            progressMonitor.setTicksCount((int) size);
+        } else {
             progressMonitor.indeterminateSubTask(tr("Downloading OSM data..."));
         }
@@ -82 +103 @@
     private void advanceTicker(int amount) {
         readSoFar += amount;
-        updateSize();
 
         if (readSoFar / 1024 != lastDialogUpdate) {
             lastDialogUpdate++;
-            if (sizeKnown) {
+            if (size > 0) {
                 progressMonitor.setTicks(readSoFar);
             }
@@ -92 +112 @@
         }
     }
-
-    private void updateSize() {
-        if (!sizeKnown && connection.getContentLength() > 0) {
-            sizeKnown = true;
-            progressMonitor.subTask(tr("Downloading OSM data..."));
-            progressMonitor.setTicksCount(connection.getContentLength());
-        }
-    }
 }