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/11/13 01:04:28 UTC
svn commit: r713572 - in /myfaces/extensions/validator/branches/jsf_1.1:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/
core/src/main/java/org/apache/myfaces/extensions/validator/util/ val...
Author: gpetracek
Date: Wed Nov 12 16:04:28 2008
New Revision: 713572
URL: http://svn.apache.org/viewvc?rev=713572&view=rev
Log:
EXTVAL-28 reuse maximum length message of jsf
Removed:
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_ar.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_ca.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_es.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_fr.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_it.properties
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/jpa_messages_tr.properties
Modified:
myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java?rev=713572&r1=713571&r2=713572&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java Wed Nov 12 16:04:28 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
@@ -65,16 +66,9 @@
label = metaDataEntry.getProperty(PropertyInformationKeys.LABEL, String.class);
}
- if(facesMessage.getSummary() != null && facesMessage.getSummary().contains("{0}"))
+ for(int i = 0; i < 3; i++)
{
- String newSummary = facesMessage.getSummary().replace("{0}", label);
- facesMessage.setSummary(newSummary);
- }
-
- if(facesMessage.getDetail() != null && facesMessage.getDetail().contains("{0}"))
- {
- String newDetail = facesMessage.getDetail().replace("{0}", label);
- facesMessage.setDetail(newDetail);
+ ExtValUtils.tryToPlaceLabel(facesMessage, label, i);
}
}
return true;
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=713572&r1=713571&r2=713572&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Wed Nov 12 16:04:28 2008
@@ -40,6 +40,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
+import javax.faces.application.FacesMessage;
import java.util.Map;
@@ -134,4 +135,18 @@
newKey, baseObject, targetExpression.substring(targetExpression.lastIndexOf(".") + 1,
targetExpression.length()));
}
+
+ @UsageInformation(UsageCategory.INTERNAL)
+ public static void tryToPlaceLabel(FacesMessage facesMessage, String label, int index)
+ {
+ if(facesMessage.getSummary() != null && facesMessage.getSummary().contains("{" + index + "}"))
+ {
+ facesMessage.setSummary(facesMessage.getSummary().replace("{" + index + "}", label));
+ }
+
+ if(facesMessage.getDetail() != null && facesMessage.getDetail().contains("{" + index + "}"))
+ {
+ facesMessage.setDetail(facesMessage.getDetail().replace("{" + index + "}", label));
+ }
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java?rev=713572&r1=713571&r2=713572&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsValidationExceptionInterceptor.java Wed Nov 12 16:04:28 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlInputText;
@@ -63,16 +64,9 @@
label = metaDataEntry.getProperty(PropertyInformationKeys.LABEL, String.class);
}
- if(facesMessage.getSummary() != null && facesMessage.getSummary().contains("{0}"))
+ for(int i = 0; i < 3; i++)
{
- String newSummary = facesMessage.getSummary().replace("{0}", label);
- facesMessage.setSummary(newSummary);
- }
-
- if(facesMessage.getDetail() != null && facesMessage.getDetail().contains("{0}"))
- {
- String newDetail = facesMessage.getDetail().replace("{0}", label);
- facesMessage.setDetail(newDetail);
+ ExtValUtils.tryToPlaceLabel(facesMessage, label, i);
}
}
return true;
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java?rev=713572&r1=713571&r2=713572&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java Wed Nov 12 16:04:28 2008
@@ -49,6 +49,8 @@
private boolean useFacesBundle = false;
private static final String JAVAX_FACES_REQUIRED = "javax.faces.component.UIInput.REQUIRED";
private static final String JAVAX_FACES_REQUIRED_DETAIL = "javax.faces.component.UIInput.REQUIRED_detail";
+ private static final String JAVAX_FACES_MAXIMUM = "javax.faces.validator.LengthValidator.MAXIMUM";
+ private static final String JAVAX_FACES_MAXIMUM_DETAIL = "javax.faces.validator.LengthValidator.MAXIMUM_detail";
private static final String VALIDATE_LENGTH = "length";
@@ -187,22 +189,51 @@
{
FacesMessage facesMessage = e.getFacesMessage();
- if(this.useFacesBundle && !VALIDATE_LENGTH.equals(this.violation))
+ if(this.useFacesBundle)
{
- String facesRequiredMessage = getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED);
- String facesRequiredMessageDetail = facesRequiredMessage;
+ String facesRequiredMessage;
+ String facesRequiredMessageDetail;
- //use try/catch for easier sync between trunk/branch
- try
+ if(VALIDATE_LENGTH.equals(this.violation))
{
- if(getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED_DETAIL) != null)
+ facesRequiredMessage = getDefaultFacesMessageBundle().getString(JAVAX_FACES_MAXIMUM);
+ facesRequiredMessageDetail = facesRequiredMessage;
+
+ //use try/catch for easier sync between trunk/branch
+ try
+ {
+ if(getDefaultFacesMessageBundle().getString(JAVAX_FACES_MAXIMUM_DETAIL) != null)
+ {
+ facesRequiredMessageDetail = getDefaultFacesMessageBundle()
+ .getString(JAVAX_FACES_MAXIMUM_DETAIL);
+ }
+ }
+ catch (MissingResourceException missingResourceException)
{
- facesRequiredMessageDetail = getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED_DETAIL);
+ //jsf 1.2 doesn't have a detail message
}
+
+ facesRequiredMessage = facesRequiredMessage.replace("{0}", "" + this.maxLength);
+ facesRequiredMessageDetail = facesRequiredMessageDetail.replace("{0}", "" + this.maxLength);
}
- catch (MissingResourceException missingResourceException)
+ else
{
- //jsf 1.2 doesn't have a detail message
+ facesRequiredMessage = getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED);
+ facesRequiredMessageDetail = facesRequiredMessage;
+
+ //use try/catch for easier sync between trunk/branch
+ try
+ {
+ if(getDefaultFacesMessageBundle().getString(JAVAX_FACES_REQUIRED_DETAIL) != null)
+ {
+ facesRequiredMessageDetail = getDefaultFacesMessageBundle()
+ .getString(JAVAX_FACES_REQUIRED_DETAIL);
+ }
+ }
+ catch (MissingResourceException missingResourceException)
+ {
+ //jsf 1.2 doesn't have a detail message
+ }
}
facesMessage.setSummary(facesRequiredMessage);