Changeset 7048 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-05-02T02:37:08+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - Throwable and Error classes should not be caught

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• JosmUserIdentityManager.java (modified) (2 diffs)
• preferences/PreferenceTabbedPane.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -64 +64 @@
                 try {
                     instance.initFromOAuth(Main.parent);
-                } catch (Throwable t) {
-                    Main.error(t);
+                } catch (Exception e) {
+                    Main.error(e);
                     // Fall back to preferences if OAuth identification fails for any reason
                     instance.initFromPreferences();
@@ -278 +278 @@
                 try {
                     instance.initFromOAuth(Main.parent);
-                } catch (Throwable t) {
-                    Main.error(t);
+                } catch (Exception e) {
+                    Main.error(e);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -562 +562 @@
                                 } catch (SecurityException ex) {
                                     Main.error(ex);
-                                } catch (Throwable ex) {
+                                } catch (Exception ex) {
                                     BugReportExceptionHandler.handleException(ex);
                                 } finally {
@@ -576 +576 @@
                 } catch (SecurityException ex) {
                     Main.error(ex);
-                } catch (Throwable ex) {
+                } catch (Exception ex) {
                     // allow to change most settings even if e.g. a plugin fails
                     BugReportExceptionHandler.handleException(ex);