Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2014-05-01T02:34:43+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -504 +504 @@
 
     private static ImageResource getIfAvailableHttp(String url, ImageType type) {
-        MirroredInputStream is = null;
-        try {
-            is = new MirroredInputStream(url,
-                    new File(Main.pref.getCacheDirectory(), "images").getPath());
+        try (MirroredInputStream is = new MirroredInputStream(url,
+                    new File(Main.pref.getCacheDirectory(), "images").getPath())) {
             switch (type) {
             case SVG:
@@ -526 +524 @@
         } catch (IOException e) {
             return null;
-        } finally {
-            Utils.close(is);
         }
     }
@@ -603 +599 @@
 
     private static ImageResource getIfAvailableZip(String fullName, File archive, String inArchiveDir, ImageType type) {
-        ZipFile zipFile = null;
-        try {
-            zipFile = new ZipFile(archive);
+        try (ZipFile zipFile = new ZipFile(archive)) {
             if (inArchiveDir == null || ".".equals(inArchiveDir)) {
                 inArchiveDir = "";
@@ -613 +607 @@
             String entryName = inArchiveDir + fullName;
             ZipEntry entry = zipFile.getEntry(entryName);
-            if(entry != null)
-            {
+            if (entry != null) {
                 int size = (int)entry.getSize();
                 int offs = 0;
                 byte[] buf = new byte[size];
-                InputStream is = null;
-                try {
-                    is = zipFile.getInputStream(entry);
+                try (InputStream is = zipFile.getInputStream(entry)) {
                     switch (type) {
                     case SVG:
@@ -641 +632 @@
                         return img == null ? null : new ImageResource(img);
                     default:
-                        throw new AssertionError();
+                        throw new AssertionError("Unknown ImageType: "+type);
                     }
-                } finally {
-                    Utils.close(is);
                 }
             }
         } catch (Exception e) {
             Main.warn(tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
-        } finally {
-            Utils.close(zipFile);
         }
         return null;
@@ -785 +772 @@
             });
 
-            parser.parse(new InputSource(new MirroredInputStream(
+            try (InputStream is = new MirroredInputStream(
                     base + fn,
-                    new File(Main.pref.getPreferencesDir(), "images").toString()
-                    )));
+                    new File(Main.pref.getPreferencesDir(), "images").toString())
+            ) {
+                parser.parse(new InputSource(is));
+            }
         } catch (SAXReturnException r) {
             return r.getResult();