oalexeev 01/12/06 09:59:34
Modified: src/share/org/apache/struts/taglib/bean WriteTag.java
Log:
Restore behavior of previous version - print values with toString() method call.
Format code will be used only in situations - 1) format attribute is not empty, 2)
format string according to used value type is defined in resources
Revision Changes Path
1.13 +26 -39
jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java
Index: WriteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WriteTag.java 2001/11/21 18:47:05 1.12
+++ WriteTag.java 2001/12/06 17:59:34 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v 1.12
2001/11/21 18:47:05 oalexeev Exp $
- * $Revision: 1.12 $
- * $Date: 2001/11/21 18:47:05 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v 1.13
2001/12/06 17:59:34 oalexeev Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/12/06 17:59:34 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* output stream, optionally filtering characters that are sensitive in HTML.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12 $ $Date: 2001/11/21 18:47:05 $
+ * @version $Revision: 1.13 $ $Date: 2001/12/06 17:59:34 $
*/
public class WriteTag extends TagSupport {
@@ -300,37 +300,6 @@
if ( value instanceof java.lang.String ) {
return (String)value;
- } else if ( value instanceof java.sql.Timestamp ) {
- if( formatStr==null )
- formatStr = RequestUtils.message(pageContext, this.bundle,
- this.localeKey, TIMESTAMP_FORMAT_KEY
);
- if( formatStr==null )
- format = DateFormat.getDateTimeInstance(
- DateFormat.SHORT, DateFormat.SHORT, locale);
- else
- format = new SimpleDateFormat( formatStr, locale );
- } else if ( value instanceof java.sql.Date ) {
- if( formatStr==null )
- formatStr = RequestUtils.message(pageContext, this.bundle,
- this.localeKey, DATE_FORMAT_KEY );
- if( formatStr==null )
- format = DateFormat.getDateInstance(DateFormat.SHORT,
locale);
- else
- format = new SimpleDateFormat( formatStr, locale );
- } else if ( value instanceof java.sql.Time ) {
- if( formatStr==null )
- formatStr = RequestUtils.message(pageContext, this.bundle,
- this.localeKey, TIME_FORMAT_KEY );
- if( formatStr==null )
- format = DateFormat.getTimeInstance(DateFormat.SHORT,
locale);
- else
- format = new SimpleDateFormat( formatStr, locale );
- } else if ( value instanceof java.util.Date ) {
- if( formatStr==null )
- format = DateFormat.getDateTimeInstance(
- DateFormat.SHORT, DateFormat.SHORT, locale);
- else
- format = new SimpleDateFormat( formatStr, locale );
} else if ( value instanceof Number ) {
if( formatStr==null ) {
if( ( value instanceof Byte ) ||
@@ -357,11 +326,29 @@
throw e;
}
}
- } else {
- return value.toString();
- }
+ } else if ( value instanceof java.util.Date ) {
+ if( formatStr==null ) {
+ if ( value instanceof java.sql.Timestamp ) {
+ formatStr = RequestUtils.message(pageContext,
this.bundle,
+ this.localeKey, TIMESTAMP_FORMAT_KEY
);
+ } else if ( value instanceof java.sql.Date ) {
+ formatStr = RequestUtils.message(pageContext,
this.bundle,
+ this.localeKey, DATE_FORMAT_KEY );
+ } else if ( value instanceof java.sql.Time ) {
+ formatStr = RequestUtils.message(pageContext,
this.bundle,
+ this.localeKey, TIME_FORMAT_KEY );
+ }
+ }
+
+ if( formatStr!=null )
+ format = new SimpleDateFormat( formatStr, locale );
- return format.format( value );
+ }
+
+ if( format!=null )
+ return format.format( value );
+ else
+ return value.toString();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
