You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/10/26 22:42:23 UTC
svn commit: r468175 [2/5] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/
trinidad-api/src/main/java/org/apache/myfaces...
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java Thu Oct 26 15:42:18 2006
@@ -218,8 +218,8 @@
if ( this.isTransient() == other.isTransient() &&
ValidatorUtils.equals(getPattern(), other.getPattern()) &&
- ValidatorUtils.equals(getNoMatchMessageDetail(),
- other.getNoMatchMessageDetail())
+ ValidatorUtils.equals(getMessageDetailNoMatch(),
+ other.getMessageDetailNoMatch())
)
{
return true;
@@ -237,7 +237,7 @@
{
int result = 17;
String pattern = getPattern();
- String noMesgDetail = getNoMatchMessageDetail();
+ String noMesgDetail = getMessageDetailNoMatch();
result = 37 * result + (pattern == null? 0 : pattern.hashCode());
result = 37 * result + (isTransient() ? 0 : 1);
result = 37 * result + (noMesgDetail == null ? 0 : noMesgDetail.hashCode());
@@ -277,7 +277,7 @@
* Overrides detail message identified by message id {@link #NO_MATCH_MESSAGE_ID}
* @param noMatchMessageDetail
*/
- public void setNoMatchMessageDetail(String noMatchMessageDetail)
+ public void setMessageDetailNoMatch(String noMatchMessageDetail)
{
_facesBean.setProperty(_NO_MATCH_MESSAGE_DETAIL_KEY, noMatchMessageDetail);
}
@@ -288,7 +288,7 @@
* @return Custom error message
* @see #setNoMatchMessageDetail(String)
*/
- public String getNoMatchMessageDetail()
+ public String getMessageDetailNoMatch()
{
Object obj = _facesBean.getProperty(_NO_MATCH_MESSAGE_DETAIL_KEY);
return ComponentUtils.resolveString(obj);
@@ -325,7 +325,7 @@
= _TYPE.registerKey("pattern", String.class);
private static final PropertyKey _NO_MATCH_MESSAGE_DETAIL_KEY
- = _TYPE.registerKey("noMatchMessageDetail", String.class);
+ = _TYPE.registerKey("messageDetailNoMatch", String.class);
private FacesBean _facesBean = ValidatorUtils.getFacesBean(_TYPE);
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle.xrts
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle.xrts?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle.xrts (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle.xrts Thu Oct 26 15:42:18 2006
@@ -88,9 +88,30 @@
<!-- {1} value entered by the user -->
<!-- NOTE: The format of this message must match the format of the -->
<!-- general javascript messages (see VALIDATION_ALERT_FORMAT below) -->
+ <resource key="javax.faces.Length">Wrong length.</resource>
+ <resource key="javax.faces.Length_detail">Value "{1}" has the wrong length.</resource>
+
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- NOTE: The format of this message must match the format of the -->
+ <!-- general javascript messages (see VALIDATION_ALERT_FORMAT below) -->
<resource key="javax.faces.LongRange">Not an integer.</resource>
<resource key="javax.faces.LongRange_detail">Value "{1}" is not an integer.</resource>
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- NOTE: The format of this message must match the format of the -->
+ <!-- general javascript messages (see VALIDATION_ALERT_FORMAT below) -->
+ <resource key="javax.faces.DoubleRange">Not a float.</resource>
+ <resource key="javax.faces.DoubleRange_detail">Value "{1}" is not a float.</resource>
+
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- NOTE: The format of this message must match the format of the -->
+ <!-- general javascript messages (see VALIDATION_ALERT_FORMAT below) -->
+ <resource key="org.apache.myfaces.trinidad.DateTimeRange">Wrong date.</resource>
+ <resource key="org.apache.myfaces.trinidad.DateTimeRange_detail">Value "{1}" fit's not into the desired date range.</resource>
+
<!-- E.g. for input value "test" and maximum value set to "3" -->
<!-- the message would be: -->
<!-- The length of the value entered, "test", exceeds the -->
@@ -132,6 +153,90 @@
<resource key="org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.NOT_IN_RANGE_detail">The date entered, "{1}", is not within the range of valid dates {2} and {3}.</resource>
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the maximum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MAXIMUM">Value is too large.</resource>
+
+ <resource
+ key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MAXIMUM_detail">The value "{1}" is larger than the maximum value of {2}.</resource>
+
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} represent Number which the user has set -->
+ <!-- {2} represents the minimum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MINIMUM">Value is too small.</resource>
+ <resource
+ key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MINIMUM_detail">The value "{1}" is smaller than the minimum value of {2}.</resource>
+
+ <!-- Number outside number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the minimum allowed number -->
+ <!-- {3} represents the maximum allowed number -->
+ <resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.NOT_IN_RANGE">Value is not within valid range.</resource>
+
+ <resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.NOT_IN_RANGE_detail">The value entered, "{1}", is not within the range of valid values {2} and {3}.</resource>
+
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the maximum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LengthValidator.MAXIMUM">Value is too large.</resource>
+
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LengthValidator.MAXIMUM_detail">The size of value "{1}" is larger than the maximum value of {2}.</resource>
+
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} represent Number which the user has set -->
+ <!-- {2} represents the minimum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LengthValidator.MINIMUM">Value is too small.</resource>
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LengthValidator.MINIMUM_detail">The size of value "{1}" is smaller than the minimum value of {2}.</resource>
+
+ <!-- Number outside number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the minimum allowed number -->
+ <!-- {3} represents the maximum allowed number -->
+ <resource key="org.apache.myfaces.trinidad.validator.LengthValidator.NOT_IN_RANGE">Value is not within valid range.</resource>
+
+ <resource key="org.apache.myfaces.trinidad.validator.LengthValidator.NOT_IN_RANGE_detail">The size of value entered, "{1}", is not within the range of valid values {2} and {3}.</resource>
+
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the maximum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MAXIMUM">Value is too large.</resource>
+
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MAXIMUM_detail">The value "{1}" is larger than the maximum value of {2}.</resource>
+
+ <!-- Number exceeds number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} represent Number which the user has set -->
+ <!-- {2} represents the minimum allowed number -->
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MINIMUM">Value is too small.</resource>
+ <resource
+ key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MINIMUM_detail">The value "{1}" is smaller than the minimum value of {2}.</resource>
+
+ <!-- Number outside number range error -->
+ <!-- {0} the label that identifies the component -->
+ <!-- {1} value entered by the user -->
+ <!-- {2} represents the minimum allowed number -->
+ <!-- {3} represents the maximum allowed number -->
+ <resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.NOT_IN_RANGE">Value is not within valid range.</resource>
+
+ <resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.NOT_IN_RANGE_detail">The value entered, "{1}", is not within the range of valid values {2} and {3}.</resource>
+
<!-- Input does not match regular expression error -->
<!-- {0} the label that identifies the component -->
<!-- {1} represents the input value -->
@@ -142,35 +247,6 @@
<resource key="org.apache.myfaces.trinidad.validator.RegExpValidator.NO_MATCH_detail">The value "{1}" does not match the regular expression pattern "{2}".</resource>
- <!-- Length of input is less than the minimum specified length -->
- <!-- {0} the label that identifies the component -->
- <!-- {1} value entered by the user -->
- <!-- {2} the minimum length -->
- <resource
- key="org.apache.myfaces.trinidad.validator.LengthValidator.MINIMUM_detail">The length of the value entered, "{1}", is less than the minimum allowed length of {2}.</resource>
-
- <resource key="org.apache.myfaces.trinidad.validator.LengthValidator.MINIMUM">Value is too short.</resource>
-
- <!-- Length of input violates specified allowable range -->
- <!-- {0} the label that identifies the component -->
- <!-- {1} value entered by the user -->
- <!-- {2} the minimum length -->
- <!-- {3} the maximum length -->
- <resource
- key="org.apache.myfaces.trinidad.validator.LengthValidator.NOT_IN_RANGE_detail">The length of the value entered, "{1}", must be between the allowed lengths of {2} and {3}.</resource>
-
- <resource key="org.apache.myfaces.trinidad.validator.LengthValidator.NOT_IN_RANGE">Value is out of range.</resource>
-
- <!-- Length of input exceeds the specified maximum length -->
- <!-- {0} the label that identifies the component -->
- <!-- {1} value entered by the user -->
- <!-- {2} the maximum length -->
- <resource key="org.apache.myfaces.trinidad.validator.LengthValidator.MAXIMUM">Value is too long.</resource>
- <resource
- key="org.apache.myfaces.trinidad.validator.LengthValidator.MAXIMUM_detail">The length of the value entered, "{1}", exceeds the maximum allowed length of {2}.</resource>
-
-
-
<!-- messages for converters -->
<!-- {0} the label that identifies the component -->
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle_de.xrts
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle_de.xrts?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle_de.xrts (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/xrts/org/apache/myfaces/trinidad/resource/MessageBundle_de.xrts Thu Oct 26 15:42:18 2006
@@ -71,6 +71,8 @@
<!-- {1} value entered by the user -->
<!-- NOTE: The format of this message must match the format of the -->
<!-- general javascript messages (see VALIDATION_ALERT_FORMAT below) -->
+<resource key="javax.faces.DoubleRange" dnt="false">Keine Fliesskommazahl. </resource>
+<resource key="javax.faces.DoubleRange_detail" dnt="false">Wert "{1}" ist keine Fliesskommazahl.</resource>
<resource key="javax.faces.LongRange" dnt="false">Keine Ganzzahl. </resource>
<resource key="javax.faces.LongRange_detail" dnt="false">Wert "{1}" ist keine Ganzzahl.</resource>
<!-- E.g. for input value "test" and maximum value set to "3" -->
@@ -102,6 +104,44 @@
<!-- {3} represents the maximum allowed date -->
<resource key="org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.NOT_IN_RANGE" dnt="false">Datum liegt nicht innerhalb des gültigen Bereichs.</resource>
<resource key="org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.NOT_IN_RANGE_detail" dnt="false">Das eingegebene Datum "{1}" liegt nicht innerhalb des Bereichs gültiger Daten von {2} bis {3}.</resource>
+<!-- Date exceeds date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} value entered by the user -->
+<!-- {2} represents the maximum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MAXIMUM" dnt="false">Eingabewert liegt unter dem gültigen Bereich.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MAXIMUM_detail" dnt="false">Der Eingabewert "{1}" liegt unter dem letzten gültigen Wert {2}.</resource>
+<!-- Date preceeds date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} represent Date which the user has set -->
+<!-- {2} represents the minimum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MINIMUM" dnt="false">Eingabewert liegt über dem gültigen Bereich.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.MINIMUM_detail" dnt="false">Der Eingabewert "{1}" liegt über dem ersten gültigen Wert {2}.</resource>
+<!-- Date outside date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} value entered by the user -->
+<!-- {2} represents the minimum allowed date -->
+<!-- {3} represents the maximum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.NOT_IN_RANGE" dnt="false">Eingabewert liegt nicht innerhalb des gültigen Bereichs.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.DoubleRangeValidator.NOT_IN_RANGE_detail" dnt="false">Der Eingabewert "{1}" liegt nicht innerhalb des gültigen Bereichs von {2} bis {3}.</resource>
+<!-- Date exceeds date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} value entered by the user -->
+<!-- {2} represents the maximum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MAXIMUM" dnt="false">Eingabewert liegt unter dem gültigen Bereich.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MAXIMUM_detail" dnt="false">Der Eingabewert "{1}" liegt unter dem letzten gültigen Wert {2}.</resource>
+<!-- Date preceeds date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} represent Date which the user has set -->
+<!-- {2} represents the minimum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MINIMUM" dnt="false">Eingabewert liegt über dem gültigen Bereich.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.MINIMUM_detail" dnt="false">Der Eingabewert "{1}" liegt über dem ersten gültigen Wert {2}.</resource>
+<!-- Date outside date range error -->
+<!-- {0} the label that identifies the component -->
+<!-- {1} value entered by the user -->
+<!-- {2} represents the minimum allowed date -->
+<!-- {3} represents the maximum allowed date -->
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.NOT_IN_RANGE" dnt="false">Eingabewert liegt nicht innerhalb des gültigen Bereichs.</resource>
+<resource key="org.apache.myfaces.trinidad.validator.LongRangeValidator.NOT_IN_RANGE_detail" dnt="false">Der Eingabewert "{1}" liegt nicht innerhalb des gültigen Bereichs von {2} bis {3}.</resource>
<!-- Input does not match regular expression error -->
<!-- {0} the label that identifies the component -->
<!-- {1} represents the input value -->
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ColorConverterTest.java Thu Oct 26 15:42:18 2006
@@ -113,8 +113,8 @@
String[] patterns = {"rrr,ggg,bbb", "rrr-ggg-bbb"};
String[] otherPatterns = {"rrr,ggg,bbb", "rrr-ggg-bbb"};
converter.setPatterns(patterns);
- converter.setConvertMessageDetail("Test message detail");
- otherConverter.setConvertMessageDetail("Test message detail");
+ converter.setMessageDetailConvert("Test message detail");
+ otherConverter.setMessageDetailConvert("Test message detail");
otherConverter.setPatterns(otherPatterns);
doTestEquals(converter, otherConverter, true);
@@ -158,7 +158,7 @@
String[] patterns = {"#RRGGBB","RR.GG.BB"};
converter.setPatterns(patterns);
- converter.setConvertMessageDetail("Works fine");
+ converter.setMessageDetailConvert("Works fine");
ColorConverter restoreConverter = new ColorConverter();
doTestStateHolderSaveRestore(converter, restoreConverter,
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java Thu Oct 26 15:42:18 2006
@@ -289,9 +289,9 @@
try
{
// ADF Converter is not lenient.
- converter.setConvertDateMessageDetail(customMessage[0]);
- converter.setConvertTimeMessageDetail(customMessage[1]);
- converter.setConvertBothMessageDetail(customMessage[2]);
+ converter.setMessageDetailConvertDate(customMessage[0]);
+ converter.setMessageDetailConvertTime(customMessage[1]);
+ converter.setMessageDetailConvertBoth(customMessage[2]);
// pattern and date type is driven using the same message.
@@ -300,7 +300,7 @@
converter.setPattern("M/d/yyyy");
// There is no specific messaging scheme for pattern. So use the
// dateMessageDetail itself for this.
- converter.setConvertDateMessageDetail(customMessage[3]);
+ converter.setMessageDetailConvertDate(customMessage[3]);
}
else
converter.setType(types[i]);
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java Thu Oct 26 15:42:18 2006
@@ -159,10 +159,10 @@
try
{
// ADF Converter is not lenient.
- converter.setConvertNumberMessageDetail(customMessage[0]);
- converter.setConvertPercentMessageDetail(customMessage[1]);
- converter.setConvertCurrencyMessageDetail(customMessage[2]);
- converter.setConvertPatternMessageDetail(customMessage[3]);
+ converter.setMessageDetailConvertNumber(customMessage[0]);
+ converter.setMessageDetailConvertPercent(customMessage[1]);
+ converter.setMessageDetailConvertCurrency(customMessage[2]);
+ converter.setMessageDetailConvertPattern(customMessage[3]);
if ("pattern".equals(types[i]))
converter.setPattern("##.000");
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ByteLengthValidatorTest.java Thu Oct 26 15:42:18 2006
@@ -146,7 +146,7 @@
ByteLengthValidator validator = new ByteLengthValidator();
validator.setEncoding("ISO-8859-1");
validator.setMaximum(4);
- validator.setMaximumMessageDetail("Testing state holder?");
+ validator.setMessageDetailMaximum("Testing state holder?");
ByteLengthValidator restoreValidator = new ByteLengthValidator();
doTestStateHolderSaveRestore(validator, restoreValidator,
@@ -162,26 +162,26 @@
//1
validator.setEncoding("ISO-8859-1");
validator.setMaximum(100);
- validator.setMaximumMessageDetail("MaxMessage");
+ validator.setMessageDetailMaximum("MaxMessage");
ByteLengthValidator otherValidator = new ByteLengthValidator();
otherValidator.setEncoding("ISO-8859-1");
otherValidator.setMaximum(100);
- otherValidator.setMaximumMessageDetail("MaxMessage");
+ otherValidator.setMessageDetailMaximum("MaxMessage");
doTestEquals(validator, otherValidator, true);
assertEquals(validator.hashCode(), otherValidator.hashCode());
//2
otherValidator.setMaximum(150);
validator.setMaximum(150);
- validator.setMaximumMessageDetail("MaxMessage1");
- otherValidator.setMaximumMessageDetail("MaxMessage1");
+ validator.setMessageDetailMaximum("MaxMessage1");
+ otherValidator.setMessageDetailMaximum("MaxMessage1");
doTestEquals(validator, otherValidator, true);
assertEquals(validator.hashCode(), otherValidator.hashCode());
//3
otherValidator.setMaximum(200);
- otherValidator.setMaximumMessageDetail("MaxMessage");
+ otherValidator.setMessageDetailMaximum("MaxMessage");
doTestEquals(validator, otherValidator, false);
assertEquals(false, (validator.hashCode() == otherValidator.hashCode()));
}
@@ -194,7 +194,7 @@
setMockLabelForComponent(wrapper);
ByteLengthValidator validator = new ByteLengthValidator();
int maxBytes[] = {3};
- validator.setMaximumMessageDetail("\"{1}\"" + _IS_GREATER
+ validator.setMessageDetailMaximum("\"{1}\"" + _IS_GREATER
+ maxBytes[0]);
//some very basic sanity test
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java Thu Oct 26 15:42:18 2006
@@ -183,7 +183,7 @@
try
{
setFacesContext(facesContext);
- validator.setMaximumMessageDetail("max set");
+ validator.setMessageDetailMaximum("max set");
validator.validate(facesContext, component, new Date(millis + 1));
fail("ValidatorException not thrown");
}
@@ -239,7 +239,7 @@
try
{
setFacesContext(facesContext);
- validator.setMinimumMessageDetail("min set");
+ validator.setMessageDetailMinimum("min set");
validator.validate(facesContext, component, new Date(millis - 1));
fail("ValidatorException not thrown");
}
@@ -305,7 +305,7 @@
try
{
setFacesContext(facesContext);
- validator.setMinimumMessageDetail("min");
+ validator.setMessageDetailMinimum("min");
validator.validate(facesContext, component, new Date(millis - 1));
fail("ValidatorException not thrown");
}
@@ -342,7 +342,7 @@
try
{
setFacesContext(facesContext);
- validator.setNotInRangeMessageDetail("not in range is set");
+ validator.setMessageDetailNotInRange("not in range is set");
validator.validate(facesContext, component, new Date(millis + 20));
fail("ValidatorException not thrown");
}
@@ -371,9 +371,9 @@
originalValidator.setMinimum(new Date(millis));
originalValidator.setMaximum(new Date(millis + 10));
- originalValidator.setMinimumMessageDetail("min");
- originalValidator.setMaximumMessageDetail("max");
- originalValidator.setNotInRangeMessageDetail("not in range");
+ originalValidator.setMessageDetailMinimum("min");
+ originalValidator.setMessageDetailMaximum("max");
+ originalValidator.setMessageDetailNotInRange("not in range");
Mock mock = buildMockUIComponent();
UIComponent component = (UIComponent) mock.proxy();
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/RegExpValidatorTest.java Thu Oct 26 15:42:18 2006
@@ -185,7 +185,7 @@
MockUIComponentWrapper wrapper = new MockUIComponentWrapper(mock, component);
validator.setPattern("TestSaveRestore");
- validator.setNoMatchMessageDetail("\"{0}\" in \"{1}\" failed!! {4}");
+ validator.setMessageDetailNoMatch("\"{0}\" in \"{1}\" failed!! {4}");
RegExpValidator restoreValidator = new RegExpValidator();
doTestStateHolderSaveRestore(validator, restoreValidator,
@@ -203,9 +203,9 @@
assertEquals(validator.hashCode(), otherValidator.hashCode());
validator.setPattern("[0-9]");
- validator.setNoMatchMessageDetail("\"{0}\" in \"{1}\" failed!! {4}");
+ validator.setMessageDetailNoMatch("\"{0}\" in \"{1}\" failed!! {4}");
otherValidator.setPattern("[0-9]");
- otherValidator.setNoMatchMessageDetail("\"{0}\" in \"{1}\" failed!! {4}");
+ otherValidator.setMessageDetailNoMatch("\"{0}\" in \"{1}\" failed!! {4}");
doTestEquals(validator, otherValidator, true);
assertEquals(validator.hashCode(), otherValidator.hashCode());
@@ -223,7 +223,7 @@
RegExpValidator validator = new RegExpValidator();
validator.setPattern("[0-9]*");
- validator.setNoMatchMessageDetail("\"{0}\" in \"{1}\" failed!! {4}");
+ validator.setMessageDetailNoMatch("\"{0}\" in \"{1}\" failed!! {4}");
//some very basic sanity test
try
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Color.xml Thu Oct 26 15:42:18 2006
@@ -77,7 +77,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertMessageDetail</property-name>
+ <property-name>messageDetailConvert</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml Thu Oct 26 15:42:18 2006
@@ -50,7 +50,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertDateMessageDetail</property-name>
+ <property-name>messageDetailConvertDate</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -83,7 +83,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertTimeMessageDetail</property-name>
+ <property-name>messageDetailConvertTime</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -116,7 +116,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertBothMessageDetail</property-name>
+ <property-name>messageDetailConvertBoth</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml Thu Oct 26 15:42:18 2006
@@ -58,7 +58,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertCurrencyMessageDetail</property-name>
+ <property-name>messageDetailConvertCurrency</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -88,7 +88,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertNumberMessageDetail</property-name>
+ <property-name>messageDetailConvertNumber</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -120,7 +120,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertPatternMessageDetail</property-name>
+ <property-name>messageDetailConvertPattern</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -151,7 +151,7 @@
</ul>
</p></html>]]>
</description>
- <property-name>convertPercentMessageDetail</property-name>
+ <property-name>messageDetailConvertPercent</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
Added: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/javax/faces/DoubleRange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/javax/faces/DoubleRange.xml?view=auto&rev=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/javax/faces/DoubleRange.xml (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/javax/faces/DoubleRange.xml Thu Oct 26 15:42:18 2006
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml">
+ <validator>
+ <validator-id>javax.faces.DoubleRange</validator-id>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.DoubleRangeValidator</validator-class>
+ </validator>
+</faces-config>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml Thu Oct 26 15:42:18 2006
@@ -66,7 +66,7 @@
</ul>
</p>]]>
</description>
- <property-name>maximumMessageDetail</property-name>
+ <property-name>messageDetailMaximum</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml Thu Oct 26 15:42:18 2006
@@ -69,7 +69,7 @@
</ul>
</p>]]>
</description>
- <property-name>maximumMessageDetail</property-name>
+ <property-name>messageDetailMaximum</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -100,7 +100,7 @@
</ul>
</p>]]>
</description>
- <property-name>minimumMessageDetail</property-name>
+ <property-name>messageDetailMinimum</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -135,7 +135,7 @@
</ul>
</p>]]>
</description>
- <property-name>notInRangeMessageDetail</property-name>
+ <property-name>messageDetailNotInRange</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
@@ -165,7 +165,7 @@
<tr:validateDateTimeRange
minimum="2004-11-16"
maximum="2004-12-16"
- notInRangeMessageDetail="Date "{1}" does not fall within the range {2} : {3}"/>
+ messageDetailNotInRange="Date "{1}" does not fall within the range {2} : {3}"/>
</tr:inputDate>]]>
</mfp:source-code>
</mfp:example>
Added: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml?view=auto&rev=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml Thu Oct 26 15:42:18 2006
@@ -0,0 +1,170 @@
+<?xml version="1.0" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+ <validator>
+ <description><![CDATA[Validate that the date entered is within a given range.]]></description>
+ <display-name>validateDoubleRange</display-name>
+ <validator-id>org.apache.myfaces.trinidad.DoubleRange</validator-id>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.DoubleRangeValidator</validator-class>
+ <property>
+ <description><![CDATA[the maximum .]]>
+ </description>
+ <property-name>maximum</property-name>
+ <property-class>double</property-class>
+ <property-extension/>
+ </property>
+ <property>
+ <description><![CDATA[The minimum .]]>
+ </description>
+ <property-name>minimum</property-name>
+ <property-class>double</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ when input value exceeds the <code>maximum</code> value
+ set.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the maximum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailMaximum</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ when input value is less than the set <code>minimum</code>
+ value.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the minimum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailMinimum</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ if input value is not with in the range, when
+ <code>minimum</code> and <code>maximum</code> is
+ set.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the minimum allowed date
+ </li>
+ <li>
+ {3} the maximum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailNotInRange</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <validator-extension>
+ <mfp:tag-name>tr:validateDoubleRange</mfp:tag-name>
+ <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.validator.ValidateDoubleRangeTag</mfp:tag-class>
+ <mfp:long-description><![CDATA[<html:p>
+
+ Validate that the date entered is within a given range.
+</html:p>]]></mfp:long-description>
+ <mfp:example>
+ <mfp:source-code><![CDATA[<tr:inputDate id="mdf3" value="#{date.date3}"
+ label="max validator">
+ <tr:validateDoubleRange maximum="#{date.maxDate}"/>
+</tr:inputDate>
+
+<tr:inputDate id="mdf3" value="2004-11-25"
+ tip="min=2004-11-16 max=2004-12-16"
+ label="Submission period">
+ <tr:convertDateTime pattern="yyyy-MM-dd"/>
+
+ <!-- Supports ISO date format strings of the form "yyyy-MM-dd" -->
+ <tr:validateDoubleRange
+ minimum="2004-11-16"
+ maximum="2004-12-16"
+ notInRangeMessageDetail="Date "{1}" does not fall within the range {2} : {3}"/>
+</tr:inputDate>]]>
+ </mfp:source-code>
+ </mfp:example>
+ <mfp:author>Matthias Wessendorf</mfp:author>
+ <mfp:uix2-local-name>validateDoubleRange</mfp:uix2-local-name>
+ </validator-extension>
+ </validator>
+</faces-config>
\ No newline at end of file
Added: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml?view=auto&rev=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml Thu Oct 26 15:42:18 2006
@@ -0,0 +1,170 @@
+<?xml version="1.0" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:tr="http://myfaces.apache.org/trinidad"
+ xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+ <validator>
+ <description><![CDATA[Validate that the date entered is within a given range.]]></description>
+ <display-name>validateLength</display-name>
+ <validator-id>org.apache.myfaces.trinidad.Length</validator-id>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.LengthValidator</validator-class>
+ <property>
+ <description><![CDATA[the maximum .]]>
+ </description>
+ <property-name>maximum</property-name>
+ <property-class>int</property-class>
+ <property-extension/>
+ </property>
+ <property>
+ <description><![CDATA[The minimum .]]>
+ </description>
+ <property-name>minimum</property-name>
+ <property-class>int</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ when input value exceeds the <code>maximum</code> value
+ set.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the maximum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailMaximum</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ when input value is less than the set <code>minimum</code>
+ value.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the minimum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailMinimum</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[<p>
+ The detail error message to be used for constructing faces messages,
+ if input value is not with in the range, when
+ <code>minimum</code> and <code>maximum</code> is
+ set.
+ </p>
+ <p>
+ <strong>
+ Parameters:
+ </strong>
+ <ul>
+ <li>
+ {0} the label that identifies the component
+ </li>
+ <li>
+ {1} value entered by the user
+ </li>
+ <li>
+ {2} the minimum allowed date
+ </li>
+ <li>
+ {3} the maximum allowed date
+ </li>
+ </ul>
+ </p>]]>
+ </description>
+ <property-name>messageDetailNotInRange</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
+ <validator-extension>
+ <mfp:tag-name>tr:validateLength</mfp:tag-name>
+ <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.validator.ValidateLengthTag</mfp:tag-class>
+ <mfp:long-description><![CDATA[<html:p>
+
+ Validate that the date entered is within a given range.
+</html:p>]]></mfp:long-description>
+ <mfp:example>
+ <mfp:source-code><![CDATA[<tr:inputDate id="mdf3" value="#{date.date3}"
+ label="max validator">
+ <tr:validateLength maximum="#{date.maxDate}"/>
+</tr:inputDate>
+
+<tr:inputDate id="mdf3" value="2004-11-25"
+ tip="min=2004-11-16 max=2004-12-16"
+ label="Submission period">
+ <tr:convertDateTime pattern="yyyy-MM-dd"/>
+
+ <!-- Supports ISO date format strings of the form "yyyy-MM-dd" -->
+ <tr:validateLength
+ minimum="2004-11-16"
+ maximum="2004-12-16"
+ notInRangeMessageDetail="Date "{1}" does not fall within the range {2} : {3}"/>
+</tr:inputDate>]]>
+ </mfp:source-code>
+ </mfp:example>
+ <mfp:author>Matthias Wessendorf</mfp:author>
+ <mfp:uix2-local-name>validateLength</mfp:uix2-local-name>
+ </validator-extension>
+ </validator>
+</faces-config>
\ No newline at end of file
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml Thu Oct 26 15:42:18 2006
@@ -55,7 +55,7 @@
</ul>
</p>]]>
</description>
- <property-name>noMatchMessageDetail</property-name>
+ <property-name>messageDetailNoMatch</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
<mfp:property-metadata>
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/clientConvert.jspx Thu Oct 26 15:42:18 2006
@@ -99,15 +99,15 @@
<f:facet name="help">
<tr:outputText value="examples of values that will fail validation: '4' or '7'"/>
</f:facet>
- <f:validateLongRange minimum="5" maximum="6"/>
+ <tr:validateLongRange minimum="5" maximum="6"/>
</tr:inputText>
- <!--tr:inputText value="#{clientValidation.double3}"
+ <tr:inputText value="#{clientValidation.double3}"
label="double range validator">
<f:facet name="help">
- <tr:outputText value="examples of values that will fail validation: '4' or '7'"/>
+ <tr:outputText value="examples of values that will fail validation: '5.1' or '6.8'"/>
</f:facet>
- <f:validateDoubleRange minimum="5.2" maximum="6.7"/>
- </tr:inputText-->
+ <tr:validateDoubleRange minimum="5.2" maximum="6.7"/>
+ </tr:inputText>
<tr:inputText value="#{clientValidation.regExpValue}"
label="reg exp validator">
<f:facet name="help">
@@ -115,13 +115,13 @@
</f:facet>
<tr:validateRegExp pattern="[9]"/>
</tr:inputText>
- <!--tr:inputText value="#{clientValidation.lengthValue}"
+ <tr:inputText value="#{clientValidation.lengthValue}"
label="length validator">
<f:facet name="help">
<tr:outputText value="values longer than 4 will fail, for example: '44444444' or 'Seven'"/>
</f:facet>
- <f:validateLength maximum="4"/>
- </tr:inputText-->
+ <tr:validateLength maximum="4"/>
+ </tr:inputText>
<tr:inputText value="#{clientValidation.byteLengthValue}"
label="byte length validator">
<f:facet name="help">
@@ -129,14 +129,14 @@
</f:facet>
<tr:validateByteLength encoding="ISO-8859-1" maximum="4"/>
</tr:inputText>
- <!--tr:inputText value="#{clientValidation.date}"
+ <tr:inputText value="#{clientValidation.date}"
label="date range validator">
<f:facet name="help">
<tr:outputText value="examples of values that will fail validation: 11-11-11"/>
</f:facet>
<tr:validateDateTimeRange minimum="2004-11-16"
maximum="2004-12-16"/>
- </tr:inputText-->
+ </tr:inputText>
</tr:panelFormLayout>
<tr:panelHeader text="Required"/>
<tr:spacer height="10"/>
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidate.jspx Thu Oct 26 15:42:18 2006
@@ -102,7 +102,7 @@
<tr:convertDateTime pattern="yyyy-MM-dd"/>
<tr:validateDateTimeRange minimum="2004-11-16"
maximum="2004-12-16"
- notInRangeMessageDetail='Date "{1}" does not fall within {2} : {3}'/>
+ messageDetailNotInRange='Date "{1}" does not fall within {2} : {3}'/>
</tr:inputDate>
</tr:panelFormLayout>
</tr:panelHeader>
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/convertValidate/convertValidateMessageCustomization.jspx Thu Oct 26 15:42:18 2006
@@ -46,7 +46,7 @@
<tr:outputText value="Enter your three digit pin"/>
</f:facet>
<tr:validateRegExp pattern="[1-9][0-9][0-9]"
- noMatchMessageDetail="#{messageCustomization.messages.PIN_NO_MATCH_ID}"/>
+ messageDetailNoMatch="#{messageCustomization.messages.PIN_NO_MATCH_ID}"/>
</tr:inputText>
</tr:panelFormLayout>
<tr:panelHeader text="Message customization on byte length validator"/>
@@ -57,7 +57,7 @@
<tr:outputText value="Enter your name. It should not exceed 4 characters"/>
</f:facet>
<tr:validateByteLength encoding="ISO-8859-1" maximum="4"
- maximumMessageDetail='The "{0}" "{1}" exceeds {2} characters'/>
+ messageDetailMaximum='The "{0}" "{1}" exceeds {2} characters'/>
</tr:inputText>
</tr:panelFormLayout>
<tr:panelHeader text="Message customization on date time range validator"/>
@@ -69,9 +69,9 @@
<tr:outputText value="min=#{messageCustomization.minDateTip}"/>
</f:facet>
<tr:validateDateTimeRange minimum="#{messageCustomization.minDate}"
- maximumMessageDetail='Date "{1}" in "{0}" is farther than {2}'
- minimumMessageDetail='Date "{1}" in "{0}" is before the accepted date - {2} for receving forms. '
- notInRangeMessageDetail='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}'/>
+ messageDetailMaximum='Date "{1}" in "{0}" is farther than {2}'
+ messageDetailMinimum='Date "{1}" in "{0}" is before the accepted date - {2} for receving forms. '
+ messageDetailNotInRange='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}'/>
</tr:inputDate>
<tr:inputDate id="mdf4"
value="#{messageCustomization.date1}"
@@ -80,9 +80,9 @@
<tr:outputText value="max=#{messageCustomization.maxDateTip}"/>
</f:facet>
<tr:validateDateTimeRange maximum="#{date.maxDate}"
- maximumMessageDetail='The date "{1}" in "{0}" which you have chosen, falls after the final acceptable date - {2}.'
- minimumMessageDetail='Date "{1}" in "{0}" is less than the minimum acceptable: {2}.'
- notInRangeMessageDetail='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}.'/>
+ messageDetailMaximum='The date "{1}" in "{0}" which you have chosen, falls after the final acceptable date - {2}.'
+ messageDetailMinimum='Date "{1}" in "{0}" is less than the minimum acceptable: {2}.'
+ messageDetailNotInRange='Date "{1}" in "{0}" not within minimum {2} and maximum range {3}.'/>
</tr:inputDate>
<tr:inputDate id="mdf5"
value="#{messageCustomization.date1}"
@@ -92,7 +92,7 @@
</f:facet>
<tr:validateDateTimeRange minimum="#{messageCustomization.minDate}"
maximum="#{messageCustomization.maxDate}"
- notInRangeMessageDetail='Submission date "{1}" in "{0}" is not with in the specified period {2}-{3}.'/>
+ messageDetailNotInRange='Submission date "{1}" in "{0}" is not with in the specified period {2}-{3}.'/>
</tr:inputDate>
</tr:panelFormLayout>
<tr:panelHeader text="Message customization on color converter"/>
@@ -103,7 +103,7 @@
<tr:outputText value="HTML hex color pattern:#RRGGBB"/>
</f:facet>
<tr:convertColor patterns="#RRGGBB" transparentAllowed="true"
- convertMessageDetail='The color "{1}" you have chosen in "{0}" is not a valid HTML hex pattern {2}.'/>
+ messageDetailConvert='The color "{1}" you have chosen in "{0}" is not a valid HTML hex pattern {2}.'/>
</tr:inputColor>
</tr:panelFormLayout>
<tr:panelHeader text="Message customization on date time converter"/>
@@ -116,9 +116,9 @@
<!--All custom messages need not be set. It is just enough if we set 'convertDateMessageDetail' -->
<tr:convertDateTime secondaryPattern="d/M/yyyy"
pattern="yyyy/M/d"
- convertDateMessageDetail='"{1}" in "{0}" is not a valid date. Example is {2}'
- convertTimeMessageDetail='"{1}" in "{0}", is not valid date. Example is {2}.'
- convertBothMessageDetail='"{1}" in "{0}", is not valid Date and time. The format is {2}.'/>
+ messageDetailConvertDate='"{1}" in "{0}" is not a valid date. Example is {2}'
+ messageDetailConvertTime='"{1}" in "{0}", is not valid date. Example is {2}.'
+ messageDetailConvertBoth='"{1}" in "{0}", is not valid Date and time. The format is {2}.'/>
</tr:inputDate>
<tr:inputDate id="mdf7" value="11:36:15 AM"
label="Time of birth">
@@ -126,7 +126,7 @@
<tr:outputText value="11:36:15 AM"/>
</f:facet>
<tr:convertDateTime type="time" timeStyle="medium"
- convertTimeMessageDetail='"{1}" in "{0}", is not a valid time. Example: {2}.'/>
+ messageDetailConvertTime='"{1}" in "{0}", is not a valid time. Example: {2}.'/>
</tr:inputDate>
<tr:inputDate id="mdf8" value="12/20/2004 8:11 AM"
label="Date and time of birth">
@@ -134,7 +134,7 @@
<tr:outputText value="2/26/2005 8:11 AM"/>
</f:facet>
<tr:convertDateTime type="both"
- convertBothMessageDetail='"{1}" in "{0}", is not a valid Date and time. Example: {2}.'/>
+ messageDetailConvertBoth='"{1}" in "{0}", is not a valid Date and time. Example: {2}.'/>
</tr:inputDate>
</tr:panelFormLayout>
<tr:panelHeader text="Message customization on number converter"/>
@@ -144,10 +144,10 @@
<tr:outputText value="type='number' locale='en_US' Valid input=44444456 Invalid value=555o"/>
</f:facet>
<tr:convertNumber type="number" locale="en_US"
- convertCurrencyMessageDetail='"{1}" in "{0}" is not a valid currency value.'
- convertNumberMessageDetail='"{1}" in "{0}" is not valid. Please choose a number.'
- convertPatternMessageDetail='"{1}" in "{0}" does not match the pattern {2}'
- convertPercentMessageDetail='"{1}" in "{0}" is not a valid percentile.'/>
+ messageDetailConvertCurrency='"{1}" in "{0}" is not a valid currency value.'
+ messageDetailConvertNumber='"{1}" in "{0}" is not valid. Please choose a number.'
+ messageDetailConvertPattern='"{1}" in "{0}" does not match the pattern {2}'
+ messageDetailConvertPercent='"{1}" in "{0}" is not a valid percentile.'/>
</tr:inputText>
<tr:inputText value="5%" label="Machine efficieny"
readOnly="false">
@@ -155,14 +155,14 @@
<tr:outputText value="type='percent' locale='en_US' Valid value=75% Invalid value=75"/>
</f:facet>
<tr:convertNumber type="percent" locale="en_US"
- convertPercentMessageDetail='"{1}" in "{0}" is not a valid efficiency value.'/>
+ messageDetailConvertPercent='"{1}" in "{0}" is not a valid efficiency value.'/>
</tr:inputText>
<tr:inputText value="10.88" label="Pattern based number">
<f:facet name="help">
<tr:outputText value="'pattern=##.000' locale='en_US' Invalid value=10e.88"/>
</f:facet>
<tr:convertNumber pattern="##.000" locale="en_US"
- convertPatternMessageDetail='"{1}" in "{0}" does not match pattern {2}.'/>
+ messageDetailConvertPattern='"{1}" in "{0}" does not match pattern {2}.'/>
</tr:inputText>
</tr:panelFormLayout>
</tr:panelHeader>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ByteConverter.java Thu Oct 26 15:42:18 2006
@@ -125,5 +125,5 @@
private static final String _BYTE_MAX = Byte.toString(Byte.MAX_VALUE);
private static final String _BYTE_MIN = Byte.toString(Byte.MIN_VALUE);
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Thu Oct 26 15:42:18 2006
@@ -155,7 +155,7 @@
}
String patternsString = patterns.toString();
- sb.append("new RGBColorFormat(");
+ sb.append("new TrColorConverter(");
_appendPatternsArg(sb);
@@ -247,7 +247,7 @@
private FacesMessage _getConvertFacesMessage(FacesContext context)
{
- String convMsgDet = getConvertMessageDetail();
+ String convMsgDet = getMessageDetailConvert();
// will get replaced in javascript
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Thu Oct 26 15:42:18 2006
@@ -183,10 +183,11 @@
String minId,
String defaultId,
String maxVal,
- String minVal)
+ String minVal,
+ String type)
{
return _getClientConversion(context, component, maxId, minId, defaultId,
- maxVal, minVal, false);
+ maxVal, minVal, false, type);
}
public static String getClientConversion(
@@ -199,7 +200,7 @@
String minVal)
{
return _getClientConversion(context, component, maxId, minId, defaultId,
- maxVal, minVal, true);
+ maxVal, minVal, true, null);
}
private static String _getClientConversion(
@@ -210,14 +211,15 @@
String defaultId,
String maxVal,
String minVal,
- boolean isConverter)
+ boolean isConverter,
+ String validatorType)
{
StringBuffer outBuffer = new StringBuffer(250);
if (isConverter)
- outBuffer.append("new NumberConverter(");
+ outBuffer.append("new TrNumberConverter(");
else
- outBuffer.append("new DecimalValidator(");
+ outBuffer.append("new " + validatorType + "(");
outBuffer.append("{LV:'");
FacesMessage maxMessage =
@@ -267,7 +269,7 @@
{
StringBuffer outBuffer = new StringBuffer(250);
- outBuffer.append("new NumberConverter(");
+ outBuffer.append("new TrNumberConverter(");
outBuffer.append("{D:'");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Thu Oct 26 15:42:18 2006
@@ -226,7 +226,7 @@
detailMessage.length() +
summaryMessage.length() +
exampleString.length());
- outBuffer.append("new SimpleDateFormat("); // 21
+ outBuffer.append("new TrDateTimeConverter("); // 21
outBuffer.append(jsPattern); // jsPattern.length
outBuffer.append(",null,'"); // 7
outBuffer.append(summaryMessage); // summary message.length
@@ -524,6 +524,6 @@
private static final String _GMT_MINUS = "GMT-";
private static final int _MILLIS_PER_HOUR = 60 * 60 * 1000;
private static final int _MILLIS_PER_MINUTE = 60 * 1000;
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList("SimpleDateFormat()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList("TrDateTimeConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DoubleConverter.java Thu Oct 26 15:42:18 2006
@@ -90,6 +90,6 @@
return null;
}
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/FloatConverter.java Thu Oct 26 15:42:18 2006
@@ -90,5 +90,5 @@
return null;
}
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/IntegerConverter.java Thu Oct 26 15:42:18 2006
@@ -24,7 +24,7 @@
import javax.faces.convert.ConverterException;
import org.apache.myfaces.trinidad.convert.ClientConverter;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
@@ -136,5 +136,5 @@
private static final String _INT_MAX
= IntegerUtils.getString(Integer.MAX_VALUE);
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/LongConverter.java Thu Oct 26 15:42:18 2006
@@ -25,7 +25,7 @@
import javax.faces.convert.ConverterException;
import org.apache.myfaces.trinidad.convert.ClientConverter;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
@@ -131,5 +131,5 @@
= IntegerUtils.getString(Long.MIN_VALUE);
private static final String _LONG_MAX
= IntegerUtils.getString(Long.MAX_VALUE);
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ShortConverter.java Thu Oct 26 15:42:18 2006
@@ -127,5 +127,5 @@
private static final String _SHORT_MAX = Short.toString(Short.MAX_VALUE);
private static final String _SHORT_MIN = Short.toString(Short.MIN_VALUE);
- private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
+ private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/SecondaryWindowHelpProvider.java Thu Oct 26 15:42:18 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.el;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
/**
* <p>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -31,7 +31,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
import org.apache.myfaces.trinidadinternal.image.painter.FontUtils;
@@ -144,9 +143,9 @@
// Store width/height for client
responseProperties.put(WIDTH_RESPONSE_KEY,
- IntegerUtils.getInteger(width));
+ width);
responseProperties.put(HEIGHT_RESPONSE_KEY,
- IntegerUtils.getInteger(height));
+ height);
return paintImage;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/BaseColorizedIconKey.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/BaseColorizedIconKey.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/BaseColorizedIconKey.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/BaseColorizedIconKey.java Thu Oct 26 15:42:18 2006
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
/**
@@ -149,12 +149,11 @@
*/
public Map<Object, Object> getRenderProperties(ImageContext context)
{
- ArrayMap<Object, Object> properties = new ArrayMap<Object, Object>(_MAP_SIZE);
+ Map<Object, Object> properties = new ArrayMap<Object, Object>(_MAP_SIZE);
properties.put(ImageConstants.SOURCE_KEY, getSource());
properties.put(getColorKey(), getColor());
properties.put(SURROUNDING_COLOR_KEY, _surroundingColor);
- properties.put(ImageConstants.DIRECTION_KEY,
- IntegerUtils.getInteger(_direction));
+ properties.put(ImageConstants.DIRECTION_KEY, _direction);
properties.put(LAF_KEY, _lookAndFeel);
return properties;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java Thu Oct 26 15:42:18 2006
@@ -63,7 +63,7 @@
import org.apache.myfaces.trinidadinternal.share.xml.XMLProvider;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
import org.apache.myfaces.trinidadinternal.style.util.GraphicsUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
@@ -1693,10 +1693,8 @@
// We've got a GIF - get the width/height
int width = (data[6] | (data[7] << 8));
int height = (data[8] | (data[9] << 8));
- responseProperties.put(WIDTH_RESPONSE_KEY,
- IntegerUtils.getInteger(width));
- responseProperties.put(HEIGHT_RESPONSE_KEY,
- IntegerUtils.getInteger(height));
+ responseProperties.put(WIDTH_RESPONSE_KEY, width);
+ responseProperties.put(HEIGHT_RESPONSE_KEY, height);
return data;
}