Changeset 7037 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• data/AutosaveTask.java (modified) (1 diff)
• data/imagery/ImageryLayerInfo.java (modified) (2 diffs)
• data/projection/datum/NTV2GridShiftFile.java (modified) (1 diff)
• gui/help/HelpContentReader.java (modified) (2 diffs)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (9 diffs)
• gui/preferences/server/ApiUrlTestTask.java (modified) (3 diffs)
• io/GpxExporter.java (modified) (3 diffs)
• io/NmeaReader.java (modified) (2 diffs)
• io/OsmApi.java (modified) (1 diff)
• io/OsmImporter.java (modified) (1 diff)
• io/remotecontrol/RemoteControlHttpsServer.java (modified) (2 diffs)
• plugins/ReadRemotePluginInformationTask.java (modified) (5 diffs)
• tools/AudioUtil.java (modified) (1 diff)
• tools/BugReportExceptionHandler.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -301 +301 @@
                             }
                         }
-                        Utils.close(reader);
                     } catch (Exception e) {
                         Main.error(e);

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -304 +304 @@
                 if (pidFile.exists()) {
                     try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(pidFile), Utils.UTF_8))) {
-                        try {
-                            String jvmId = reader.readLine();
-                            if (jvmId != null) {
-                                String pid = jvmId.split("@")[0];
-                                skipFile = jvmPerfDataFileExists(pid);
-                            }
-                        } catch (Throwable t) {
-                            Main.error(t);
-                        } finally {
-                            Utils.close(reader);
+                        String jvmId = reader.readLine();
+                        if (jvmId != null) {
+                            String pid = jvmId.split("@")[0];
+                            skipFile = jvmPerfDataFileExists(pid);
                         }
                     } catch (Throwable t) {

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -74 +74 @@
                 MirroredInputStream.cleanup(source);
             }
-            MirroredInputStream stream = null;
             try {
                 ImageryReader reader = new ImageryReader(source);
@@ -80 +79 @@
                 defaultLayers.addAll(result);
             } catch (IOException ex) {
-                Utils.close(stream);
                 Main.error(ex, false);
                 continue;
             } catch (SAXException ex) {
-                Utils.close(stream);
                 Main.error(ex);
                 continue;

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -155 +155 @@
         topLevelSubGrid = createSubGridTree(subGrid);
         lastSubGrid = topLevelSubGrid[0];
-
-        Utils.close(in);
     }
 

trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java

@@ -45 +45 @@
             throw new MissingHelpContentException(helpTopicUrl);
         HttpURLConnection con = null;
-        BufferedReader in = null;
         try {
             URL u = new URL(helpTopicUrl);
             con = Utils.openHttpConnection(u);
             con.connect();
-            in = new BufferedReader(new InputStreamReader(con.getInputStream(), Utils.UTF_8));
-            return prepareHelpContent(in, dotest, u);
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), Utils.UTF_8))) {
+                return prepareHelpContent(in, dotest, u);
+            }
         } catch(MalformedURLException e) {
             throw new HelpContentReaderException(e);
@@ -64 +64 @@
             }
             throw ex;
