myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r791414 - in /myfaces/extensions/validator/trunk: component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/ core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ co...
Date Mon, 06 Jul 2009 08:51:40 GMT
Author: gpetracek
Date: Mon Jul  6 08:51:40 2009
New Revision: 791414

URL: http://svn.apache.org/viewvc?rev=791414&view=rev
Log:
changed names

Added:
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
      - copied, changed from r788875, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java
Removed:
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java
Modified:
    myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
    myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
    myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
    myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
    myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java

Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
(original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadRendererInterceptor.java
Mon Jul  6 08:51:40 2009
@@ -27,7 +27,7 @@
 import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
 import org.apache.myfaces.extensions.validator.trinidad.util.TrinidadUtils;
@@ -92,7 +92,7 @@
                 {
                     if(!(entry.getValue() instanceof Annotation &&
                             ExtValUtils.getValidationParameterExtractor()
-                                    .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+                                    .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
                                     .iterator().hasNext()))
                     {
                         metaData = metaDataTransformer.convertMetaData(entry);

Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
(original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
Mon Jul  6 08:51:40 2009
@@ -21,7 +21,7 @@
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
 import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
 import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
 import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
@@ -98,7 +98,7 @@
 
                         if(!(entry.getValue() instanceof Annotation &&
                                 ExtValUtils.getValidationParameterExtractor()
-                                        .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+                                        .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
                                         .iterator().hasNext()))
                         {
                             metaData = metaDataTransformer.convertMetaData(entry);

Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
(from r788875, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java&r1=788875&r2=791414&rev=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientValidation.java
(original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DisableClientSideValidation.java
Mon Jul  6 08:51:40 2009
@@ -26,6 +26,6 @@
  * @since 1.x.3
  */
 @UsageInformation(UsageCategory.API)
-public interface DisableClientValidation extends ValidationParameter
+public interface DisableClientSideValidation extends ValidationParameter
 {
 }
\ No newline at end of file

Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
(original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
Mon Jul  6 08:51:40 2009
@@ -40,7 +40,7 @@
  * @since 1.x.1
  */
 @UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
-public abstract class AbstractAnnotationValidationStrategy extends AbstractValidationStrategy
+public abstract class AbstractAnnotationValidationStrategy<A extends Annotation> extends
AbstractValidationStrategy
 {
     protected static final String DETAIL_MESSAGE_KEY_POSTFIX = "_detail";
     //e.g. for injecting a message resolver via spring
@@ -54,12 +54,12 @@
             ExtValUtils.getMessageResolverForValidationStrategy(this).getMessage(key, locale);
     }
 
-    protected String getErrorMessageSummary(Annotation annotation)
+    protected String getErrorMessageSummary(A annotation)
     {
         return resolveMessage(getValidationErrorMsgKey(annotation));
     }
 
-    protected String getErrorMessageDetail(Annotation annotation)
+    protected String getErrorMessageDetail(A annotation)
     {
         try
         {
@@ -77,12 +77,12 @@
         return null;
     }
 
-    protected FacesMessage getValidationErrorFacesMassage(Annotation annotation)
+    protected FacesMessage getValidationErrorFacesMassage(A annotation)
     {
         return ExtValUtils.createFacesMessage(getErrorMessageSummary(annotation), getErrorMessageDetail(annotation));
     }
 
-    protected abstract String getValidationErrorMsgKey(Annotation annotation);
+    protected abstract String getValidationErrorMsgKey(A annotation);
 
     public void setMessageResolver(MessageResolver messageResolver)
     {

Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
(original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
Mon Jul  6 08:51:40 2009
@@ -24,7 +24,7 @@
 import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
 import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
 import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
 import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.util.PropertyValidationUtils;
@@ -78,7 +78,7 @@
                 {
                     if(!(entry.getValue() instanceof Annotation &&
                             ExtValUtils.getValidationParameterExtractor()
-                                    .extract(entry.getValue(Annotation.class), DisableClientValidation.class)
+                                    .extract(entry.getValue(Annotation.class), DisableClientSideValidation.class)
                                     .iterator().hasNext()))
                     {
                         results.putAll(metaDataTransformer.convertMetaData(entry));

Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
(original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/ParameterTestCase.java
Mon Jul  6 08:51:40 2009
@@ -23,7 +23,7 @@
 import junit.framework.TestSuite;
 import org.apache.myfaces.extensions.validator.core.validation.parameter.ValidationParameterExtractor;
 import org.apache.myfaces.extensions.validator.core.validation.parameter.DefaultValidationParameterExtractor;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
 import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
 import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
 import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
@@ -96,11 +96,11 @@
         TestPerson person = new TestPerson();
         Required required = person.getClass().getDeclaredField("lastName").getAnnotation(Required.class);
 
-        assertNotNull(extractor.extract(required).containsKey(DisableClientValidation.class));
-        assertNotNull(extractor.extract(required, DisableClientValidation.class).iterator().next());
-        assertEquals(extractor.extract(required, DisableClientValidation.class).size(), 1);
-        assertEquals(extractor.extract(required, DisableClientValidation.class, Class.class).size(),
1);
-        assertEquals(extractor.extract(required, DisableClientValidation.class, Class.class).iterator().next().getName(),
DisableClientValidation.class.getName());
+        assertNotNull(extractor.extract(required).containsKey(DisableClientSideValidation.class));
+        assertNotNull(extractor.extract(required, DisableClientSideValidation.class).iterator().next());
+        assertEquals(extractor.extract(required, DisableClientSideValidation.class).size(),
1);
+        assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).size(),
1);
+        assertEquals(extractor.extract(required, DisableClientSideValidation.class, Class.class).iterator().next().getName(),
DisableClientSideValidation.class.getName());
     }
 
     /*

Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java?rev=791414&r1=791413&r2=791414&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
(original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/test/java/org/apache/myfaces/extensions/validator/test/baseval/parameter/TestPerson.java
Mon Jul  6 08:51:40 2009
@@ -19,14 +19,8 @@
 package org.apache.myfaces.extensions.validator.test.baseval.parameter;
 
 import org.apache.myfaces.extensions.validator.baseval.annotation.Required;
-import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
 import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverity;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientValidation;
-import org.apache.myfaces.extensions.validator.core.validation.parameter.ParameterValue;
-import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
+import org.apache.myfaces.extensions.validator.core.validation.parameter.DisableClientSideValidation;
 
 public class TestPerson
 {
@@ -38,7 +32,7 @@
             TestDenyClientSideValidation.class,
             TestPriorityHigh.class,
             TestValidationInterceptor.class,
-            DisableClientValidation.class,
+            DisableClientSideValidation.class,
             //LoginValidator.class,
             AdditionalValidator.class})
     private String lastName;



Mime
View raw message