You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2011/05/28 21:55:37 UTC

svn commit: r1128766 - in /incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval: DynamicBeanValidationModuleValidationInterceptor.java DynamicValidatorFactoryProxy.java

Author: mbenson
Date: Sat May 28 19:55:37 2011
New Revision: 1128766

URL: http://svn.apache.org/viewvc?rev=1128766&view=rev
Log:
'localized' is a loaded word; use another

Modified:
    incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicBeanValidationModuleValidationInterceptor.java
    incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicValidatorFactoryProxy.java

Modified: incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicBeanValidationModuleValidationInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicBeanValidationModuleValidationInterceptor.java?rev=1128766&r1=1128765&r2=1128766&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicBeanValidationModuleValidationInterceptor.java (original)
+++ incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicBeanValidationModuleValidationInterceptor.java Sat May 28 19:55:37 2011
@@ -19,8 +19,8 @@ package org.apache.bval.jsr303.dynamic.e
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.bval.jsr303.dynamic.extval.DynamicValidatorFactoryProxy.LocalizedFunction;
-import org.apache.bval.jsr303.dynamic.extval.DynamicValidatorFactoryProxy.LocalizedProcedure;
+import org.apache.bval.jsr303.dynamic.extval.DynamicValidatorFactoryProxy.NestedValidationFunction;
+import org.apache.bval.jsr303.dynamic.extval.DynamicValidatorFactoryProxy.NestedValidationProcedure;
 import org.apache.myfaces.extensions.validator.beanval.BeanValidationModuleValidationInterceptor;
 import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
 import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
@@ -39,7 +39,7 @@ public class DynamicBeanValidationModule
     @Override
     protected void initComponentWithPropertyDetails(final FacesContext facesContext, final UIComponent uiComponent,
         final PropertyDetails propertyDetails) {
-        DynamicValidatorFactoryProxy.performLocalized(facesContext, propertyDetails, new LocalizedProcedure() {
+        DynamicValidatorFactoryProxy.performNested(facesContext, propertyDetails, new NestedValidationProcedure() {
 
             @Override
             public void run() {
@@ -55,9 +55,9 @@ public class DynamicBeanValidationModule
      */
     @Override
     protected boolean hasBeanValidationConstraints(final PropertyInformation propertyInformation) {
-        return DynamicValidatorFactoryProxy.performLocalized(FacesContext.getCurrentInstance(),
+        return DynamicValidatorFactoryProxy.performNested(FacesContext.getCurrentInstance(),
             propertyInformation.getInformation(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class),
-            new LocalizedFunction<Boolean>() {
+            new NestedValidationFunction<Boolean>() {
 
                 public Boolean get() {
                     return DynamicBeanValidationModuleValidationInterceptor.super
@@ -72,9 +72,9 @@ public class DynamicBeanValidationModule
     @Override
     protected void processFieldValidation(final FacesContext facesContext, final UIComponent uiComponent,
         final Object convertedObject, final PropertyInformation propertyInformation) {
-        DynamicValidatorFactoryProxy.performLocalized(facesContext,
+        DynamicValidatorFactoryProxy.performNested(facesContext,
             propertyInformation.getInformation(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class),
-            new LocalizedProcedure() {
+            new NestedValidationProcedure() {
 
                 @Override
                 public void run() {

Modified: incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicValidatorFactoryProxy.java
URL: http://svn.apache.org/viewvc/incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicValidatorFactoryProxy.java?rev=1128766&r1=1128765&r2=1128766&view=diff
==============================================================================
--- incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicValidatorFactoryProxy.java (original)
+++ incubator/bval/sandbox/lang3-work/bval-jsr303-dynamic/extval-shared/src/main/java/org/apache/bval/jsr303/dynamic/extval/DynamicValidatorFactoryProxy.java Sat May 28 19:55:37 2011
@@ -47,14 +47,14 @@ public class DynamicValidatorFactoryProx
     /**
      * Internal function interface.
      */
-    interface LocalizedFunction<T> {
+    interface NestedValidationFunction<T> {
         T get();
     }
 
     /**
-     * LocalizedFunction with irrelevant return value.
+     * NestedValidationFunction with irrelevant return value.
      */
-    static abstract class LocalizedProcedure implements LocalizedFunction<Object> {
+    static abstract class NestedValidationProcedure implements NestedValidationFunction<Object> {
         public final Object get() {
             run();
             return null;
@@ -165,7 +165,7 @@ public class DynamicValidatorFactoryProx
     }
 
     /**
-     * Perform a localized operation in context.
+     * Perform an operation in context of a nested validation.
      * 
      * @param <T>
      * @param facesContext
@@ -173,8 +173,8 @@ public class DynamicValidatorFactoryProx
      * @param operation
      * @return operation result
      */
-    static <T> T performLocalized(FacesContext facesContext, PropertyDetails propertyDetails,
-        LocalizedFunction<T> operation) {
+    static <T> T performNested(FacesContext facesContext, PropertyDetails propertyDetails,
+        NestedValidationFunction<T> operation) {
         Path path = null;
         try {
             if (propertyDetails instanceof PathBasedPropertyDetails) {