-        } finally {
-            Utils.close(in);
         }
     }

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -7 +7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -197 +198 @@
 
     protected String extractToken(HttpURLConnection connection) {
-        BufferedReader r = null;
-        try {
-            r = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
+        try (
+            InputStream is = connection.getInputStream();
+            BufferedReader r = new BufferedReader(new InputStreamReader(is, Utils.UTF_8))
+        ) {
             String c;
             Pattern p = Pattern.compile(".*authenticity_token.*value=\"([^\"]+)\".*");
@@ -211 +213 @@
             Main.error(e);
             return null;
-        } finally {
-            Utils.close(r);
         }
         return null;
@@ -364 +364 @@
 
     protected void authenticateOsmSession(SessionId sessionId, String userName, String password) throws OsmLoginFailedException {
-        DataOutputStream dout = null;
         try {
             URL url = new URL(buildOsmLoginUrl());
@@ -392 +391 @@
             connection.connect();
 
-            dout = new DataOutputStream(connection.getOutputStream());
-            dout.writeBytes(request);
-            dout.flush();
-            Utils.close(dout);
+            try (DataOutputStream dout = new DataOutputStream(connection.getOutputStream())) {
+                dout.writeBytes(request);
+                dout.flush();
+            }
 
             // after a successful login the OSM website sends a redirect to a follow up page. Everything
@@ -409 +408 @@
             throw new OsmLoginFailedException(e);
         } finally {
-            Utils.close(dout);
             synchronized(this) {
                 connection = null;
@@ -456 +454 @@
             parameters.put("allow_read_prefs", "yes");
         }
-        if(privileges.isAllowModifyNotes()) {
+        if (privileges.isAllowModifyNotes()) {
             parameters.put("allow_write_notes", "yes");
         }
@@ -463 +461 @@
 
         String request = buildPostRequest(parameters);
-        DataOutputStream dout = null;
         try {
             URL url = new URL(oauthProviderParameters.getAuthoriseUrl());
@@ -480 +477 @@
             connection.connect();
 
-            dout = new DataOutputStream(connection.getOutputStream());
-            dout.writeBytes(request);
-            dout.flush();
+            try (DataOutputStream dout = new DataOutputStream(connection.getOutputStream())) {
+                dout.writeBytes(request);
+                dout.flush();
+            }
 
             int retCode = connection.getResponseCode();
             if (retCode != HttpURLConnection.HTTP_OK)
                 throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request  ''{0}''", requestToken.getKey()));
-        } catch(IOException e) {
-            throw new OsmOAuthAuthorizationException(e);
-        } finally {
-            Utils.close(dout);
+        } catch (IOException e) {
+            throw new OsmOAuthAuthorizationException(e);
+        } finally {
             synchronized(this) {
                 connection = null;

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -165 +165 @@
     @Override
     protected void realRun() throws SAXException, IOException, OsmTransferException {
-        BufferedReader bin = null;
         try {
             try {
@@ -195 +194 @@
             }
             StringBuilder changesets = new StringBuilder();
-            bin = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
-            String line;
-            while ((line = bin.readLine()) != null) {
-                changesets.append(line).append("\n");
+            try (BufferedReader bin = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8))) {
+                String line;
+                while ((line = bin.readLine()) != null) {
+                    changesets.append(line).append("\n");
+                }
             }
             if (! (changesets.toString().contains("<osm") && changesets.toString().contains("</osm>"))) {
@@ -215 +215 @@
             alertConnectionFailed();
             return;
-        } finally {
-            Utils.close(bin);
         }
     }

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -36 +36 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Utils;
 
 public class GpxExporter extends FileExporter implements GpxConstants {
@@ -176 +175 @@
         }
 
-        OutputStream fo = null;
-        try {
-            fo = Compression.getCompressedFileOutputStream(file);
+        
+        try (OutputStream fo = Compression.getCompressedFileOutputStream(file)) {
             new GpxWriter(fo).write(gpxData);
             fo.flush();
@@ -185 +183 @@
             JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn, x.getMessage()),
                     tr("Error"), JOptionPane.ERROR_MESSAGE);
-        } finally {
-            Utils.close(fo);
         }
     }

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -174 +174 @@
         Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
 
-        BufferedReader rd = null;
-        try {
-            rd = new BufferedReader(new InputStreamReader(source, Utils.UTF_8));
-
+        try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, Utils.UTF_8))) {
             StringBuilder sb = new StringBuilder(1024);
             int loopstart_char = rd.read();
@@ -209 +206 @@
         } catch (Exception e) {
             Main.warn(e);
-        } finally {
-            Utils.close(rd);
-        }
-    }
+        }
+    }
+
     private static class NMEAParserState {
         protected Collection<WayPoint> waypoints = new ArrayList<>();

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -629 +629 @@
                     activeConnection.setDoOutput(true);
                     activeConnection.setRequestProperty("Content-type", "text/xml");
-                    OutputStream out = activeConnection.getOutputStream();
-
-                    // It seems that certain bits of the Ruby API are very unhappy upon
-                    // receipt of a PUT/POST message without a Content-length header,
-                    // even if the request has no payload.
-                    // Since Java will not generate a Content-length header unless
-                    // we use the output stream, we create an output stream for PUT/POST
-                    // even if there is no payload.
-                    if (requestBody != null) {
-                        try (BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out, Utils.UTF_8))) {
-                            bwr.write(requestBody);
-                            bwr.flush();
+                    try (OutputStream out = activeConnection.getOutputStream()) {
+                        // It seems that certain bits of the Ruby API are very unhappy upon
+                        // receipt of a PUT/POST message without a Content-length header,
+                        // even if the request has no payload.
+                        // Since Java will not generate a Content-length header unless
+                        // we use the output stream, we create an output stream for PUT/POST
+                        // even if there is no payload.
+                        if (requestBody != null) {
+                            try (BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out, Utils.UTF_8))) {
+                                bwr.write(requestBody);
+                                bwr.flush();
+                            }
                         }
                     }
-                    Utils.close(out);
                 }
 

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -62 +62 @@
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        InputStream in = null;
-        try {
-            in = Compression.getUncompressedFileInputStream(file);
+        try (InputStream in = Compression.getUncompressedFileInputStream(file)) {
             importData(in, file, progressMonitor);
         } catch (FileNotFoundException e) {
             Main.error(e);
             throw new IOException(tr("File ''{0}'' does not exist.", file.getName()), e);
-        } finally {
-            Utils.close(in);
         }
     }

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -29 +29 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -60 +59 @@
                         Main.error(tr("Unable to find JOSM keystore at {0}. Remote control will not be available on HTTPS.", KEYSTORE_PATH));
                     } else {
-                        try {
-                            ks.load(in, password);
-                        } finally {
-                            Utils.close(in);
-                        }
+                        ks.load(in, password);
                         
                         if (Main.isDebugEnabled()) {

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -153 +153 @@
      */
     protected String downloadPluginList(String site, final ProgressMonitor monitor) {
-        BufferedReader in = null;
-
         /* replace %<x> with empty string or x=plugins (separated with comma) */
         String pl = Utils.join(",", Main.pref.getCollection("plugins"));
@@ -174 +172 @@
                 connection.setRequestProperty("Accept-Charset", "utf-8");
             }
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
-            StringBuilder sb = new StringBuilder();
-            String line;
-            while ((line = in.readLine()) != null) {
-                sb.append(line).append("\n");
-            }
-            return sb.toString();
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8))) {
+                StringBuilder sb = new StringBuilder();
+                String line;
+                while ((line = in.readLine()) != null) {
+                    sb.append(line).append("\n");
+                }
+                return sb.toString();
+            }
         } catch (MalformedURLException e) {
             if (canceled) return null;
@@ -197 +196 @@
                 connection = null;
             }
-            Utils.close(in);
             monitor.finishTask();
         }
@@ -206 +204 @@
         try (InputStream errStream = connection.getErrorStream()) {
             if (errStream != null) {
-                BufferedReader err = null;
-                try {
+                try (BufferedReader err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8))) {
                     String line;
-                    err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8));
                     while ((line = err.readLine()) != null) {
                         sb.append(line).append("\n");
@@ -216 +212 @@
                     Main.error(e);
                     Main.error(ex);
-                } finally {
-                    Utils.close(err);
                 }
             }

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;
+        }
     }