tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lar...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Thu, 05 Oct 2000 06:16:59 GMT
larryi      00/10/04 23:16:58

  Modified:    src/share/org/apache/jasper/compiler Tag: tomcat_32
                        TagLibraryInfoImpl.java
  Log:
  Fix use of "urn" instead of "uri".
  
  Bug submitted by: Brian Bucknam
  
  Ported Tomcat 3.3. bug fix to allow "yes" for required and rtexprvalue
  attributes per spec.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.22.2.3  +14 -8     jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.22.2.2
  retrieving revision 1.22.2.3
  diff -u -r1.22.2.2 -r1.22.2.3
  --- TagLibraryInfoImpl.java	2000/08/04 15:40:53	1.22.2.2
  +++ TagLibraryInfoImpl.java	2000/10/05 06:16:58	1.22.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.22.2.2 2000/08/04 15:40:53 jiricka Exp $
  - * $Revision: 1.22.2.2 $
  - * $Date: 2000/08/04 15:40:53 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.22.2.3 2000/10/05 06:16:58 larryi Exp $
  + * $Revision: 1.22.2.3 $
  + * $Date: 2000/10/05 06:16:58 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -122,7 +122,7 @@
           print("tlibversion", tlibversion, out);
           print("jspversion", jspversion, out);
           print("shortname", shortname, out);
  -        print("urn", urn, out);
  +        print("uri", uri, out);
           print("info", info, out);
   
           for(int i = 0; i < tags.length; i++)
  @@ -370,10 +370,10 @@
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       this.shortname = t.getData();
  -            } else if (tname.equals("urn")) {
  +            } else if (tname.equals("uri")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.urn = t.getData();
  +                    this.uri = t.getData();
               } else if (tname.equals("info")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  @@ -492,12 +492,18 @@
                       name = t.getData();
               } else if (tname.equals("required"))  {
                   Text t = (Text) e.getFirstChild();
  -                if (t != null)
  +                if (t != null) {
                       required = Boolean.valueOf(t.getData()).booleanValue();
  +                    if( t.getData().equalsIgnoreCase("yes") )
  +                        required = true;
  +                }
               } else if (tname.equals("rtexprvalue")) {
                   Text t = (Text) e.getFirstChild();
  -                if (t != null)
  +                if (t != null) {
                       rtexprvalue = Boolean.valueOf(t.getData()).booleanValue();
  +                    if( t.getData().equalsIgnoreCase("yes") )
  +                        rtexprvalue = true;
  +                }
               } else if (tname.equals("type")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  
  
  

Mime
View raw message