Return-Path: Delivered-To: apmail-jakarta-taglibs-dev-archive@jakarta.apache.org Received: (qmail 83158 invoked by uid 500); 14 Oct 2001 22:06:46 -0000 Mailing-List: contact taglibs-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk Reply-To: taglibs-dev@jakarta.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list taglibs-dev@jakarta.apache.org Received: (qmail 83150 invoked by uid 500); 14 Oct 2001 22:06:46 -0000 Delivered-To: apmail-jakarta-taglibs-cvs@apache.org Received: (qmail 83143 invoked from network); 14 Oct 2001 22:06:44 -0000 Received: from icarus.apache.org (64.125.133.21) by daedalus.apache.org with SMTP; 14 Oct 2001 22:06:44 -0000 Received: (qmail 76381 invoked by uid 1325); 14 Oct 2001 22:01:25 -0000 Date: 14 Oct 2001 22:01:25 -0000 Message-ID: <20011014220125.76380.qmail@icarus.apache.org> From: tdawson@apache.org To: jakarta-taglibs-cvs@apache.org Subject: cvs commit: jakarta-taglibs/i18n/src/org/apache/taglibs/i18n FormatCurrencyTag.java FormatDateTimeTag.java FormatNumberTag.java FormatPercentTag.java FormatTagSupport.java FormatTimeTag.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N tdawson 01/10/14 15:01:25 Modified: i18n/src/org/apache/taglibs/i18n FormatCurrencyTag.java FormatDateTimeTag.java FormatNumberTag.java FormatPercentTag.java FormatTagSupport.java FormatTimeTag.java Log: updated @link javadocs Revision Changes Path 1.2 +4 -4 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatCurrencyTag.java Index: FormatCurrencyTag.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatCurrencyTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatCurrencyTag.java 2001/04/28 15:05:44 1.1 +++ FormatCurrencyTag.java 2001/10/14 22:01:25 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatCurrencyTag.java,v 1.1 2001/04/28 15:05:44 jstrachan Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/28 15:05:44 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatCurrencyTag.java,v 1.2 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.2 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -64,11 +64,11 @@ import java.text.Format; import java.text.NumberFormat; -/** Formats a {@link Number} instance using the current {@link Locale} +/** Formats a {@link Number} instance using the current {@link java.util.Locale} * and the Currency {@link NumberFormat}. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class FormatCurrencyTag extends FormatTagSupport { 1.2 +6 -6 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatDateTimeTag.java Index: FormatDateTimeTag.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatDateTimeTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatDateTimeTag.java 2001/04/28 15:05:44 1.1 +++ FormatDateTimeTag.java 2001/10/14 22:01:25 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatDateTimeTag.java,v 1.1 2001/04/28 15:05:44 jstrachan Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/28 15:05:44 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatDateTimeTag.java,v 1.2 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.2 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -64,11 +64,11 @@ import java.text.DateFormat; import java.text.Format; -/** Formats a {@link Date} instance using the default Date and Time formatter - * for the current {@link Locale}. +/** Formats a {@link java.util.Date} instance using the default Date and Time formatter + * for the current {@link java.util.Locale}. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class FormatDateTimeTag extends FormatDateTagSupport { @@ -95,4 +95,4 @@ return DateFormat.getDateTimeInstance( dateStyle, timeStyle, getLocale() ); } } - \ No newline at end of file + 1.2 +6 -6 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatNumberTag.java Index: FormatNumberTag.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatNumberTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatNumberTag.java 2001/04/28 15:05:44 1.1 +++ FormatNumberTag.java 2001/10/14 22:01:25 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatNumberTag.java,v 1.1 2001/04/28 15:05:44 jstrachan Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/28 15:05:44 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatNumberTag.java,v 1.2 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.2 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -69,11 +69,11 @@ import java.util.Enumeration; import java.util.Locale; -/** Formats a {@link Number} instance using a {@link Locale} and the +/** Formats a {@link Number} instance using a {@link java.util.Locale} and the * {@link NumberFormat} or a {@link DecimalFormat} if a pattern is specified. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class FormatNumberTag extends FormatTagSupport { @@ -98,7 +98,7 @@ /** If no {@link NumberFormat} is configured then use a * {@link DecimalFormat} instance if a pattern is configured else - * use the default NumberFormat for the {@link Locale} + * use the default NumberFormat for the {@link java.util.Locale} */ public Format getFormat() { if ( format == null ) { 1.2 +4 -4 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatPercentTag.java Index: FormatPercentTag.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatPercentTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatPercentTag.java 2001/04/28 15:05:44 1.1 +++ FormatPercentTag.java 2001/10/14 22:01:25 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatPercentTag.java,v 1.1 2001/04/28 15:05:44 jstrachan Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/28 15:05:44 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatPercentTag.java,v 1.2 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.2 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -64,11 +64,11 @@ import java.text.Format; import java.text.NumberFormat; -/** Formats a {@link Number} instance using the current {@link Locale} +/** Formats a {@link Number} instance using the current {@link java.util.Locale} * and the Percent {@link NumberFormat}. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class FormatPercentTag extends FormatTagSupport { 1.4 +10 -9 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTagSupport.java Index: FormatTagSupport.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTagSupport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FormatTagSupport.java 2001/06/05 08:35:40 1.3 +++ FormatTagSupport.java 2001/10/14 22:01:25 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTagSupport.java,v 1.3 2001/06/05 08:35:40 jstrachan Exp $ - * $Revision: 1.3 $ - * $Date: 2001/06/05 08:35:40 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTagSupport.java,v 1.4 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.4 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -78,7 +78,7 @@ * implementation inheritence. * * @author James Strachan - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public abstract class FormatTagSupport extends TagSupport { @@ -142,9 +142,9 @@ this.value = value; } - /** If no {@link Locale} has been explicitly configured then use the + /** If no {@link java.util.Locale} has been explicitly configured then use the * parent LocaleTag if present else the Locale from the ServletRequest - * else use the default JVM {@link Locale}. + * else use the default JVM {@link java.util.Locale}. */ public Locale getLocale() { if ( locale == null ) { @@ -188,9 +188,10 @@ LocaleTag localeTag = (LocaleTag) findAncestorWithClass( this, LocaleTag.class ); if ( localeTag != null ) { return localeTag.getLocale(); - } - // otherwise lets determine the Locale from the response, request or default - return LocaleTag.getLocale( pageContext ); + } + else { + return pageContext.getResponse().getLocale(); + } } 1.2 +5 -5 jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTimeTag.java Index: FormatTimeTag.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTimeTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatTimeTag.java 2001/04/28 15:05:44 1.1 +++ FormatTimeTag.java 2001/10/14 22:01:25 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTimeTag.java,v 1.1 2001/04/28 15:05:44 jstrachan Exp $ - * $Revision: 1.1 $ - * $Date: 2001/04/28 15:05:44 $ + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/FormatTimeTag.java,v 1.2 2001/10/14 22:01:25 tdawson Exp $ + * $Revision: 1.2 $ + * $Date: 2001/10/14 22:01:25 $ * * ==================================================================== * @@ -64,11 +64,11 @@ import java.text.DateFormat; import java.text.Format; -/** Formats a {@link Date} instance using a {@link Locale} and the +/** Formats a {@link java.util.Date} instance using a {@link java.util.Locale} and the * default time format. * * @author James Strachan - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ public class FormatTimeTag extends FormatDateTagSupport { @@ -90,4 +90,4 @@ return DateFormat.getTimeInstance( style, getLocale() ); } } - \ No newline at end of file +