From 7ed491cf4d401b380b48d3415d784bf87793a679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Thu, 5 Dec 2024 18:25:56 +0900 Subject: [PATCH] refactor: java 7 migration aid - collapse identical catch --- framework/src/org/apache/cordova/ConfigXmlParser.java | 4 +--- framework/src/org/apache/cordova/CordovaBridge.java | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java index 9d4a768d..00f7afc2 100644 --- a/framework/src/org/apache/cordova/ConfigXmlParser.java +++ b/framework/src/org/apache/cordova/ConfigXmlParser.java @@ -105,9 +105,7 @@ public class ConfigXmlParser { } try { eventType = xml.next(); - } catch (XmlPullParserException e) { - e.printStackTrace(); - } catch (IOException e) { + } catch (XmlPullParserException | IOException e) { e.printStackTrace(); } } diff --git a/framework/src/org/apache/cordova/CordovaBridge.java b/framework/src/org/apache/cordova/CordovaBridge.java index a8e83692..99d260b2 100644 --- a/framework/src/org/apache/cordova/CordovaBridge.java +++ b/framework/src/org/apache/cordova/CordovaBridge.java @@ -136,9 +136,7 @@ public class CordovaBridge { String callbackId = array.getString(3); String r = jsExec(bridgeSecret, service, action, callbackId, message); return r == null ? "" : r; - } catch (JSONException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (JSONException | IllegalAccessException e) { e.printStackTrace(); } return ""; @@ -148,9 +146,7 @@ public class CordovaBridge { try { int bridgeSecret = Integer.parseInt(defaultValue.substring(16)); jsSetNativeToJsBridgeMode(bridgeSecret, Integer.parseInt(message)); - } catch (NumberFormatException e){ - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (NumberFormatException | IllegalAccessException e){ e.printStackTrace(); } return "";