Changeset 7037 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-05-01T16:28:25+02:00 (9 years ago)

Author:

Don-vip

Message:

see #8465 - last batch of try-with-resources

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioUtil.java (modified) (1 diff)
• BugReportExceptionHandler.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/AudioUtil.java

@@ -38 +38 @@
                 * audioFormat.getFrameSize() /* bytes per frame */;
             double naturalLength = filesize / bytesPerSecond;
-            Utils.close(audioInputStream);
             double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
             return naturalLength / calibration;

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -211 +211 @@
      */
     public static URL getBugReportUrl(String debugText) {
-        try {
+        try (
             ByteArrayOutputStream out = new ByteArrayOutputStream();
-            GZIPOutputStream gzip = new GZIPOutputStream(out);
+            GZIPOutputStream gzip = new GZIPOutputStream(out)
+        ) {
             gzip.write(debugText.getBytes(Utils.UTF_8));
-            Utils.close(gzip);
 
             return new URL(Main.getJOSMWebsite()+"/josmticket?" +

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -200 +200 @@
                 // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
                 Process p = Runtime.getRuntime().exec("lsb_release -ds");
-                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), Utils.UTF_8));
-                String line = Utils.strip(input.readLine());
-                Utils.close(input);
-                if (line != null && !line.isEmpty()) {
-                    line = line.replaceAll("\"+","");
-                    line = line.replaceAll("NAME=",""); // strange code for some Gentoo's
-                    if(line.startsWith("Linux ")) // e.g. Linux Mint
-                        return line;
-                    else if(!line.isEmpty())
-                        return "Linux " + line;
+                try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), Utils.UTF_8))) {
+                    String line = Utils.strip(input.readLine());
+                    if (line != null && !line.isEmpty()) {
+                        line = line.replaceAll("\"+","");
+                        line = line.replaceAll("NAME=",""); // strange code for some Gentoo's
+                        if(line.startsWith("Linux ")) // e.g. Linux Mint
+                            return line;
+                        else if(!line.isEmpty())
+                            return "Linux " + line;
+                    }
                 }
             } catch (IOException e) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -801 +801 @@
         }
         Process p = new ProcessBuilder(command).start();
-        BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), UTF_8));
-        StringBuilder all = null;
-        String line;
-        while ((line = input.readLine()) != null) {
-            if (all == null) {
-                all = new StringBuilder(line);
-            } else {
-                all.append("\n");
-                all.append(line);
-            }
-        }
-        Utils.close(input);
-        return all != null ? all.toString() : null;
+        try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), UTF_8))) {
+            StringBuilder all = null;
+            String line;
+            while ((line = input.readLine()) != null) {
+                if (all == null) {
+                    all = new StringBuilder(line);
+                } else {
+                    all.append("\n");
+                    all.append(line);
+                }
+            }
+            return all != null ? all.toString() : null;
+        }
     }