Changeset 30738 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java

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/cadastre-fr/src/cadastre_fr/CadastreGrabber.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java

@@ -22 +22 @@
     private CadastreInterface wmsInterface = new CadastreInterface();
 
-    public GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException, OsmTransferException {
-
+    public GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax)
+            throws IOException, OsmTransferException {
         try {
             URL url = null;
@@ -88 +88 @@
         wmsInterface.urlConn.setRequestMethod("GET");
         wmsInterface.setCookie();
-        InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE);
-        BufferedImage img = ImageIO.read(is);
-        is.close();
-        return img;
+        try (InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE)) {
+            return ImageIO.read(is);
+        }
     }
 
@@ -97 +96 @@
         return wmsInterface;
     }
-
 }