Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2013-04-16T19:57:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570, #7406 - I/O refactorization:

• Move different file copy functions to Utils.copyFile (to be replaced later by Files.copy when switching to Java 7)
• Replace all Utils.close(XXX) by Utils.close(Closeable) -> impacted plugins: commandline, mirrored_download, opendata, piclayer
• Add new Utils.close(ZipFile)
• Use of Utils.close almost everywhere
• Javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -324 +324 @@
                 UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u), "utf-8");
                 String r = new Scanner(in).useDelimiter("\\A").next();
-                in.close();
+                Utils.close(in);
                 System.out.println("Successfully loaded Bing attribution data.");
                 return r.getBytes("utf-8");