Changeset 30436 in osm for applications/editors/josm/plugins/mirrored_download

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] see #josm8465 - Java 7 code update

File:

• applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java ¶

@@ -26 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.MirroredInputStream;
-import org.openstreetmap.josm.tools.Utils;
 
 public class UrlSelectionDialog
@@ -106 +105 @@
     String src = Main.pref.get("plugin.mirrored_download.url-src", "https://josm.openstreetmap.de/mirrored_download_info");
     Collection<String> urls = new ArrayList<String>();
-    InputStream in = null;
-    try {
-      in = new MirroredInputStream(src, 24*60*60);
-      BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+    try (
+      InputStream in = new MirroredInputStream(src, 24*60*60);
+      BufferedReader reader = new BufferedReader(new InputStreamReader(in))
+    ) {
       String line = null;
       while ((line = reader.readLine()) != null) {
@@ -117 +116 @@
         }
       }
-      Utils.close(reader);
     } catch (IOException e) {
-      e.printStackTrace();
-    } finally {
-      Utils.close(in);
+      Main.error(e);
     }
     for (String url : Main.pref.getCollection("plugin.mirrored_download.custom-urls")) {
@@ -136 +132 @@
           cbSelectUrl.getSelectedItem().toString());
     }
-
   }