Author: matzew
Date: Thu Jan 18 03:26:47 2007
New Revision: 497402
URL: http://svn.apache.org/viewvc?view=rev&rev=497402
Log:
updating some details regarding the hints (changing property names and avoid to
send to many messages (added notInRange for the max/min validators)
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java?view=diff&rev=497402&r1=497401&r2=497402
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
Thu Jan 18 03:26:47 2007
@@ -463,7 +463,7 @@
* Overrides default hint message
* @param hintFormat Custom hint message.
*/
- public void setHintFormat(String hintFormat)
+ public void setHint(String hintFormat)
{
_facesBean.setProperty(_HINT_FORMAT_KEY, hintFormat);
}
@@ -473,7 +473,7 @@
* @return Custom hint message.
* @see #setHintFormat(String)
*/
- public String getHintFormat()
+ public String getHint()
{
Object obj = _facesBean.getProperty(_HINT_FORMAT_KEY);
return ComponentUtils.resolveString(obj);
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java?view=diff&rev=497402&r1=497401&r2=497402
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
Thu Jan 18 03:26:47 2007
@@ -313,6 +313,27 @@
}
/**
+ * <p>Custom hint notInRange message.</p>
+ * Overrides default hint message
+ * @param hintNotInRange Custom hint message.
+ */
+ public void setHintNotInRange(String hintNotInRange)
+ {
+ _facesBean.setProperty(_HINT_NOT_IN_RANGE, hintNotInRange);
+ }
+
+ /**
+ * <p>Return custom hint notInRange message.</p>
+ * @return Custom hint message.
+ * @see #setHintNotInRangeString)
+ */
+ public String getHintNotInRange()
+ {
+ Object obj = _facesBean.getProperty(_HINT_NOT_IN_RANGE);
+ return ComponentUtils.resolveString(obj);
+ }
+
+ /**
* @exception NullPointerException [EMAIL PROTECTED]
* @exception ValidatorException [EMAIL PROTECTED]
* @exception IllegalArgumentException if <code>value</code> is not of type
@@ -621,6 +642,9 @@
private static final PropertyKey _HINT_MINIMUM_KEY =
_TYPE.registerKey("hintMinimum", String.class);
+
+ private static final PropertyKey _HINT_NOT_IN_RANGE =
+ _TYPE.registerKey("hintNotInRange", String.class);
private FacesBean _facesBean = ValidatorUtils.getFacesBean(_TYPE);
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java?view=diff&rev=497402&r1=497401&r2=497402
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DoubleRangeValidator.java
Thu Jan 18 03:26:47 2007
@@ -269,6 +269,27 @@
return ComponentUtils.resolveString(obj);
}
+ /**
+ * <p>Custom hint notInRange message.</p>
+ * Overrides default hint message
+ * @param hintNotInRange Custom hint message.
+ */
+ public void setHintNotInRange(String hintNotInRange)
+ {
+ _facesBean.setProperty(_HINT_NOT_IN_RANGE, hintNotInRange);
+ }
+
+ /**
+ * <p>Return custom hint notInRange message.</p>
+ * @return Custom hint message.
+ * @see #setHintNotInRangeString)
+ */
+ public String getHintNotInRange()
+ {
+ Object obj = _facesBean.getProperty(_HINT_NOT_IN_RANGE);
+ return ComponentUtils.resolveString(obj);
+ }
+
@Override
public void validate(
FacesContext context,
@@ -473,6 +494,9 @@
private static final PropertyKey _HINT_MINIMUM_KEY =
_TYPE.registerKey("hintMinimum", String.class);
+
+ private static final PropertyKey _HINT_NOT_IN_RANGE =
+ _TYPE.registerKey("hintNotInRange", String.class);
private FacesBean _facesBean = ValidatorUtils.getFacesBean(_TYPE);
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java?view=diff&rev=497402&r1=497401&r2=497402
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LengthValidator.java
Thu Jan 18 03:26:47 2007
@@ -269,6 +269,27 @@
return ComponentUtils.resolveString(obj);
}
+ /**
+ * <p>Custom hint notInRange message.</p>
+ * Overrides default hint message
+ * @param hintNotInRange Custom hint message.
+ */
+ public void setHintNotInRange(String hintNotInRange)
+ {
+ _facesBean.setProperty(_HINT_NOT_IN_RANGE, hintNotInRange);
+ }
+
+ /**
+ * <p>Return custom hint notInRange message.</p>
+ * @return Custom hint message.
+ * @see #setHintNotInRangeString)
+ */
+ public String getHintNotInRange()
+ {
+ Object obj = _facesBean.getProperty(_HINT_NOT_IN_RANGE);
+ return ComponentUtils.resolveString(obj);
+ }
+
@Override
public void validate(
FacesContext context,
@@ -473,6 +494,9 @@
private static final PropertyKey _HINT_MINIMUM_KEY =
_TYPE.registerKey("hintMinimum", String.class);
+
+ private static final PropertyKey _HINT_NOT_IN_RANGE =
+ _TYPE.registerKey("hintNotInRange", String.class);
private FacesBean _facesBean = ValidatorUtils.getFacesBean(_TYPE);
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java?view=diff&rev=497402&r1=497401&r2=497402
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/LongRangeValidator.java
Thu Jan 18 03:26:47 2007
@@ -271,6 +271,27 @@
return ComponentUtils.resolveString(obj);
}
+ /**
+ * <p>Custom hint notInRange message.</p>
+ * Overrides default hint message
+ * @param hintNotInRange Custom hint message.
+ */
+ public void setHintNotInRange(String hintNotInRange)
+ {
+ _facesBean.setProperty(_HINT_NOT_IN_RANGE, hintNotInRange);
+ }
+
+ /**
+ * <p>Return custom hint notInRange message.</p>
+ * @return Custom hint message.
+ * @see #setHintNotInRangeString)
+ */
+ public String getHintNotInRange()
+ {
+ Object obj = _facesBean.getProperty(_HINT_NOT_IN_RANGE);
+ return ComponentUtils.resolveString(obj);
+ }
+
@Override
public void validate(
FacesContext context,
@@ -475,6 +496,9 @@
private static final PropertyKey _HINT_MINIMUM_KEY =
_TYPE.registerKey("hintMinimum", String.class);
+
+ private static final PropertyKey _HINT_NOT_IN_RANGE =
+ _TYPE.registerKey("hintNotInRange", String.class);
private FacesBean _facesBean = ValidatorUtils.getFacesBean(_TYPE);
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=497402&r1=497401&r2=497402
==============================================================================
---
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 Jan 18 03:26:47 2007
@@ -252,7 +252,7 @@
* Overrides default hint message
* @param hintPattern Custom hint message.
*/
- public void setHintPattern(String hintPattern)
+ public void setHint(String hintPattern)
{
_facesBean.setProperty(_HINT_PATTERN_KEY, hintPattern);
}
@@ -262,7 +262,7 @@
* @return Custom hint message.
* @see #setHintPattern(String)
*/
- public String getHintPattern()
+ public String getHint()
{
Object obj = _facesBean.getProperty(_HINT_PATTERN_KEY);
return ComponentUtils.resolveString(obj);