Changeset 30738 in osm for applications/editors/josm/plugins/walkingpapers

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java (modified) (3 diffs)

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java

@@ -25 +25 @@
     }
 
-    public void actionPerformed(ActionEvent e) {
+    @Override
+        public void actionPerformed(ActionEvent e) {
         String wpid = JOptionPane.showInputDialog(Main.parent,
             tr("Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"),
@@ -51 +52 @@
         String tile = null;
 
-        try {
-            BufferedReader r = new BufferedReader(new InputStreamReader(new URL(wpUrl).openStream(), "utf-8"));
+        try (BufferedReader r = new BufferedReader(new InputStreamReader(new URL(wpUrl).openStream(), "utf-8"))) {
             for (String line = r.readLine(); line != null; line = r.readLine()) {
                 m = spanPattern.matcher(line);
@@ -65 +65 @@
                 }
             }
-            r.close();
-            if ((tile == null) || (north == 0 && south == 0) || (east == 0 && west == 0)) throw new Exception();
+            if ((tile == null) || (north == 0 && south == 0) || (east == 0 && west == 0)) {
+                throw new IllegalStateException();
+            }
         } catch (Exception ex) {
             JOptionPane.showMessageDialog(Main.parent,tr("Could not read information from walking-papers.org the id \"{0}\"", mungedWpId));