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 2009/11/03 22:18:21 UTC
svn commit: r832561 - in /myfaces/extensions/validator/trunk:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/
core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/tra...
Author: gpetracek
Date: Tue Nov 3 21:17:50 2009
New Revision: 832561
URL: http://svn.apache.org/viewvc?rev=832561&view=rev
Log:
addition to EXTVAL-65 and small refactorings
Modified:
myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/DefaultClientValidatorStorageNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultFacesMessageStorage.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesInformationStorageNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesMessageStorageNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultMetaDataStorageNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultRendererProxyStorageNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/mapper/SizeNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/BeanValidationGroupStorageNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/ModelValidationStorageNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationGroupStorageNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/CrossValidationStorageNameMapper.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/ProcessedInformationStorageNameMapper.java
Modified: myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/DefaultClientValidatorStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/DefaultClientValidatorStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/DefaultClientValidatorStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/storage/mapper/DefaultClientValidatorStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.validator.trinidad.storage.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.trinidad.storage.TrinidadClientValidatorStorage;
import org.apache.myfaces.extensions.validator.trinidad.storage.DefaultClientValidatorStorage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -30,6 +31,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(300)
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultClientValidatorStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper.java Tue Nov 3 21:17:50 2009
@@ -22,6 +22,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.SubMapperAwareNameMapper;
import org.apache.myfaces.extensions.validator.core.Nested;
import org.apache.myfaces.extensions.validator.core.InvocationOrderComparator;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -34,6 +35,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(100)
@UsageInformation({UsageCategory.INTERNAL})
public class ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper
extends AbstractValidationStrategyToMetaDataTransformerNameMapper
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultFacesMessageStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultFacesMessageStorage.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultFacesMessageStorage.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultFacesMessageStorage.java Tue Nov 3 21:17:50 2009
@@ -88,7 +88,12 @@
private void sortFacesMessageHolderList(List<FacesMessageHolder> facesMessageHolderList)
{
- Collections.sort(facesMessageHolderList, new Comparator<FacesMessageHolder>() {
+ Collections.sort(facesMessageHolderList, getFacesMessageComparator());
+ }
+
+ protected Comparator<FacesMessageHolder> getFacesMessageComparator()
+ {
+ return new Comparator<FacesMessageHolder>() {
public int compare(FacesMessageHolder holder1, FacesMessageHolder holder2)
{
if(holder1.getFacesMessage().getSeverity() == null)
@@ -113,17 +118,17 @@
private int compareMessageText(FacesMessage facesMessage1, FacesMessage facesMessage2)
{
- String text1 = facesMessage1.getSummary();
- String text2 = facesMessage2.getSummary();
+ String text1 = facesMessage1.getDetail();
+ String text2 = facesMessage2.getDetail();
if(text1 == null)
{
- text1 = facesMessage1.getDetail();
+ text1 = facesMessage1.getSummary();
}
if(text2 == null)
{
- text2 = facesMessage2.getDetail();
+ text2 = facesMessage2.getSummary();
}
if(text1 == null)
@@ -138,7 +143,7 @@
return text1.compareToIgnoreCase(text2);
}
- });
+ };
}
private boolean isSameSeverity(FacesMessageHolder holder1, FacesMessageHolder holder2)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesInformationStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesInformationStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesInformationStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesInformationStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.storage.FacesInformationStorage;
import org.apache.myfaces.extensions.validator.core.storage.DefaultFacesInformationStorage;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
/**
* use a public class to allow optional deregistration
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(100)
public class DefaultFacesInformationStorageNameMapper implements NameMapper<String>
{
public String createName(String source)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesMessageStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesMessageStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesMessageStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultFacesMessageStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.storage.DefaultFacesMessageStorage;
import org.apache.myfaces.extensions.validator.core.storage.FacesMessageStorage;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
/**
* use a public class to allow optional deregistration
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(100)
public class DefaultFacesMessageStorageNameMapper implements NameMapper<String>
{
public String createName(String source)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultMetaDataStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultMetaDataStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultMetaDataStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultMetaDataStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.storage.MetaDataStorage;
import org.apache.myfaces.extensions.validator.core.storage.DefaultMetaDataStorage;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
/**
* use a public class to allow optional deregistration
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(100)
public class DefaultMetaDataStorageNameMapper implements NameMapper<String>
{
public String createName(String source)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultRendererProxyStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultRendererProxyStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultRendererProxyStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/mapper/DefaultRendererProxyStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.storage.DefaultRendererProxyStorage;
import org.apache.myfaces.extensions.validator.core.storage.RendererProxyStorage;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
/**
* use a public class to allow optional deregistration
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(100)
public class DefaultRendererProxyStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/mapper/SizeNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/mapper/SizeNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/mapper/SizeNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/mapper/SizeNameMapper.java Tue Nov 3 21:17:50 2009
@@ -32,7 +32,7 @@
* @since x.x.3
*/
@Nested
-@InvocationOrder(201)
+@InvocationOrder(210)
@UsageInformation({UsageCategory.INTERNAL})
public class SizeNameMapper extends AbstractBeanValidationVirtualValidationStrategyToMetaDataTransformerNameMapper
{
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/BeanValidationGroupStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/BeanValidationGroupStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/BeanValidationGroupStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/BeanValidationGroupStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.validator.beanval.storage.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
import org.apache.myfaces.extensions.validator.beanval.storage.DefaultBeanValidationGroupStorage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(200)
@UsageInformation(INTERNAL)
public class BeanValidationGroupStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/ModelValidationStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/ModelValidationStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/ModelValidationStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/storage/mapper/ModelValidationStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.validator.beanval.storage.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
import org.apache.myfaces.extensions.validator.beanval.storage.DefaultModelValidationStorage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(200)
@UsageInformation(INTERNAL)
public class ModelValidationStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationGroupStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationGroupStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationGroupStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationGroupStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.storage.DefaultGroupStorage;
import org.apache.myfaces.extensions.validator.core.validation.parameter.ValidationParameter;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
@@ -30,6 +31,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(200)
@UsageInformation(INTERNAL)
public class PropertyValidationGroupStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/CrossValidationStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/CrossValidationStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/CrossValidationStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/CrossValidationStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.crossval.storage.CrossValidationStorage;
import org.apache.myfaces.extensions.validator.crossval.storage.DefaultCrossValidationStorage;
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(200)
@UsageInformation(INTERNAL)
public class CrossValidationStorageNameMapper implements NameMapper<String>
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/ProcessedInformationStorageNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/ProcessedInformationStorageNameMapper.java?rev=832561&r1=832560&r2=832561&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/ProcessedInformationStorageNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/storage/mapper/ProcessedInformationStorageNameMapper.java Tue Nov 3 21:17:50 2009
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.crossval.storage.ProcessedInformationStorage;
import org.apache.myfaces.extensions.validator.crossval.storage.DefaultProcessedInformationStorage;
@@ -28,6 +29,7 @@
* @author Gerhard Petracek
* @since x.x.3
*/
+@InvocationOrder(200)
@UsageInformation(INTERNAL)
public class ProcessedInformationStorageNameMapper implements NameMapper<String>
{