Changeset 10212 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

Timestamp:

2016-05-15T00:51:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

@@ -160 +160 @@
                                 + "</html>",
                         tr("More notes to download"), JOptionPane.INFORMATION_MESSAGE);
-            } catch (Exception e) {
+            } catch (OsmTransferException e) {
                 if (isCanceled())
                     return;
-                if (e instanceof OsmTransferException) {
-                    rememberException(e);
-                } else {
-                    rememberException(new OsmTransferException(e));
-                }
+                rememberException(e);
             }
         }
@@ -186 +182 @@
             try {
                 notesData = reader.parseRawNotes(subMonitor);
-            } catch (Exception e) {
+            } catch (OsmTransferException e) {
                 if (isCanceled())
                     return;
-                if (e instanceof OsmTransferException) {
-                    rememberException(e);
-                } else {
-                    rememberException(new OsmTransferException(e));
-                }
+                rememberException(e);
             }
         }
@@ -212 +204 @@
             try {
                 notesData = reader.parseRawNotesBzip2(subMonitor);
-            } catch (Exception e) {
+            } catch (OsmTransferException e) {
                 if (isCanceled())
                     return;
-                if (e instanceof OsmTransferException) {
-                    rememberException(e);
-                } else {
-                    rememberException(new OsmTransferException(e));
-                }
+                rememberException(e);
             }
         }