Changeset 30738 in osm for applications/editors/josm/plugins/piclayer/src

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java (modified) (4 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java

@@ -74 +74 @@
 
         if (isZip) {
-            ZipFile zipFile = null;
-            try
-            {
-                zipFile = new ZipFile(m_file);
+            try (ZipFile zipFile = new ZipFile(m_file)) {
                 ZipEntry imgEntry = null;
                 Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -103 +100 @@
                 System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", m_file.getName(), e.toString()));
                 return null;
-            } finally {
-                if (zipFile != null) {
-                    try {
-                        zipFile.close();
-                    } catch (IOException ex) {
-                    }
-                }
             }
         } else {
@@ -149 +139 @@
 
         if (isZip) {
-            ZipFile zipFile = null;
-            try
-            {
-                zipFile = new ZipFile(m_file);
+            try (ZipFile zipFile = new ZipFile(m_file)) {
                 String calFileStr = imgNameInZip + CalibrationFileFilter.EXTENSION;
                 ZipEntry calEntry = zipFile.getEntry(calFileStr);
@@ -183 +170 @@
                 }
             } catch (Exception e) {
-                System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", m_file.getName(), e.toString()));
+                Main.warn(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", m_file.getName(), e.toString()));
                 return;
-            } finally {
-                if (zipFile != null) {
-                    try {
-                        zipFile.close();
-                    } catch (IOException ex) {
-                    }
-                }
             }
         } else {