You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/06/12 20:49:53 UTC
git commit: WICKET-5230 use #isValid() instead of #hasErrorMessage()
as the FormComponent does too
Updated Branches:
refs/heads/wicket-1.5.x 285e7830b -> 13362d053
WICKET-5230 use #isValid() instead of #hasErrorMessage() as the FormComponent does too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/13362d05
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/13362d05
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/13362d05
Branch: refs/heads/wicket-1.5.x
Commit: 13362d053896a511f3fe6071e21d1df50bfc5075
Parents: 285e783
Author: svenmeier <sv...@meiers.net>
Authored: Wed Jun 12 20:44:46 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Wed Jun 12 20:49:33 2013 +0200
----------------------------------------------------------------------
.../form/AjaxFormChoiceComponentUpdatingBehavior.java | 14 +++++++-------
.../ajax/form/AjaxFormComponentUpdatingBehavior.java | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/13362d05/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
index 2abec2c..d69ef82 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
@@ -163,18 +163,18 @@ public abstract class AjaxFormChoiceComponentUpdatingBehavior extends AbstractDe
{
formComponent.inputChanged();
formComponent.validate();
- if (formComponent.hasErrorMessage())
- {
- formComponent.invalid();
-
- onError(target, null);
- }
- else
+ if (formComponent.isValid())
{
formComponent.valid();
formComponent.updateModel();
onUpdate(target);
}
+ else
+ {
+ formComponent.invalid();
+
+ onError(target, null);
+ }
}
catch (RuntimeException e)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/13362d05/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
index 0b521fe..868f54d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
@@ -140,13 +140,7 @@ public abstract class AjaxFormComponentUpdatingBehavior extends AjaxEventBehavio
{
formComponent.inputChanged();
formComponent.validate();
- if (formComponent.hasErrorMessage())
- {
- formComponent.invalid();
-
- onError(target, null);
- }
- else
+ if (formComponent.isValid())
{
formComponent.valid();
if (getUpdateModel())
@@ -156,6 +150,12 @@ public abstract class AjaxFormComponentUpdatingBehavior extends AjaxEventBehavio
onUpdate(target);
}
+ else
+ {
+ formComponent.invalid();
+
+ onError(target, null);
+ }
}
catch (RuntimeException e)
{