Author: jcompagner
Date: Tue Dec 12 02:28:58 2006
New Revision: 486087
URL: http://svn.apache.org/viewvc?view=rev&rev=486087
Log:
streamlined onEvent -> onError/onUpdate
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?view=diff&rev=486087&r1=486086&r2=486087
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
Tue Dec 12 02:28:58 2006
@@ -76,7 +76,7 @@
*
* @return FormComponent
*/
- protected final FormComponent getFormComponent()
+ protected final FormComponent<?> getFormComponent()
{
return (FormComponent)getComponent();
}
@@ -113,8 +113,7 @@
@Override
protected final void onEvent(final AjaxRequestTarget target)
{
- final FormComponent formComponent = getFormComponent();
- boolean callOnUpdate = true;
+ final FormComponent<?> formComponent = getFormComponent();
try
{
@@ -123,35 +122,34 @@
if (formComponent.hasErrorMessage())
{
formComponent.invalid();
+ onError(target, null);
}
else
{
formComponent.valid();
formComponent.updateModel();
+ onUpdate(target);
}
}
catch (RuntimeException e)
{
- callOnUpdate = false;
onError(target, e);
}
-
- if (callOnUpdate)
- {
- onUpdate(target);
- }
}
/**
* Called to handle any error resulting from updating form component.
Errors
* thrown from [EMAIL PROTECTED] #onUpdate(AjaxRequestTarget)} will not
be caught here.
*
+ * The RuntimeException will be null if it was just a validation or
conversion
+ * error of the FormComponent
+ *
* @param target
* @param e
*/
private void onError(AjaxRequestTarget target, RuntimeException e)
{
- throw e;
+ if (e != null) throw e;
}
/**
