You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2016/12/19 22:43:16 UTC
[10/14] opennlp git commit: Collapse duplicate catch blocks into
multi-catch
Collapse duplicate catch blocks into multi-catch
See issue OPENNLP-871
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/1550dac1
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/1550dac1
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/1550dac1
Branch: refs/heads/trunk
Commit: 1550dac129b2db957db09de0456e3c579119a741
Parents: 6871d11
Author: J�rn Kottmann <jo...@apache.org>
Authored: Wed Nov 2 20:18:18 2016 +0100
Committer: J�rn Kottmann <jo...@apache.org>
Committed: Mon Dec 19 23:37:33 2016 +0100
----------------------------------------------------------------------
.../formats/frenchtreebank/ConstitParseSampleStream.java | 4 +---
.../main/java/opennlp/tools/util/ext/ExtensionLoader.java | 8 ++------
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/1550dac1/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStream.java
index 00dfbfb..e908cb1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStream.java
@@ -44,9 +44,7 @@ public class ConstitParseSampleStream extends FilterObjectStream<byte[], Parse>
SAXParserFactory factory = SAXParserFactory.newInstance();
try {
saxParser = factory.newSAXParser();
- } catch (ParserConfigurationException e) {
- throw new IllegalStateException(e);
- } catch (SAXException e) {
+ } catch (ParserConfigurationException | SAXException e) {
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/1550dac1/opennlp-tools/src/main/java/opennlp/tools/util/ext/ExtensionLoader.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/ext/ExtensionLoader.java b/opennlp-tools/src/main/java/opennlp/tools/util/ext/ExtensionLoader.java
index 93a520b..b33d577 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/ext/ExtensionLoader.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/ext/ExtensionLoader.java
@@ -75,17 +75,13 @@ public class ExtensionLoader {
Field instanceField;
try {
instanceField = extClazz.getDeclaredField("INSTANCE");
- } catch (NoSuchFieldException e1) {
- throw new ExtensionNotLoadedException(e1);
- } catch (SecurityException e1) {
+ } catch (NoSuchFieldException | SecurityException e1) {
throw new ExtensionNotLoadedException(e1);
}
if(instanceField != null) {
try {
return (T) instanceField.get(null);
- } catch (IllegalArgumentException e1) {
- throw new ExtensionNotLoadedException(e1);
- } catch (IllegalAccessException e1) {
+ } catch (IllegalArgumentException | IllegalAccessException e1) {
throw new ExtensionNotLoadedException(e1);
}
}