Changeset 9412 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2016-01-11T18:49:59+01:00 (8 years ago)

Author:

simon04

Message:

see #8824 - Allow to cancel updating of imagery entries in the preferences

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.imagery;
 
+import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28 +29 @@
 import org.xml.sax.helpers.DefaultHandler;
 
-public class ImageryReader {
+public class ImageryReader implements Closeable {
 
     private final String source;
+    private transient CachedFile cachedFile;
 
     private enum State {
@@ -53 +55 @@
         Parser parser = new Parser();
         try {
-            try (InputStream in = new CachedFile(source)
-                    .setMaxAge(1*CachedFile.DAYS)
+            cachedFile = new CachedFile(source);
+            try (BufferedReader in = cachedFile
+                    .setMaxAge(CachedFile.DAYS)
                     .setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince)
-                    .getInputStream()) {
-                InputSource is = new InputSource(UTFInputStreamReader.create(in));
+                    .getContentReader()) {
+                InputSource is = new InputSource(in);
                 Utils.parseSafeSAX(is, parser);
                 return parser.entries;
@@ -355 +358 @@
         }
     }
+
+    @Override
+    public void close() throws IOException {
+        Utils.close(cachedFile);
+    }
 }