Repository: wicket Updated Branches: refs/heads/master f82fd1c39 -> 3e6c0a819
WICKET-6137 always just call #onRequest() instead of individual interface methods Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7dcdae5d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7dcdae5d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7dcdae5d Branch: refs/heads/master Commit: 7dcdae5dd95684b7554b24a0e19c1d400a729c84 Parents: f82fd1c Author: Sven Meier <[email protected]> Authored: Sat Mar 19 09:47:35 2016 +0100 Committer: Sven Meier <[email protected]> Committed: Mon Apr 25 11:44:16 2016 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/IRequestListener.java | 5 ++ .../org/apache/wicket/IResourceListener.java | 5 -- .../apache/wicket/RequestListenerInterface.java | 74 ++------------------ .../wicket/behavior/IBehaviorListener.java | 4 -- .../logger/ListenerInterfaceLogData.java | 12 ---- .../wicket/markup/html/form/CheckBox.java | 2 +- .../wicket/markup/html/form/CheckGroup.java | 2 +- .../wicket/markup/html/form/DropDownChoice.java | 2 +- .../apache/wicket/markup/html/form/Form.java | 2 +- .../markup/html/form/IFormSubmitListener.java | 4 -- .../markup/html/form/IOnChangeListener.java | 5 -- .../wicket/markup/html/form/ImageButton.java | 2 +- .../wicket/markup/html/form/RadioChoice.java | 2 +- .../wicket/markup/html/form/RadioGroup.java | 2 +- .../apache/wicket/markup/html/image/Image.java | 2 +- .../wicket/markup/html/link/ILinkListener.java | 5 -- .../wicket/markup/html/link/InlineFrame.java | 2 +- .../apache/wicket/markup/html/link/Link.java | 2 +- .../wicket/markup/html/link/ResourceLink.java | 5 +- .../test/java/org/apache/wicket/RemoveTest.java | 2 +- .../html/form/upload/FileUploadErrorTest.java | 3 +- 21 files changed, 25 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java index 84a5d12..350717f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java @@ -33,4 +33,9 @@ import org.apache.wicket.util.io.IClusterable; */ public interface IRequestListener extends IClusterable { + + /** + * Called when a request to a behavior is received. + */ + void onRequest(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java b/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java index 1ecb543..983594c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java @@ -36,9 +36,4 @@ public interface IResourceListener extends IRequestListener /** Resource listener interface object */ RequestListenerInterface INTERFACE = new RequestListenerInterface( IResourceListener.class).setIncludeRenderCount(false).setRenderPageAfterInvocation(false); - - /** - * Called when a resource is requested. - */ - void onResourceRequested(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java index abe6dbe..64c26f0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java +++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java @@ -59,9 +59,6 @@ public class RequestListenerInterface return interfaces.get(interfaceName); } - /** The listener interface method */ - private Method method; - /** The name of this listener interface */ private final String name; @@ -97,29 +94,6 @@ public class RequestListenerInterface " must extend IRequestListener"); } - // Get interface methods - final Method[] methods = listenerInterfaceClass.getMethods(); - - // If there is only one method - if (methods.length == 1) - { - // and that method takes no parameters - if (methods[0].getParameterTypes().length == 0) - { - method = methods[0]; - } - else - { - throw new IllegalArgumentException("Method " + methods[0] + " in interface " + - listenerInterfaceClass + " cannot take any arguments"); - } - } - else - { - throw new IllegalArgumentException("Interface " + listenerInterfaceClass + - " can have only one method"); - } - // Save short class name name = Classes.simpleName(listenerInterfaceClass); @@ -175,14 +149,6 @@ public class RequestListenerInterface } /** - * @return The method for this request listener interface - */ - public final Method getMethod() - { - return method; - } - - /** * @return The name of this request listener interface */ public final String getName() @@ -204,7 +170,7 @@ public class RequestListenerInterface // we are in Wicket core land final Component component = (Component)rcomponent; - if (!component.canCallListenerInterface(method)) + if (!component.canCallListenerInterface(null)) { // just return so that we have a silent fail and just re-render the // page @@ -230,7 +196,7 @@ public class RequestListenerInterface // we are in Wicket core land final Component component = (Component)rcomponent; - if (!behavior.canCallListenerInterface(component, method)) + if (!behavior.canCallListenerInterface(component, null)) { log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior, component); @@ -253,28 +219,7 @@ public class RequestListenerInterface page.internalInitialize(); } - try - { - method.invoke(target); - } - catch (InvocationTargetException e) - { - if (e.getTargetException() instanceof ReplaceHandlerException || - e.getTargetException() instanceof AuthorizationException || - e.getTargetException() instanceof WicketRuntimeException) - { - throw (RuntimeException)e.getTargetException(); - } - throw new WicketRuntimeException("Method " + method.getName() + " of " + - method.getDeclaringClass() + " targeted at " + target + " on component " + - component + " threw an exception", e); - } - catch (Exception e) - { - throw new WicketRuntimeException("Method " + method.getName() + " of " + - method.getDeclaringClass() + " targeted at " + target + " on component " + - component + " threw an exception", e); - } + ((IRequestListener)target).onRequest(); } /** @@ -292,7 +237,7 @@ public class RequestListenerInterface @Override public String toString() { - return "[RequestListenerInterface name=" + name + ", method=" + method + "]"; + return "[RequestListenerInterface name=" + name + "]"; } @@ -313,16 +258,7 @@ public class RequestListenerInterface // Check that a different interface method with the same name has not // already been registered final RequestListenerInterface existingInterface = RequestListenerInterface.forName(requestListenerInterface.getName()); - if (existingInterface != null) - { - if (existingInterface.getMethod().equals(requestListenerInterface.getMethod()) == false) - { - throw new IllegalStateException("Cannot register listener interface " + - requestListenerInterface + - " because it conflicts with the already registered interface " + existingInterface); - } - } - else + if (existingInterface == null) { // Save this interface method by the non-qualified class name interfaces.put(requestListenerInterface.getName(), requestListenerInterface); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java b/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java index 3375e81..8b029d0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java @@ -33,8 +33,4 @@ public interface IBehaviorListener extends IRequestListener RequestListenerInterface INTERFACE = new RequestListenerInterface( IBehaviorListener.class); - /** - * Called when a request to a behavior is received. - */ - void onRequest(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java index 8e73163..4a5ad40 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java @@ -39,7 +39,6 @@ public class ListenerInterfaceLogData extends PageLogData private final Integer behaviorIndex; private Class<? extends Behavior> behaviorClass; private final String interfaceName; - private final String interfaceMethod; private Class<? extends IRequestableComponent> submittingComponentClass; private String submittingComponentPath; @@ -75,7 +74,6 @@ public class ListenerInterfaceLogData extends PageLogData behaviorClass = null; } interfaceName = listenerInterface.getName(); - interfaceMethod = listenerInterface.getMethod().getName(); if (listenerInterface.getListenerInterfaceClass().equals(IFormSubmitListener.class)) { final Component formSubmitter = tryToGetFormSubmittingComponent(pageAndComponentProvider); @@ -176,14 +174,6 @@ public class ListenerInterfaceLogData extends PageLogData } /** - * @return interfaceMethod - */ - public final String getInterfaceMethod() - { - return interfaceMethod; - } - - /** * @return submittingComponentClass */ public Class<? extends IRequestableComponent> getSubmittingComponentClass() @@ -225,8 +215,6 @@ public class ListenerInterfaceLogData extends PageLogData } sb.append(",interfaceName="); sb.append(getInterfaceName()); - sb.append(",interfaceMethod="); - sb.append(getInterfaceMethod()); if (getSubmittingComponentClass() != null) { sb.append(",submittingComponentClass="); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java index 64d298f..180f191 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java @@ -78,7 +78,7 @@ public class CheckBox extends FormComponent<Boolean> implements IOnChangeListene * @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged() */ @Override - public void onSelectionChanged() + public void onRequest() { convertInput(); updateModel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java index d7b6bf5..1e6d804 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java @@ -204,7 +204,7 @@ public class CheckGroup<T> extends FormComponent<Collection<T>> implements IOnCh * Called when a selection changes. */ @Override - public final void onSelectionChanged() + public final void onRequest() { convertInput(); updateModel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java index bab85c5..ca03dfd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java @@ -206,7 +206,7 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements * Called when a selection changes. */ @Override - public final void onSelectionChanged() + public final void onRequest() { convertInput(); updateModel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index fd9279d..efa7137 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -682,7 +682,7 @@ public class Form<T> extends WebMarkupContainer * @see #onFormSubmitted(IFormSubmitter) */ @Override - public final void onFormSubmitted() + public final void onRequest() { // check methods match if (getRequest().getContainerRequest() instanceof HttpServletRequest) http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java index 0564760..3dfff96 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java @@ -30,8 +30,4 @@ public interface IFormSubmitListener extends IRequestListener RequestListenerInterface INTERFACE = new RequestListenerInterface( IFormSubmitListener.class); - /** - * Called when a form is submitted - */ - void onFormSubmitted(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java index ef9673f..964c531 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java @@ -32,9 +32,4 @@ public interface IOnChangeListener extends IRequestListener /** Listener interface */ RequestListenerInterface INTERFACE = new RequestListenerInterface( IOnChangeListener.class); - - /** - * Called when a new option is selected. - */ - void onSelectionChanged(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java index 707f667..978d138 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java @@ -131,7 +131,7 @@ public class ImageButton extends Button implements IResourceListener * @see org.apache.wicket.IResourceListener#onResourceRequested() */ @Override - public void onResourceRequested() + public void onRequest() { localizedImageResource.onResourceRequested(null); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java index a2d3551..e8af55e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java @@ -248,7 +248,7 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IOn * @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged() */ @Override - public void onSelectionChanged() + public void onRequest() { convertInput(); updateModel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java index 38361e2..e4f142e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java @@ -167,7 +167,7 @@ public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener * Called when a selection changes. */ @Override - public final void onSelectionChanged() + public final void onRequest() { convertInput(); updateModel(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java index 19f4f7a..1b9622c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java @@ -214,7 +214,7 @@ public class Image extends WebComponent implements IResourceListener * @see org.apache.wicket.IResourceListener#onResourceRequested() */ @Override - public void onResourceRequested() + public void onRequest() { localizedImageResource.onResourceRequested(null); for (LocalizedImageResource localizedImageResource : localizedImageResources) http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java index 0d2f7a4..c2d37f1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java @@ -29,9 +29,4 @@ public interface ILinkListener extends IRequestListener /** Listener interface */ RequestListenerInterface INTERFACE = new RequestListenerInterface( ILinkListener.class); - - /** - * Called when a link is clicked. - */ - void onLinkClicked(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java index a2e58c7..566bdae 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java @@ -150,7 +150,7 @@ public class InlineFrame extends WebMarkupContainer implements ILinkListener * @see org.apache.wicket.markup.html.link.ILinkListener#onLinkClicked() */ @Override - public final void onLinkClicked() + public final void onRequest() { setResponsePage(pageProvider.getPageInstance()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java index 89eff11..413698c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java @@ -186,7 +186,7 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe * @see ILinkListener */ @Override - public final void onLinkClicked() + public void onRequest() { // Invoke subclass handler onClick(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java index 220bc05..b8bbff4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java @@ -107,13 +107,14 @@ public class ResourceLink<T> extends Link<T> implements IResourceListener * @see org.apache.wicket.IResourceListener#onResourceRequested() */ @Override - public final void onResourceRequested() + public final void onRequest() { Attributes a = new Attributes(RequestCycle.get().getRequest(), RequestCycle.get() .getResponse(), null); resource.respond(a); - onLinkClicked(); + + super.onRequest(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java index 7dda0a2..6ab6364 100644 --- a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java @@ -61,7 +61,7 @@ public class RemoveTest extends WicketTestCase tester.clickLink(PATH); fail("Missing Exception"); } - catch (WicketRuntimeException wre) + catch (IllegalStateException wre) { // do nothing. // This exception was expected. http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java index 61f9f33..a3d47c7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java @@ -125,9 +125,8 @@ public class FileUploadErrorTest extends WicketTestCase formTester.submit(); fail("Value not succesfully submitted."); } - catch (WicketRuntimeException rex) + catch (RuntimeException ex) { - Throwable ex = rex.getCause().getCause(); assertEquals("Special value: " + FileUploadError.THIS_VALUE_SHOULD_THROW_EXCEPTION, ex.getMessage()); }
