cvs commit: jakarta-taglibs/i18n/src/org/apache/taglibs/i18n ConditionalTagSupport.java MessageTag.java

[tdawson]

tdawson     01/10/14 15:09:23

  Modified:    i18n/src/org/apache/taglibs/i18n ConditionalTagSupport.java
                        MessageTag.java
  Log:
  added capability for ifdef, ifndef, and message tags to be nested
  inside a bundle tag
  
  Revision  Changes    Path
  1.2       +8 -3      
jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java
  
  Index: ConditionalTagSupport.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConditionalTagSupport.java        2001/06/13 03:24:41     1.1
  +++ ConditionalTagSupport.java        2001/10/14 22:09:23     1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
 1.1 2001/06/13 03:24:41 tdawson Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/06/13 03:24:41 $
  + * $Header: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
 1.2 2001/10/14 22:09:23 tdawson Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/10/14 22:09:23 $
    *
    * ====================================================================
    * 
  @@ -125,6 +125,11 @@
      */
     public ResourceBundle getBundle()
       {
  +    if ( _bundle == null )
  +        {
  +        BundleTag bundleTag = 
(BundleTag)this.findAncestorWithClass(this,BundleTag.class);
  +        _bundle = bundleTag.getBundle();
  +        }
       if ( _bundle == null )
           {
           _bundle = ResourceHelper.getBundle(pageContext);
  
  
  
  1.3       +8 -3      jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java
  
  Index: MessageTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MessageTag.java   2001/06/13 03:24:42     1.2
  +++ MessageTag.java   2001/10/14 22:09:23     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java,v 1.2 
2001/06/13 03:24:42 tdawson Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/06/13 03:24:42 $
  + * $Header: 
/home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java,v 1.3 
2001/10/14 22:09:23 tdawson Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/10/14 22:09:23 $
    *
    * ====================================================================
    * 
  @@ -152,6 +152,11 @@
      */
     public ResourceBundle getBundle()
       {
  +    if ( _bundle == null )
  +        {
  +        BundleTag bundleTag = 
(BundleTag)this.findAncestorWithClass(this,BundleTag.class);
  +        _bundle = bundleTag.getBundle();
  +        }
       if ( _bundle == null )
           {
           _bundle = ResourceHelper.getBundle(pageContext);