tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Mon, 17 Apr 2000 21:42:10 GMT
mandar      00/04/17 14:42:10

  Modified:    src/share/javax/servlet/jsp/tagext Tag: latest_TOMCAT_30
                        TagAttributeInfo.java TagData.java
                        TagExtraInfo.java
               src/share/org/apache/jasper/compiler Tag: latest_TOMCAT_30
                        TagLibraryInfoImpl.java
  Log:
  javax fixes into the branch latest_TOMCAT_30.
  Fixes into 3.1 are coming next....
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +6 -6      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java
  
  Index: TagAttributeInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- TagAttributeInfo.java	1999/11/08 03:21:48	1.7
  +++ TagAttributeInfo.java	2000/04/17 21:42:05	1.7.2.1
  @@ -83,13 +83,13 @@
        */
       // TODO -- add the content descriptor...
   
  -    public TagAttributeInfo(String name, boolean required, boolean rtexprvalue, 
  -                            String type)
  +    public TagAttributeInfo(String name, boolean required,
  +                            String type, boolean reqTime)
       {
   	this.name = name;
           this.required = required;
  -        this.rtexprvalue = rtexprvalue;
           this.type = type;
  +	this.reqTime = reqTime;
       }
   
       /**
  @@ -113,7 +113,7 @@
        */
   
       public boolean canBeRequestTime() {
  -	return rtexprvalue;
  +	return reqTime;
       }
   
       /**
  @@ -140,8 +140,8 @@
           StringBuffer b = new StringBuffer();
           b.append("name = "+name+" ");
           b.append("type = "+type+" ");
  +	b.append("reqTime = "+reqTime+" ");
           b.append("required = "+required+" ");
  -        b.append("rtexprvalue = "+rtexprvalue+" ");
           return b.toString();
       }
   
  @@ -151,6 +151,6 @@
   
       private String name;
       private String type;
  +    private boolean reqTime;
       private boolean required;
  -    private boolean rtexprvalue;
   }
  
  
  
  1.4.2.1   +22 -8     jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagData.java
  
  Index: TagData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagData.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- TagData.java	1999/11/08 03:21:48	1.4
  +++ TagData.java	2000/04/17 21:42:06	1.4.2.1
  @@ -56,6 +56,7 @@
   package javax.servlet.jsp.tagext;
   
   import java.util.Hashtable;
  +import java.util.Enumeration;
   
   /**
    * Tag instance attribute(s)/value(s); often this data is fully static in the
  @@ -95,7 +96,11 @@
        * @param atts the static attribute and values.  May be null.
        */
       public TagData(Object[] atts[]) {
  -	attributes = new Hashtable(atts.length);
  +	if (atts == null) {
  +	    attributes = new Hashtable();
  +	} else {
  +	    attributes = new Hashtable(atts.length);
  +	}
   
   	if (atts != null) {
   	    for (int i = 0; i < atts.length; i++) {
  @@ -109,12 +114,6 @@
        *
        * If you already have the attributes in a hashtable, use this
        * constructor. 
  -     *
  -     ***** NEED TO REMOVE THIS COMMENT: JUST FOR pelegri/lpgc's eyes ****
  -     * Since the JSP translator internally has attributes in a
  -     * hashtable whenever a TagData needs to be constructed at
  -     * translation time, this constructor is used... akv
  -     ***** 
        */
       public TagData(Hashtable attrs) {
           this.attributes = attrs;
  @@ -156,8 +155,23 @@
        */
   
       public String getAttributeString(String attName) {
  -	return (String) attributes.get(attName);
  +	Object o = attributes.get(attName);
  +	if (o == null) {
  +	    return null;
  +	} else {
  +	    return (String) o;
  +	}
       }
  +
  +    /**
  +     * Enumerate the attributes
  +     *
  +     * @return An enumeration of the attributes in a TagData
  +     */
  +
  +    public Enumeration getAttributes() {
  +	return attributes.keys();
  +    }    
   
       // private data
   
  
  
  
  1.5.2.1   +5 -4      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java
  
  Index: TagExtraInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TagExtraInfo.java	1999/11/08 03:21:48	1.5
  +++ TagExtraInfo.java	2000/04/17 21:42:06	1.5.2.1
  @@ -93,7 +93,7 @@
        *
        * @param tagInfo The TagInfo this instance is extending
        */
  -    public void setTagInfo(TagInfo tagInfo) {
  +    public final void setTagInfo(TagInfo tagInfo) {
   	this.tagInfo = tagInfo;
       }
   
  @@ -102,11 +102,12 @@
        *
        * @returns the taginfo instnace this instance is extending
        */
  -    public TagInfo getTagInfo() {
  +    public final TagInfo getTagInfo() {
   	return tagInfo;
       }
       
  -    // protected data
  -    protected TagInfo tagInfo;
  +    // private data
  +    private TagInfo tagInfo;
   }
  +
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1   +4 -4      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.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- TagLibraryInfoImpl.java	1999/11/24 01:11:00	1.9
  +++ TagLibraryInfoImpl.java	2000/04/17 21:42:08	1.9.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.9 1999/11/24 01:11:00 mandar Exp $
  - * $Revision: 1.9 $
  - * $Date: 1999/11/24 01:11:00 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.9.2.1 2000/04/17 21:42:08 mandar Exp $
  + * $Revision: 1.9.2.1 $
  + * $Date: 2000/04/17 21:42:08 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -475,7 +475,7 @@
                                     );
           }
           
  -        return new TagAttributeInfo(name, required, rtexprvalue, type);
  +        return new TagAttributeInfo(name, required, type, rtexprvalue);
       }
   
       static void copy(InputStream in, String fileName) 
  
  
  

Mime
View raw message