tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Sun, 29 Oct 2000 05:12:57 GMT
pierred     00/10/28 22:12:57

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        TagLibraryInfoImpl.java
  Log:
  Support for following PFD change:
  "Changed element names in TLD to consistently follow convention. New names are <tag-class>.
  <tei-class>, <tlib-version, <jsp-version>, <short-name> and <body-content>.
  <info> was renamed <description>."
  
  Revision  Changes    Path
  1.7       +10 -10    jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TagLibraryInfoImpl.java	2000/10/29 03:23:50	1.6
  +++ TagLibraryInfoImpl.java	2000/10/29 05:12:56	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.6 2000/10/29 03:23:50 pierred Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/10/29 03:23:50 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.7 2000/10/29 05:12:56 pierred Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/10/29 05:12:56 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -369,15 +369,15 @@
   	    if (! (tmp instanceof Element)) continue;
               Element e = (Element) tmp;
               String tname = e.getTagName();
  -            if (tname.equals("tlibversion")) {
  +            if (tname.equals("tlibversion") || tname.equals("tlib-version")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       this.tlibversion = t.getData();
  -            } else if (tname.equals("jspversion")) {
  +            } else if (tname.equals("jspversion") || tname.equals("jsp-version")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       this.jspversion = t.getData();
  -            } else if (tname.equals("shortname")) {
  +            } else if (tname.equals("shortname") || tname.equals("short-name")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       this.shortname = t.getData();
  @@ -452,19 +452,19 @@
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       name = t.getData();
  -            } else if (tname.equals("tagclass")) {
  +            } else if (tname.equals("tagclass") || tname.equals("tag-class")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       tagclass = t.getData();
  -            } else if (tname.equals("teiclass")) {
  +            } else if (tname.equals("teiclass") || tname.equals("tei-class")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       teiclass = t.getData();
  -            } else if (tname.equals("bodycontent")) {
  +            } else if (tname.equals("bodycontent") || tname.equals("body-content")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       bodycontent = t.getData();
  -            } else if (tname.equals("info")) {
  +            } else if (tname.equals("info") || tname.equals("tlib-description")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       info = t.getData();
  
  
  

Mime
View raw message