From fd60dd5226b6cefb1eb621f8e479ba59bf11b0b7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 10 Dec 2014 13:35:17 +0200 Subject: java: improve use of WrappedTargetException to set cause properly since we introduced the new constructors that pass the cause all the way up to java.lang.Throwable. Also simplify some exeception printing sites, because Throwable will correctly print out child exceptions for us. Change-Id: Ibbecce3c6f971fbc80d6de2052ab4f33a4503c0a --- .../deployment/active/com/sun/star/comp/test/deployment/Dispatch.java | 2 +- .../handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 2 +- .../deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'desktop/test') diff --git a/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java index f50cdeac59a5..e224c94183ee 100644 --- a/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java +++ b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java @@ -77,7 +77,7 @@ public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch } catch (com.sun.star.uno.RuntimeException e) { throw e; } catch (com.sun.star.uno.Exception e) { - throw new WrappedTargetRuntimeException( + throw new WrappedTargetRuntimeException(e, "wrapped: " + e.getMessage(), this, e); } } diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java index f7499ceef5f7..7cd3688176c4 100644 --- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java +++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java @@ -135,7 +135,7 @@ public class OptionsEventHandler { try { return handleExternalEvent(aWindow, aEventObject); } catch (com.sun.star.uno.Exception e) { - throw new WrappedTargetException(sMethod, this, e); + throw new WrappedTargetException(e, sMethod, this, e); } } diff --git a/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java index 701fb3172e8a..74882bca55c4 100644 --- a/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java +++ b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java @@ -77,7 +77,7 @@ public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch } catch (com.sun.star.uno.RuntimeException e) { throw e; } catch (com.sun.star.uno.Exception e) { - throw new WrappedTargetRuntimeException( + throw new WrappedTargetRuntimeException(e, "wrapped: " + e.getMessage(), this, e); } } -- cgit