Changeset 9411 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (5 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;
             }
         }