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

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/ext_tools/src/ext_tools/ToolsInformation.java (modified) (3 diffs)

applications/editors/josm/plugins/ext_tools/src/ext_tools/ToolsInformation.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import org.openstreetmap.josm.Main;
 
 public class ToolsInformation {
@@ -20 +22 @@
 
     public void load() {
-        try {
-            BufferedReader rdr = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(filename), "UTF-8"));
+        try (BufferedReader rdr = new BufferedReader(new InputStreamReader(
+                    new FileInputStream(filename), "UTF-8"))) {
             StringBuilder sb = new StringBuilder();
             String line;
@@ -32 +33 @@
                 }
             }
-            rdr.close();
         } catch (Exception e) {
-            System.err.println("Ext_Tools warning: can not load file "+filename);
-//            e.printStackTrace();
+            Main.warn("Ext_Tools warning: can not load file "+filename);
         }
     }
 
     public void save() {
-        try {
-            OutputStreamWriter w = new OutputStreamWriter(new FileOutputStream(filename),
-                    "UTF-8");
+        try (OutputStreamWriter w = new OutputStreamWriter(new FileOutputStream(filename), "UTF-8")) {
             for (ExtTool tool : tools)
                 w.write(tool.serialize());
-            w.close();
         } catch (Exception e) {
-            System.err.println("Ext_Tools warning: can not save file "+filename);
-//            e.printStackTrace();
+            Main.warn("Ext_Tools warning: can not save file "+filename);
         }
     }