Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-09-14 03:14:32 +0000
committerKarsten Thoms2019-09-16 12:53:50 +0000
commitd5ba39c525e4b9b989678d78dd7d9488692fea43 (patch)
treeaa1c3ed6e0d2fe2ead55051b805d0e582ca44512 /bundles/org.eclipse.test.performance/src/org/eclipse/test
parentb200811345f8351f77db5e22cc67a0a5bae19f31 (diff)
downloadeclipse.platform.releng-d5ba39c525e4b9b989678d78dd7d9488692fea43.tar.gz
eclipse.platform.releng-d5ba39c525e4b9b989678d78dd7d9488692fea43.tar.xz
eclipse.platform.releng-d5ba39c525e4b9b989678d78dd7d9488692fea43.zip
Bug 551070 - Use multicatch blocks if possibleI20190916-1800
Bump bundle version for 4.14 Change-Id: Ia6354278bdcbfc9da3da0696d502792c31873329 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com> Also-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'bundles/org.eclipse.test.performance/src/org/eclipse/test')
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/OrderedTestSuite.java4
-rw-r--r--bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java10
2 files changed, 3 insertions, 11 deletions
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/OrderedTestSuite.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/OrderedTestSuite.java
index 711a2ee2..4a3b97b9 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/OrderedTestSuite.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/OrderedTestSuite.java
@@ -131,9 +131,7 @@ public class OrderedTestSuite extends TestSuite {
throw new SortingException("suite failed to detect test order: " + o1 + ", " + o2); //$NON-NLS-1$ //$NON-NLS-2$
}
});
- } catch (SortingException e) {
- addTest(error(testClass, "suite failed to detect test order", e)); //$NON-NLS-1$
- } catch (IOException e) {
+ } catch (SortingException | IOException e) {
addTest(error(testClass, "suite failed to detect test order", e)); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
index fe7cba06..ee7906dc 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/AwtScreenshot.java
@@ -45,11 +45,7 @@ public class AwtScreenshot {
ImageIO.write(image, "png", file);
System.out.println("AWT screenshot saved to: " + file.getAbsolutePath());
- } catch (HeadlessException e) {
- e.printStackTrace();
- } catch (AWTException e) {
- e.printStackTrace();
- } catch (IOException e) {
+ } catch (HeadlessException | AWTException | IOException e) {
e.printStackTrace();
}
}
@@ -123,9 +119,7 @@ public class AwtScreenshot {
process.destroy();
System.out.println("Killed AwtScreenshot VM after " + TIMEOUT_SECONDS + " seconds.");
}
- } catch (URISyntaxException e) {
- e.printStackTrace();
- } catch (IOException e) {
+ } catch (URISyntaxException | IOException e) {
e.printStackTrace();
}
}

Back to the top