Changeset 13254 in josm for trunk/src

Timestamp:

2017-12-28T19:51:02+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove deprecated ProgressInputStream constructor

File:

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

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.util.Optional;
 
@@ -35 +34 @@
                 Optional.ofNullable(progressMonitor).orElse(NullProgressMonitor.INSTANCE), tr("Downloading data..."));
         this.in = in;
-    }
-
-    /**
-     * Constructs a new {@code ProgressInputStream}.
-     *
-     * Will call {@link URLConnection#getInputStream()} to obtain the stream to monitor.
-     *
-     * @param con the connection to monitor
-     * @param progressMonitor the monitor to report to
-     * @throws OsmTransferException if any I/O error occurs
-     * @deprecated use {@link org.openstreetmap.josm.tools.HttpClient.Response#getContent}
-     */
-    @Deprecated
-    public ProgressInputStream(URLConnection con, ProgressMonitor progressMonitor) throws OsmTransferException {
-        if (progressMonitor == null) {
-            progressMonitor = NullProgressMonitor.INSTANCE;
-        }
-        progressMonitor.beginTask(tr("Contacting OSM Server..."), 1);
-        progressMonitor.indeterminateSubTask(null);
-
-        try {
-            this.in = con.getInputStream();
-            this.updater = new StreamProgressUpdater(con.getContentLength(), progressMonitor, tr("Downloading data..."));
-        } catch (IOException e) {
-            progressMonitor.finishTask();
-            if (con.getHeaderField("Error") != null)
-                throw new OsmTransferException(tr(con.getHeaderField("Error")), e);
-            throw new OsmTransferException(e);
-        }
     }