Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.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/gui/mappaint/xml/XmlStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -75 +75 @@
         init();
         try {
-            InputStream in = getSourceInputStream();
-            try {
-                InputStreamReader reader = new InputStreamReader(in, Utils.UTF_8);
+            try (
+                InputStream in = getSourceInputStream();
+                InputStreamReader reader = new InputStreamReader(in, Utils.UTF_8)
+            ) {
                 XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
                 parser.startWithValidation(reader,
@@ -83 +84 @@
                         "resource://data/mappaint-style.xsd");
                 while (parser.hasNext());
-            } finally {
-                closeSourceInputStream(in);
-            }
-
+            }
         } catch (IOException e) {
             Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
@@ -377 +375 @@
         }
     }
-
 }