Changeset 10234 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-05-17T00:43:47+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - DB_DUPLICATE_SWITCH_CLAUSES + REC_CATCH_EXCEPTION + UC_USELESS_CONDITION + OS_OPEN_STREAM_EXCEPTION_PATH + ICAST_INTEGER_MULTIPLY_CAST_TO_LONG

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (2 diffs)
• UploadSelectionAction.java (modified) (2 diffs)

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

@@ -42 +42 @@
  * @author imi
  */
-public class AboutAction extends JosmAction {
+public final class AboutAction extends JosmAction {
 
     /**
@@ -130 +130 @@
             displayErrorMessage(ta, tr("Failed to locate resource ''{0}''.", filePath));
         } else {
-            try {
-                BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            try (InputStreamReader reader = new InputStreamReader(is, "UTF-8");
+                 BufferedReader br = new BufferedReader(reader)) {
                 String line;
                 while ((line = br.readLine()) != null) {
                     ta.append(line+'\n');
                 }
-                br.close();
             } catch (IOException e) {
                 Main.warn(e);

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

@@ -341 +341 @@
                         // our local dataset includes a deleted parent of a primitive we want
                         // to delete. Include this parent in the collection of uploaded primitives
-                        //
                         if (myDeletedParent != null && myDeletedParent.isDeleted()) {
                             if (!toUpload.contains(myDeletedParent)) {
@@ -352 +351 @@
                     }
                 }
-            } catch (Exception e) {
+            } catch (OsmTransferException e) {
                 if (canceled)
                     // ignore exception