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 2008/10/02 15:29:41 UTC
svn commit: r701122 - in
/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core:
./ metadata/transformer/mapper/ validation/message/resolver/
validation/message/resolver/mapper/ validation/strategy/mapper/
Author: gpetracek
Date: Thu Oct 2 06:29:41 2008
New Revision: 701122
URL: http://svn.apache.org/viewvc?rev=701122&view=rev
Log:
minor changes
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java?rev=701122&r1=701121&r2=701122&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InternalConventionProvider.java Thu Oct 2 06:29:41 2008
@@ -33,7 +33,7 @@
@UsageInformation(UsageCategory.INTERNAL)
public class InternalConventionProvider
{
- public static String getConventionForModuleMessageBundle(String packageName)
+ public static String getModuleMessageBundleName(String packageName)
{
String newPackageName;
if (packageName.endsWith(".resolver"))
@@ -52,13 +52,13 @@
* use a custom name mapper to implement custom conventions
*/
@ToDo(value = Priority.MEDIUM, description = "logging")
- public static String getConventionNameForMessageResolverName(
+ public static String getMessageResolverClassName(
Class<? extends ValidationStrategy> validationStrategyClass, String targetClassName)
{
return getValidationStrategyBasedName(validationStrategyClass, ".message.resolver.", targetClassName);
}
- public static String getConventionNameForMetaDataTransformerName(
+ public static String getMetaDataTransformerClassName(
Class<? extends ValidationStrategy> validationStrategyClass, String targetClassName)
{
return getValidationStrategyBasedName(validationStrategyClass, ".metadata.transformer.", targetClassName);
@@ -82,7 +82,7 @@
/**
* use a custom name mapper to implement custom conventions
*/
- public static String getConventionNameForMessageResolverClass(String validationStrategyName)
+ public static String getMessageResolverClassName(String validationStrategyName)
{
return getValidationStrategyBasedName(validationStrategyName, "ValidationErrorMessageResolver");
}
@@ -90,12 +90,12 @@
/**
* use a custom name mapper to implement custom conventions
*/
- public static String getConventionNameForValidationStrategy(Annotation annotation)
+ public static String getValidationStrategyClassName(Annotation annotation)
{
return annotation.annotationType().getName().replace(".annotation.", ".strategy.") + "Strategy";
}
- public static String getConventionNameForMetaDataTransformerClass(String validationStrategyName)
+ public static String getMetaDataTransformerClassName(String validationStrategyName)
{
return getValidationStrategyBasedName(validationStrategyName, "MetaDataTransformer");
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java?rev=701122&r1=701121&r2=701122&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/DefaultValidationStrategyToMetaDataTransformerNameMapper.java Thu Oct 2 06:29:41 2008
@@ -36,12 +36,12 @@
{
public String createName(ValidationStrategy validationStrategy)
{
- return InternalConventionProvider.getConventionNameForMetaDataTransformerName(
+ return InternalConventionProvider.getMetaDataTransformerClassName(
validationStrategy.getClass(), getClassName(validationStrategy.getClass().getSimpleName()));
}
protected String getClassName(String validationStrategyClassName)
{
- return InternalConventionProvider.getConventionNameForMetaDataTransformerClass(validationStrategyClassName);
+ return InternalConventionProvider.getMetaDataTransformerClassName(validationStrategyClassName);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java?rev=701122&r1=701121&r2=701122&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java Thu Oct 2 06:29:41 2008
@@ -39,7 +39,7 @@
//not used at the moment - just for a convention
protected String getBaseName()
{
- return InternalConventionProvider.getConventionForModuleMessageBundle(getClass().getPackage().getName());
+ return InternalConventionProvider.getModuleMessageBundleName(getClass().getPackage().getName());
}
protected String getCustomBaseName()
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java?rev=701122&r1=701121&r2=701122&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java Thu Oct 2 06:29:41 2008
@@ -36,12 +36,12 @@
{
public String createName(ValidationStrategy validationStrategy)
{
- return InternalConventionProvider.getConventionNameForMessageResolverName(validationStrategy.getClass(),
+ return InternalConventionProvider.getMessageResolverClassName(validationStrategy.getClass(),
getClassName(validationStrategy.getClass().getSimpleName()));
}
protected String getClassName(String strategyClassName)
{
- return InternalConventionProvider.getConventionNameForMessageResolverClass(strategyClassName);
+ return InternalConventionProvider.getMessageResolverClassName(strategyClassName);
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java?rev=701122&r1=701121&r2=701122&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java Thu Oct 2 06:29:41 2008
@@ -37,6 +37,6 @@
{
public String createName(Annotation annotation)
{
- return InternalConventionProvider.getConventionNameForValidationStrategy(annotation);
+ return InternalConventionProvider.getValidationStrategyClassName(annotation);
}
}
\ No newline at end of file