Changeset 7004 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

Timestamp:

2014-04-26T15:28:16+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use multi-catch where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -26 +26 @@
 import oauth.signpost.OAuthProvider;
 import oauth.signpost.basic.DefaultOAuthProvider;
-import oauth.signpost.exception.OAuthCommunicationException;
 import oauth.signpost.exception.OAuthException;
 
@@ -110 +109 @@
                     con.disconnect();
                 }
-            } catch (NoSuchFieldException e) {
-                Main.error(e);
-                Main.warn(tr("Failed to cancel running OAuth operation"));
-            } catch (SecurityException e) {
-                Main.error(e);
-                Main.warn(tr("Failed to cancel running OAuth operation"));
-            } catch (IllegalAccessException e) {
+            } catch (NoSuchFieldException | SecurityException | IllegalAccessException e) {
                 Main.error(e);
                 Main.warn(tr("Failed to cancel running OAuth operation"));
@@ -146 +139 @@
             provider.retrieveRequestToken(consumer, "");
             return OAuthToken.createToken(consumer);
-        } catch(OAuthCommunicationException e){
-            if (canceled)
-                throw new OsmTransferCanceledException(e);
-            throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
@@ -180 +169 @@
             provider.retrieveAccessToken(consumer, null);
             return OAuthToken.createToken(consumer);
-        } catch(OAuthCommunicationException e){
-            if (canceled)
-                throw new OsmTransferCanceledException(e);
-            throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
@@ -441 +426 @@
             connection.setDoOutput(false);
             connection.connect();
-        } catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorizationException(e);
         } catch(IOException e) {
             throw new OsmOAuthAuthorizationException(e);
@@ -504 +487 @@
             if (retCode != HttpURLConnection.HTTP_OK)
                 throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request  ''{0}''", requestToken.getKey()));
-        } catch(MalformedURLException e) {
-            throw new OsmOAuthAuthorizationException(e);
         } catch(IOException e) {
             throw new OsmOAuthAuthorizationException(e);