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 2010/03/14 15:21:46 UTC
svn commit: r922861 - in
/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/
core/src/main/java/org/apache/my...
Author: gpetracek
Date: Sun Mar 14 14:21:46 2010
New Revision: 922861
URL: http://svn.apache.org/viewvc?rev=922861&view=rev
Log:
cleanup
Modified:
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java
myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java?rev=922861&r1=922860&r2=922861&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/RequiredInitializer.java Sun Mar 14 14:21:46 2010
@@ -42,7 +42,7 @@ class RequiredInitializer extends Trinid
public boolean configureTrinidadComponent(FacesContext facesContext, UIComponent uiComponent,
Map<String, Object> metaData)
{
- if(!validateEmptyFields() && ExtValUtils.isRequiredInitializationActive())
+ if(!validateEmptyFields() || !ExtValUtils.isRequiredInitializationActive())
{
return false;
}
Modified: myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java?rev=922861&r1=922860&r2=922861&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/experimental/trunk_with_extval-83/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java Sun Mar 14 14:21:46 2010
@@ -76,42 +76,15 @@ public abstract class AbstractValidation
return key;
}
- ResourceBundle resourceBundle = null;
String customMessage = null;
- //only in case of a ValidationErrorMessageResolver which is configured as bean
- if (this.messageBundleBaseName != null)
+ try
{
- resourceBundle = ResourceBundle.getBundle(this.messageBundleBaseName, locale);
- if (resourceBundle != null)
- {
- customMessage = resourceBundle.getString(key);
- }
- else
- {
- if(logger.isWarnEnabled())
- {
- logger.warn("message bundle " + this.messageBundleBaseName + " not found");
- }
- }
+ customMessage = tryToFindCustomMessage(key, locale);
}
-
- //only in case of a ValidationErrorMessageResolver which is configured as bean
- if (this.messageBundleVarName != null && customMessage == null)
+ catch (Throwable t)
{
- resourceBundle = (ResourceBundle) ExtValUtils.getELHelper().getBean(messageBundleVarName);
-
- if (resourceBundle != null)
- {
- customMessage = resourceBundle.getString(key);
- }
- else
- {
- if(logger.isWarnEnabled())
- {
- logger.warn("message bundle var name " + this.messageBundleVarName + " not found");
- }
- }
+ //do nothing
}
if (customMessage != null)
@@ -122,7 +95,14 @@ public abstract class AbstractValidation
/*
* try to use the convention for the message bundle
*/
- customMessage = tryToUseMessageBundleConvention(key, locale);
+ try
+ {
+ customMessage = tryToUseMessageBundleConvention(key, locale);
+ }
+ catch (Throwable t)
+ {
+ //do nothing
+ }
if (customMessage != null)
{
@@ -136,44 +116,61 @@ public abstract class AbstractValidation
//try to load custom messages
try
{
- resourceBundle = ResourceBundle.getBundle(getCustomBaseName(), locale);
+ customMessage = tryToFindCustomMessageInCustomResourceBundle(key, locale);
}
catch (Throwable t)
{
//do nothing - it was just a try
}
- if (resourceBundle != null)
+ return determineMessage(key, locale, customMessage);
+ }
+
+ private String tryToFindCustomMessage(String key, Locale locale)
+ {
+ ResourceBundle resourceBundle;
+ String customMessage = null;
+
+ //only in case of a ValidationErrorMessageResolver which is configured as bean
+ if (this.messageBundleBaseName != null)
{
- try
+ resourceBundle = ResourceBundle.getBundle(this.messageBundleBaseName, locale);
+ if (resourceBundle != null)
{
customMessage = resourceBundle.getString(key);
}
- catch (MissingResourceException e)
+ else
{
- if(logger.isTraceEnabled())
+ if(logger.isWarnEnabled())
{
- logger.trace("no custom message for " + key + " within " + getCustomBaseName(), e);
+ logger.warn("message bundle " + this.messageBundleBaseName + " not found");
}
}
}
- //use custom name (if possible) otherwise: fallback to default message (if possible)
- try
- {
- return (customMessage != null) ? customMessage
- : (getBaseName() != null) ? ResourceBundle.getBundle(getBaseName(), locale).getString(key) : null;
- }
- catch (MissingResourceException e)
+ //only in case of a ValidationErrorMessageResolver which is configured as bean
+ if (this.messageBundleVarName != null && customMessage == null)
{
- return MISSING_RESOURCE_MARKER + key + MISSING_RESOURCE_MARKER;
+ resourceBundle = (ResourceBundle) ExtValUtils.getELHelper().getBean(messageBundleVarName);
+
+ if (resourceBundle != null)
+ {
+ customMessage = resourceBundle.getString(key);
+ }
+ else
+ {
+ if(logger.isWarnEnabled())
+ {
+ logger.warn("message bundle var name " + this.messageBundleVarName + " not found");
+ }
+ }
}
+
+ return customMessage;
}
private String tryToUseMessageBundleConvention(String key, Locale locale)
{
- String customMessage = null;
-
if ((deactivateDefaultConvention == null || !deactivateDefaultConvention.equalsIgnoreCase("true"))
&& isDefaultMessageBundleConventionActive())
{
@@ -193,18 +190,57 @@ public abstract class AbstractValidation
if (defaultBundle != null)
{
- try
- {
- customMessage = defaultBundle.getString(key);
- }
- catch (MissingResourceException e)
+ return defaultBundle.getString(key);
+ }
+ }
+
+ return null;
+ }
+
+ private String tryToFindCustomMessageInCustomResourceBundle(String key, Locale locale)
+ {
+ ResourceBundle resourceBundle = tryToLoadCustomResourceBundle(locale);
+
+ if (resourceBundle != null)
+ {
+ try
+ {
+ return resourceBundle.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ if(logger.isTraceEnabled())
{
- //do nothing
+ logger.trace("no custom message for " + key + " within " + getCustomBaseName(), e);
}
}
}
+ return null;
+ }
- return customMessage;
+ private ResourceBundle tryToLoadCustomResourceBundle(Locale locale)
+ {
+ String customBaseName = getCustomBaseName();
+
+ if(customBaseName != null)
+ {
+ return ResourceBundle.getBundle(customBaseName, locale);
+ }
+ return null;
+ }
+
+ private String determineMessage(String key, Locale locale, String customMessage)
+ {
+ //use custom name (if possible) otherwise: fallback to default message (if possible)
+ try
+ {
+ return (customMessage != null) ? customMessage
+ : (getBaseName() != null) ? ResourceBundle.getBundle(getBaseName(), locale).getString(key) : null;
+ }
+ catch (MissingResourceException e)
+ {
+ return MISSING_RESOURCE_MARKER + key + MISSING_RESOURCE_MARKER;
+ }
}
protected boolean isDefaultMessageBundleConventionActive()