You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Petr Jiricka <pe...@netbeans.com> on 2000/04/19 12:18:42 UTC
RE: cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compil
er TagLibraryInfoImpl.java
Hello,
is the updated servlet.jar going to be available on the main servlet
technology page anytime soon ?
Thanks
Petr
> -----Original Message-----
> From: mandar@locus.apache.org [mailto:mandar@locus.apache.org]
> Sent: Tuesday, April 18, 2000 12:18 AM
> To: jakarta-tomcat-cvs@apache.org
> Subject: cvs commit:
> jakarta-tomcat/src/share/org/apache/jasper/compiler
> TagLibraryInfoImpl.java
>
>
> mandar 00/04/17 15:17:47
>
> Modified: src/share/javax/servlet/jsp/tagext Tag: TOMCAT_31
> TagAttributeInfo.java TagData.java
> TagExtraInfo.java
> src/share/org/apache/jasper/compiler Tag: TOMCAT_31
> TagLibraryInfoImpl.java
> Log:
> removing the discrepancies in the javax classes bet. spec
> and tomcat.
>
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.7.4.1 +6 -6
> jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttribute
> Info.java
>
> Index: TagAttributeInfo.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/Ta
> gAttributeInfo.java,v
> retrieving revision 1.7
> retrieving revision 1.7.4.1
> diff -u -r1.7 -r1.7.4.1
> --- TagAttributeInfo.java 1999/11/08 03:21:48 1.7
> +++ TagAttributeInfo.java 2000/04/17 22:17:42 1.7.4.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.5.2.1 +11 -2
> 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/Ta
> gData.java,v
> retrieving revision 1.5
> retrieving revision 1.5.2.1
> diff -u -r1.5 -r1.5.2.1
> --- TagData.java 2000/01/18 06:14:43 1.5
> +++ TagData.java 2000/04/17 22:17:42 1.5.2.1
> @@ -95,7 +95,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++) {
> @@ -152,7 +156,12 @@
> */
>
> public String getAttributeString(String attName) {
> - return (String) attributes.get(attName);
> + Object o = attributes.get(attName);
> + if (o == null) {
> + return null;
> + } else {
> + return (String) o;
> + }
> }
>
> /**
>
>
>
> 1.5.4.1 +4 -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/Ta
> gExtraInfo.java,v
> retrieving revision 1.5
> retrieving revision 1.5.4.1
> diff -u -r1.5 -r1.5.4.1
> --- TagExtraInfo.java 1999/11/08 03:21:48 1.5
> +++ TagExtraInfo.java 2000/04/17 22:17:42 1.5.4.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,11 @@
> *
> * @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.16.2.1 +4 -4
> jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibrary
> InfoImpl.java
>
> Index: TagLibraryInfoImpl.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/
> TagLibraryInfoImpl.java,v
> retrieving revision 1.16
> retrieving revision 1.16.2.1
> diff -u -r1.16 -r1.16.2.1
> --- TagLibraryInfoImpl.java 2000/03/28 04:29:48 1.16
> +++ TagLibraryInfoImpl.java 2000/04/17 22:17:45 1.16.2.1
> @@ -1,7 +1,7 @@
> /*
> - * $Header:
> /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/
> TagLibraryInfoImpl.java,v 1.16 2000/03/28 04:29:48 akv Exp $
> - * $Revision: 1.16 $
> - * $Date: 2000/03/28 04:29:48 $
> + * $Header:
> /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/
> TagLibraryInfoImpl.java,v 1.16.2.1 2000/04/17 22:17:45 mandar Exp $
> + * $Revision: 1.16.2.1 $
> + * $Date: 2000/04/17 22:17:45 $
> *
> * The Apache Software License, Version 1.1
> *
> @@ -499,7 +499,7 @@
> );
> }
>
> - return new TagAttributeInfo(name, required,
> rtexprvalue, type);
> + return new TagAttributeInfo(name, required, type,
> rtexprvalue);
> }
>
> static void copy(InputStream in, String fileName)
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>