jmcnally 02/04/08 18:08:14
Modified: src/services/org/apache/fulcrum/intake/model
DateStringField.java
src/services/org/apache/fulcrum/intake/validator
DateStringValidator.java
Log:
use the first rule given for processing a string date as the format for
presentation
Revision Changes Path
1.3 +21 -2
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/DateStringField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DateStringField.java 18 Nov 2001 19:18:59 -0000 1.2
+++ DateStringField.java 9 Apr 2002 01:08:13 -0000 1.3
@@ -78,7 +78,7 @@
{
super(field, group);
- if ( validator == null )
+ if ( validator == null || !(validator instanceof DateStringValidator))
{
df = DateFormat.getInstance();
df.setLenient(true);
@@ -122,7 +122,7 @@
try
{
// FIXME: Canonicalize user-entered date strings.
- if ( df == null ) // guarantees validator != null
+ if (validator != null && validator instanceof DateStringValidator)
{
date = ((DateStringValidator)validator).parse(dateString);
}
@@ -136,5 +136,24 @@
//ignore, return null
}
return date;
+ }
+
+ public String toString()
+ {
+ String s = null;
+ Object value = getValue();
+ if (value instanceof String)
+ {
+ s = (String)value;
+ }
+ else if (validator != null && validator instanceof DateStringValidator)
+ {
+ s= ((DateStringValidator)validator).format((Date)value);
+ }
+ else
+ {
+ s = df.format((Date)value);
+ }
+ return s;
}
}
1.3 +6 -1
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/validator/DateStringValidator.java
Index: DateStringValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/validator/DateStringValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DateStringValidator.java 1 Oct 2001 02:21:10 -0000 1.2
+++ DateStringValidator.java 9 Apr 2002 01:08:14 -0000 1.3
@@ -81,7 +81,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: DateStringValidator.java,v 1.2 2001/10/01 02:21:10 jmcnally Exp $
+ * @version $Id: DateStringValidator.java,v 1.3 2002/04/09 01:08:14 jmcnally Exp $
*/
public class DateStringValidator
extends DefaultValidator
@@ -215,6 +215,11 @@
return date;
}
+ public String format(Date date)
+ {
+ sdf.applyPattern((String)dateFormats.get(0));
+ return sdf.format(date);
+ }
// ************************************************************
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
