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

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/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java

@@ -411 +411 @@
       try {
          path.mkdirs();
-
-         FileOutputStream file = new FileOutputStream(fileName);
-         ObjectOutputStream o = new ObjectOutputStream(file);
-         o.writeObject(dto);
-         o.close();
+         try (
+                 FileOutputStream file = new FileOutputStream(fileName);
+                 ObjectOutputStream o = new ObjectOutputStream(file)
+         ) {
+             o.writeObject(dto);
+         }
       } catch (Exception ex) {
          logger.log(Level.SEVERE, ex.getMessage());
@@ -534 +535 @@
    }
 
-   private Dto loadDto() {
-      Dto dto = new Dto();
-      File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA);
-
-      try {
-
-         if (fileName.exists()) {
-            FileInputStream file = new FileInputStream(fileName);
-            ObjectInputStream o = new ObjectInputStream(file);
-
-            dto = (Dto) o.readObject();
-            o.close();
-         } else {
-            dto.setCity(selection.get(TagDialog.TAG_ADDR_CITY));
-            dto.setCountry(selection.get(TagDialog.TAG_ADDR_COUNTRY));
-            dto.setHousenumber(selection.get(TagDialog.TAG_ADDR_HOUSENUMBER));
-            dto.setPostcode(selection.get(TagDialog.TAG_ADDR_POSTCODE));
-            dto.setStreet(selection.get(TagDialog.TAG_ADDR_STREET));
-            dto.setState(selection.get(TagDialog.TAG_ADDR_STATE));
-         }
-      } catch (Exception ex) {
+    private Dto loadDto() {
+        Dto dto = new Dto();
+        File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA);
+
+        try {
+            if (fileName.exists()) {
+                try (
+                                        FileInputStream file = new FileInputStream(fileName);
+                                        ObjectInputStream o = new ObjectInputStream(file);
+                ) {
+                        dto = (Dto) o.readObject();
+                }
+            } else {
+                    dto.setCity(selection.get(TagDialog.TAG_ADDR_CITY));
+                    dto.setCountry(selection.get(TagDialog.TAG_ADDR_COUNTRY));
+                    dto.setHousenumber(selection.get(TagDialog.TAG_ADDR_HOUSENUMBER));
+                    dto.setPostcode(selection.get(TagDialog.TAG_ADDR_POSTCODE));
+                    dto.setStreet(selection.get(TagDialog.TAG_ADDR_STREET));
+                    dto.setState(selection.get(TagDialog.TAG_ADDR_STATE));
+            }
+        } catch (Exception ex) {
             logger.log(Level.SEVERE, ex.getMessage());
             fileName.delete();
-      }
-      return dto;
-
-   }
-
-    class RadioChangeListener implements ItemListener
-    {
+        }
+        return dto;
+    }
+
+    class RadioChangeListener implements ItemListener {
 
          @Override