Changeset 30436 in osm for applications/editors/josm/plugins/piclayer/src/org

Timestamp:

2014-05-09T05:21:14+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] see #josm8465 - Java 7 code update

Location:

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer

Files:

• PicLayerAbstract.java (modified) (3 diffs)
• PicLayerFromFile.java (modified) (3 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -56 +56 @@
 import org.openstreetmap.josm.plugins.piclayer.actions.SavePictureCalibrationAction;
 import org.openstreetmap.josm.plugins.piclayer.transform.PictureTransform;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -457 +456 @@
 
     public void loadWorldfile(InputStream is) throws IOException {
-        BufferedReader br = null;
-        try {
+        
+        try (
             Reader reader = new InputStreamReader(is);
-            br = new BufferedReader(reader);
+            BufferedReader br = new BufferedReader(reader)
+        ) {
             double e[] = new double[6];
             for (int i=0; i<6; ++i) {
@@ -488 +488 @@
             initialImageScale = 1;
             Main.map.mapView.repaint();
-        } finally {
-            Utils.close(br);
         }
     }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java

@@ -23 +23 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.Main;
-
 import java.awt.Image;
 import java.io.File;
@@ -38 +36 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.Main;
 /**
  * Layer displaying a picture loaded from a file.
@@ -96 +94 @@
                 if (imgEntry != null) {
                     imgNameInZip = imgEntry.getName();
-                    InputStream is = null;
-                    try {
-                        is = zipFile.getInputStream(imgEntry);
-                        image = ImageIO.read(is);
-                        return image;
-                    } finally {
-                        Utils.close(is);
+                    try (InputStream is = zipFile.getInputStream(imgEntry)) {
+                        return ImageIO.read(is);
                     }
                 }