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/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Fri, 17 Nov 2000 21:59:08 GMT
pierred     00/11/17 13:59:08

  Modified:    src/share/org/apache/jasper/compiler Tag: tomcat_32
                        TagLibraryInfoImpl.java
  Log:
  trim the tag values. (see bug report #349).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.22.2.7  +17 -17    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.6
  retrieving revision 1.22.2.7
  diff -u -r1.22.2.6 -r1.22.2.7
  --- TagLibraryInfoImpl.java	2000/11/16 15:57:38	1.22.2.6
  +++ TagLibraryInfoImpl.java	2000/11/17 21:59:08	1.22.2.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.22.2.6 2000/11/16 15:57:38 pierred Exp $
  - * $Revision: 1.22.2.6 $
  - * $Date: 2000/11/16 15:57:38 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.22.2.7 2000/11/17 21:59:08 pierred Exp $
  + * $Revision: 1.22.2.7 $
  + * $Date: 2000/11/17 21:59:08 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -364,23 +364,23 @@
               if (tname.equals("tlibversion")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.tlibversion = t.getData();
  +                    this.tlibversion = t.getData().trim();
               } else if (tname.equals("jspversion")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.jspversion = t.getData();
  +                    this.jspversion = t.getData().trim();
               } else if (tname.equals("shortname")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.shortname = t.getData();
  +                    this.shortname = t.getData().trim();
               } else if (tname.equals("uri")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.urn = t.getData();
  +                    this.urn = t.getData().trim();
               } else if (tname.equals("info")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    this.info = t.getData();
  +                    this.info = t.getData().trim();
               } else if (tname.equals("tag"))
                   tagVector.addElement(createTagInfo(e));
               else
  @@ -411,23 +411,23 @@
               if (tname.equals("name")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    name = t.getData();
  +                    name = t.getData().trim();
               } else if (tname.equals("tagclass")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    tagclass = t.getData();
  +                    tagclass = t.getData().trim();
               } else if (tname.equals("teiclass")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    teiclass = t.getData();
  +                    teiclass = t.getData().trim();
               } else if (tname.equals("bodycontent")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    bodycontent = t.getData();
  +                    bodycontent = t.getData().trim();
               } else if (tname.equals("info")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    info = t.getData();
  +                    info = t.getData().trim();
               } else if (tname.equals("attribute"))
                   attributeVector.addElement(createAttribute(e));
               else 
  @@ -492,25 +492,25 @@
               if (tname.equals("name"))  {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    name = t.getData();
  +                    name = t.getData().trim();
               } else if (tname.equals("required"))  {
                   Text t = (Text) e.getFirstChild();
                   if (t != null) {
  -                    required = Boolean.valueOf(t.getData()).booleanValue();
  +                    required = Boolean.valueOf(t.getData().trim()).booleanValue();
                       if( t.getData().equalsIgnoreCase("yes") )
                           required = true;
                   }
               } else if (tname.equals("rtexprvalue")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null) {
  -                    rtexprvalue = Boolean.valueOf(t.getData()).booleanValue();
  +                    rtexprvalue = Boolean.valueOf(t.getData().trim()).booleanValue();
                       if( t.getData().equalsIgnoreCase("yes") )
                           rtexprvalue = true;
                   }
               } else if (tname.equals("type")) {
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
  -                    type = t.getData();
  +                    type = t.getData().trim();
               } else 
                   Constants.message("jsp.warning.unknown.element.in.attribute", 
                                     new Object[] {
  
  
  

Mime
View raw message