Changeset 30738 in osm for applications/editors/josm/plugins/tageditor

Timestamp:

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

Author:

donvip

Message:

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

File:

• applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java (modified) (13 diffs)

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java

@@ -26 +26 @@
 /**
  * This class manages a list of {@link TagSpecification}s.
- * 
+ *
  * It also provides a method for reading a list of {@link TagSpecification}s from
  * an XML file.
- * 
+ *
  * @author Gubaer
  *
@@ -63 +63 @@
      * loads the tag specifications from the resource file given by
      * {@link #RES_NAME_TAG_SPECIFICATIONS}.
-     * 
+     *
      * @return the list of {@link TagSpecification}s
      * @throws Exception thrown, if an exception occurs
@@ -71 +71 @@
         if (in == null) {
             logger.log(Level.SEVERE, "failed to create input stream for resource '" + RES_NAME_TAG_SPECIFICATIONS + "'");
-        }
-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-        TagSpecifications spec = new TagSpecifications();
-        spec.load(reader);
-        reader.close();
-        instance = spec;
-
+            return;
+        }
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+                TagSpecifications spec = new TagSpecifications();
+                spec.load(reader);
+                instance = spec;
+        }
     }
 
@@ -97 +97 @@
     /**
      * loads the tag specifications from a specific reader
-     * 
+     *
      * @param in  the reader to read from
      * @throws Exception thrown, if an exception occurs
@@ -156 +156 @@
         return items;
     }
-    
+
     /**
      * replies a list of {@see KeyValuePair}s for all {@see TagSpecification}s and
      * {@see LableSpecification}s.
-     * 
+     *
      * @return the list
      */
@@ -178 +178 @@
     /**
      * The SAX handler for reading XML files with tag specifications
-     * 
+     *
      * @author gubaer
      *
@@ -212 +212 @@
          * parses a string value consisting of 'yes' or 'no' (exactly, case
          * sensitive)
-         * 
+         *
          * @param value the string value
          * @return true, if value is <code>yes</code>; false, if value is <code>no</code>
@@ -228 +228 @@
         /**
          * handles a start element with name <code>osm-tag-definitions</code>
-         * 
+         *
          * @param atts  the XML attributes
          * @throws SAXException
@@ -238 +238 @@
         /**
          * handles an end element with name <code>osm-tag-specifications</code>
-         * 
+         *
          * @throws SAXException
          */
@@ -247 +247 @@
         /**
          * handles a start element with name <code>tag</code>
-         * 
+         *
          * @param atts the XML attributes of the element
          * @throws SAXException
@@ -285 +285 @@
         /**
          * handles a start element with name <code>label</code>
-         * 
+         *
          * @param atts the XML attributes
          * @throws SAXException
@@ -311 +311 @@
         /**
          * handles an end element with name <code>label</code>
-         * 
+         *
          * @throws SAXException
          */
@@ -352 +352 @@
     class ResourceEntityResolver implements EntityResolver {
 
-        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+        @Override
+                public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
             if (systemId != null && systemId.endsWith(DTD)) {
                 InputStream stream = TagSpecifications.class.getResourceAsStream("/resources/"+DTD);