Changeset 9411 in josm

Timestamp:

2016-01-11T18:03:13+01:00 (9 years ago)

Author:

simon04

Message:

see #8824 - Allow to cancel download of style/preset list in preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/SourceEditor.java (modified) (5 diffs)
• io/CachedFile.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -1319 +1319 @@
         private final String url;
         private final List<SourceProvider> sourceProviders;
-        private BufferedReader reader;
-        private boolean canceled;
+        private transient CachedFile cachedFile;
+        private transient boolean canceled;
         private final List<ExtendedSourceEntry> sources = new ArrayList<>();
 
@@ -1332 +1332 @@
         protected void cancel() {
             canceled = true;
-            Utils.close(reader);
+            Utils.close(cachedFile);
         }
 
@@ -1356 +1356 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            String lang = LanguageInfo.getLanguageCodeXML();
             try {
                 sources.addAll(getDefault());
@@ -1367 +1366 @@
                     }
                 }
-
-                InputStream stream = new CachedFile(url).getInputStream();
-                reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
+                readFile();
+            } catch (IOException e) {
+                if (canceled)
+                    // ignore the exception and return
+                    return;
+                OsmTransferException ex = new OsmTransferException(e);
+                ex.setUrl(url);
+                warn(ex);
+            }
+        }
+
+        protected void readFile() throws IOException {
+            final String lang = LanguageInfo.getLanguageCodeXML();
+            cachedFile = new CachedFile(url);
+            try (final BufferedReader reader = cachedFile.getContentReader()) {
 
                 String line;
@@ -1434 +1445 @@
                     }
                 }
-            } catch (IOException e) {
-                if (canceled)
-                    // ignore the exception and return
-                    return;
-                OsmTransferException ex = new OsmTransferException(e);
-                ex.setUrl(url);
-                warn(ex);
-                return;
             }
         }

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

@@ -5 +5 @@
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
@@ -41 +43 @@
  * you can also get the mirrored copy with {@link #getFile()}.
  */
-public class CachedFile {
+public class CachedFile implements Closeable {
 
     /**
@@ -67 +69 @@
     protected CachingStrategy cachingStrategy;
 
+    private transient HttpClient activeConnection;
     protected File cacheFile;
     protected boolean initialized;
@@ -197 +200 @@
         }
         return new FileInputStream(file);
+    }
+
+    /**
+     * Returns {@link #getInputStream()} wrapped in a buffered reader.
+     * <p/>
+     * Detects Unicode charset in use utilizing {@link UTFInputStreamReader}.
+     *
+     * @return buffered reader
+     * @throws IOException if any I/O error occurs
+     * @since 9411
+     */
+    public BufferedReader getContentReader() throws IOException {
+        return new BufferedReader(UTFInputStreamReader.create(getInputStream()));
     }
 
@@ -413 +429 @@
         destDirFile = new File(destDir, localPath + ".tmp");
         try {
-            final HttpClient.Response con = HttpClient.create(url)
+            activeConnection = HttpClient.create(url)
                     .setAccept(httpAccept)
                     .setIfModifiedSince(ifModifiedSince == null ? 0L : ifModifiedSince)
-                    .setHeaders(httpHeaders)
-                    .connect();
+                    .setHeaders(httpHeaders);
+            final HttpClient.Response con = activeConnection.connect();
             if (ifModifiedSince != null && con.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
                 if (Main.isDebugEnabled()) {
@@ -431 +447 @@
                 Files.copy(bis, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
+            activeConnection = null;
             localFile = new File(destDir, localPath);
             if (Main.platform.rename(destDirFile, localFile)) {
@@ -456 +473 @@
     }
 
+    /**
+     * Attempts to disconnect an URL connection.
+     * @see HttpClient#disconnect()
+     * @since 9411
+     */
+    @Override
+    public void close() {
+        if (activeConnection != null) {
+            activeConnection.disconnect();
+        }
+    }
 }