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/12/25 02:37:13 UTC
svn commit: r893830 - in /myfaces/extensions/validator/trunk:
core/src/main/java/org/apache/myfaces/extensions/validator/util/
validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/
valida...
Author: gpetracek
Date: Fri Dec 25 01:37:12 2009
New Revision: 893830
URL: http://svn.apache.org/viewvc?rev=893830&view=rev
Log:
EXTVAL-78 and small changes
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/AbstractValidationParameterAwareTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=893830&r1=893829&r2=893830&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Fri Dec 25 01:37:12 2009
@@ -371,16 +371,16 @@
@UsageInformation(UsageCategory.INTERNAL)
public static void replaceWithDefaultMaximumMessage(FacesMessage facesMessage, int maxLength)
{
- String facesRequiredMessage = JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_MAXIMUM);
+ String facesRequiredMessage = JsfUtils.getMessageFromApplicationMessageBundle(JAVAX_FACES_MAXIMUM);
String facesRequiredMessageDetail = facesRequiredMessage;
//use try/catch for easier sync between trunk/branch
try
{
- if (JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_MAXIMUM_DETAIL) != null)
+ if (JsfUtils.getMessageFromApplicationMessageBundle(JAVAX_FACES_MAXIMUM_DETAIL) != null)
{
facesRequiredMessageDetail = JsfUtils
- .getDefaultFacesMessageBundle().getString(JAVAX_FACES_MAXIMUM_DETAIL);
+ .getMessageFromApplicationMessageBundle(JAVAX_FACES_MAXIMUM_DETAIL);
}
}
catch (MissingResourceException missingResourceException)
@@ -398,16 +398,16 @@
@UsageInformation(UsageCategory.INTERNAL)
public static void replaceWithDefaultRequiredMessage(FacesMessage facesMessage)
{
- String facesRequiredMessage = JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED);
+ String facesRequiredMessage = JsfUtils.getMessageFromApplicationMessageBundle(JAVAX_FACES_REQUIRED);
String facesRequiredMessageDetail = facesRequiredMessage;
//use try/catch for easier sync between trunk/branch
try
{
- if (JsfUtils.getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED_DETAIL) != null)
+ if (JsfUtils.getMessageFromApplicationMessageBundle(JAVAX_FACES_REQUIRED_DETAIL) != null)
{
facesRequiredMessageDetail = JsfUtils
- .getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED_DETAIL);
+ .getMessageFromApplicationMessageBundle(JAVAX_FACES_REQUIRED_DETAIL);
}
}
catch (MissingResourceException missingResourceException)
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java?rev=893830&r1=893829&r2=893830&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java Fri Dec 25 01:37:12 2009
@@ -73,16 +73,35 @@
public static ResourceBundle getDefaultFacesMessageBundle()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ return ResourceBundle.getBundle(FacesMessage.FACES_MESSAGES, facesContext.getViewRoot().getLocale());
+ }
+
+ public static ResourceBundle getCustomFacesMessageBundle()
+ {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
String bundleName = facesContext.getApplication().getMessageBundle();
if(bundleName == null)
{
- bundleName = FacesMessage.FACES_MESSAGES;
+ return null;
}
return ResourceBundle.getBundle(bundleName, facesContext.getViewRoot().getLocale());
}
+ public static String getMessageFromApplicationMessageBundle(String messageKey)
+ {
+ ResourceBundle customResourceBundle = getCustomFacesMessageBundle();
+
+ if(customResourceBundle != null && customResourceBundle.containsKey(messageKey))
+ {
+ return customResourceBundle.getString(messageKey);
+ }
+
+ return getDefaultFacesMessageBundle().getString(messageKey);
+ }
+
public static boolean isRenderResponsePhase()
{
return PhaseId.RENDER_RESPONSE.equals(getFacesInformationStorage().getCurrentPhaseId());
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.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/AbstractBeanValidationMetaDataTransformer.java?rev=893830&r1=893829&r2=893830&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/metadata/transformer/AbstractBeanValidationMetaDataTransformer.java Fri Dec 25 01:37:12 2009
@@ -30,7 +30,7 @@
import javax.validation.Payload;
import javax.faces.application.FacesMessage;
import java.util.Map;
-import java.util.HashMap;
+import java.util.Collections;
import java.lang.annotation.Annotation;
/**
@@ -49,7 +49,7 @@
{
return transformMetaData((ConstraintDescriptor<T>)constraintDescriptor);
}
- return new HashMap<String, Object>();
+ return Collections.emptyMap();
}
protected boolean isClientSideValidationEnabled(ConstraintDescriptor<? extends T> constraintDescriptor)
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java?rev=893830&r1=893829&r2=893830&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/LabeledMessageInternals.java Fri Dec 25 01:37:12 2009
@@ -91,13 +91,13 @@
{
if(isDetailMessage)
{
- return JsfUtils.getDefaultFacesMessageBundle()
- .getString(JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE_DETAIL);
+ return JsfUtils.getMessageFromApplicationMessageBundle(
+ JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE_DETAIL);
}
else
{
- return JsfUtils.getDefaultFacesMessageBundle()
- .getString(JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE);
+ return JsfUtils.getMessageFromApplicationMessageBundle(
+ JAVAX_FACES_VALIDATOR_BEANVALIDATOR_MESSAGE);
}
}
catch (MissingResourceException e)
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/AbstractValidationParameterAwareTransformer.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/AbstractValidationParameterAwareTransformer.java?rev=893830&r1=893829&r2=893830&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/AbstractValidationParameterAwareTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/AbstractValidationParameterAwareTransformer.java Fri Dec 25 01:37:12 2009
@@ -27,9 +27,9 @@
import javax.faces.application.FacesMessage;
import java.lang.annotation.Annotation;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Collections;
/**
* @author Gerhard Petracek
@@ -44,7 +44,7 @@
{
return transformMetaData(metaData);
}
- return new HashMap<String, Object>();
+ return Collections.emptyMap();
}
protected abstract Map<String, Object> transformMetaData(MetaDataEntry metaData);
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=893830&r1=893829&r2=893830&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 Fri Dec 25 01:37:12 2009
@@ -36,6 +36,7 @@
import javax.faces.context.FacesContext;
import java.util.HashMap;
import java.util.Map;
+import java.util.Collections;
import java.lang.annotation.Annotation;
/**
@@ -62,7 +63,7 @@
"if it gets invoked and an exception occurs, a custom syntax is used." +
"this class might be used by an old add-on. please check for a newer version.");
}
- return new HashMap<String, Object>();
+ return Collections.emptyMap();
}
}