You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/20 22:46:04 UTC
svn commit: r966000 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval:
interceptor/ startup/
Author: gpetracek
Date: Tue Jul 20 20:46:03 2010
New Revision: 966000
URL: http://svn.apache.org/viewvc?rev=966000&view=rev
Log:
EXTVAL-80 removed workaround
Added:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ExtValBeanValidator.java
- copied, changed from r938185, myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidatorWrapper.java
Removed:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidatorWrapper.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ResetBeanValidationRendererInterceptor.java
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationTagAwareValidationInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/JSF2AwareBeanValidationStartupListener.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationTagAwareValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationTagAwareValidationInterceptor.java?rev=966000&r1=965999&r2=966000&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationTagAwareValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidationTagAwareValidationInterceptor.java Tue Jul 20 20:46:03 2010
@@ -85,8 +85,7 @@ public class BeanValidationTagAwareValid
for (Validator validator : validators)
{
- //don't check with instanceof
- if (validator.getClass().getName().equals(BeanValidator.class.getName()))
+ if(validator instanceof BeanValidator)
{
if(((BeanValidator) validator).getValidationGroups() != null)
{
@@ -94,20 +93,25 @@ public class BeanValidationTagAwareValid
Arrays.asList(((BeanValidator) validator).getValidationGroups().split(",")));
}
- //prevent double-validation
- editableValueHolder.removeValidator(validator);
- editableValueHolder.addValidator(new BeanValidatorWrapper((BeanValidator)validator));
+ if (validator.getClass().getName().equals(BeanValidator.class.getName()))
+ {
+ //prevent double-validation
+ editableValueHolder.removeValidator(validator);
+ editableValueHolder.addValidator(
+ new ExtValBeanValidator(((BeanValidator)validator).getValidationGroups()));
+ }
}
}
+ ExtValBeanValidationContext beanValidationContext = ExtValBeanValidationContext.getCurrentInstance();
Class currentClass;
for(String groupClassName : groupsClassNamesOfTagList)
{
- currentClass = ClassUtils.tryToLoadClassForName(groupClassName);
+ currentClass = ClassUtils.tryToLoadClassForName(groupClassName.trim());
if(currentClass != null && currentClass.isInterface())
{
- ExtValBeanValidationContext.getCurrentInstance().addGroup(currentClass, viewId, clientId);
+ beanValidationContext.addGroup(currentClass, viewId, clientId);
}
else
{
Copied: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ExtValBeanValidator.java (from r938185, myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidatorWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ExtValBeanValidator.java?p2=myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ExtValBeanValidator.java&p1=myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidatorWrapper.java&r1=938185&r2=966000&rev=966000&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/BeanValidatorWrapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/interceptor/ExtValBeanValidator.java Tue Jul 20 20:46:03 2010
@@ -32,82 +32,19 @@ import javax.faces.component.UIComponent
* @since 2.x.3
*/
@UsageInformation(UsageCategory.INTERNAL)
-class BeanValidatorWrapper extends BeanValidator
+public class ExtValBeanValidator extends BeanValidator
{
- private BeanValidator wrapped;
-
- BeanValidatorWrapper(BeanValidator wrapped)
- {
- this.wrapped = wrapped;
- }
-
- public BeanValidator getWrappedBeanValidator()
- {
- return this.wrapped;
- }
-
- public void setWrapped(BeanValidator wrapped)
- {
- this.wrapped = wrapped;
- }
-
- public void setValidationGroups(String s)
+ public ExtValBeanValidator()
{
- wrapped.setValidationGroups(s);
}
- public String getValidationGroups()
+ ExtValBeanValidator(String validationGroups)
{
- return wrapped.getValidationGroups();
+ setValidationGroups(validationGroups);
}
public void validate(FacesContext facesContext, UIComponent uiComponent, Object o)
{
//don't validate - the extval bean-validation adapter will do that
}
-
- /*
- public Object saveState(FacesContext facesContext)
- {
- Object result[] = new Object[1];
- result[0] = wrapped.getValidationGroups();
- return result;
- }
-
- public void restoreState(FacesContext facesContext, Object state)
- {
- this.wrapped = new BeanValidator();
-
- if (state != null)
- {
- Object values[] = (Object[]) state;
- this.wrapped.setValidationGroups((String) values[0]);
- }
- }
- */
-
- public void markInitialState()
- {
- wrapped.markInitialState();
- }
-
- public boolean initialStateMarked()
- {
- return wrapped.initialStateMarked();
- }
-
- public void clearInitialState()
- {
- wrapped.clearInitialState();
- }
-
- public boolean isTransient()
- {
- return wrapped.isTransient();
- }
-
- public void setTransient(boolean b)
- {
- wrapped.setTransient(b);
- }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/JSF2AwareBeanValidationStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/JSF2AwareBeanValidationStartupListener.java?rev=966000&r1=965999&r2=966000&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/JSF2AwareBeanValidationStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/JSF2AwareBeanValidationStartupListener.java Tue Jul 20 20:46:03 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
-import org.apache.myfaces.extensions.validator.beanval.interceptor.ResetBeanValidationRendererInterceptor;
import org.apache.myfaces.extensions.validator.beanval.interceptor.BeanValidationTagAwareValidationInterceptor;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
@@ -39,7 +38,6 @@ public class JSF2AwareBeanValidationStar
protected void init()
{
- ExtValContext.getContext().registerRendererInterceptor(new ResetBeanValidationRendererInterceptor());
ExtValContext.getContext().addPropertyValidationInterceptor(new BeanValidationTagAwareValidationInterceptor());
}
}
\ No newline at end of file