craigmcc 01/10/03 20:25:32
Modified: src/share/org/apache/struts/taglib/bean Tag:
STRUTS_1_0_BRANCH CookieTei.java HeaderTei.java
ParameterTei.java
Log:
Correct the generated scripting variable type when the <bean:cookie>,
<bean:header>, or <bean:parameter> tag is used with the "multiple"
attribute.
PR: Bugzilla #3148
Submitted by: [EMAIL PROTECTED]
Revision Changes Path
No revision
No revision
1.4.2.1 +8 -7
jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTei.java
Index: CookieTei.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTei.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- CookieTei.java 2001/02/12 01:26:57 1.4
+++ CookieTei.java 2001/10/04 03:25:32 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTei.java,v 1.4
2001/02/12 01:26:57 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/12 01:26:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/CookieTei.java,v
1.4.2.1 2001/10/04 03:25:32 craigmcc Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2001/10/04 03:25:32 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* tag, identifying the scripting object(s) to be made visible.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/12 01:26:57 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/10/04 03:25:32 $
*/
public class CookieTei extends TagExtraInfo {
@@ -85,14 +85,15 @@
*/
public VariableInfo[] getVariableInfo(TagData data) {
+ String className = null;
Object type = null;
if (data.getAttribute("multiple") == null)
- type = new Cookie("name", "value");
+ className = "javax.servlet.http.Cookie";
else
- type = new Cookie[0];
+ className = "javax.servlet.http.Cookie[]";
return new VariableInfo[] {
new VariableInfo(data.getAttributeString("id"),
- type.getClass().getName(),
+ className,
true,
VariableInfo.AT_BEGIN)
};
1.4.2.1 +8 -8
jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTei.java
Index: HeaderTei.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTei.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- HeaderTei.java 2001/02/12 01:26:57 1.4
+++ HeaderTei.java 2001/10/04 03:25:32 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTei.java,v 1.4
2001/02/12 01:26:57 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/12 01:26:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/HeaderTei.java,v
1.4.2.1 2001/10/04 03:25:32 craigmcc Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2001/10/04 03:25:32 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* tag, identifying the scripting object(s) to be made visible.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/12 01:26:57 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/10/04 03:25:32 $
*/
public class HeaderTei extends TagExtraInfo {
@@ -84,14 +84,14 @@
*/
public VariableInfo[] getVariableInfo(TagData data) {
- Object type = null;
+ String className = null;
if (data.getAttribute("multiple") == null)
- type = new String();
+ className = "java.lang.String";
else
- type = new String[0];
+ className = "java.lang.String[]";
return new VariableInfo[] {
new VariableInfo(data.getAttributeString("id"),
- type.getClass().getName(),
+ className,
true,
VariableInfo.AT_BEGIN)
};
1.4.2.1 +8 -8
jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTei.java
Index: ParameterTei.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTei.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ParameterTei.java 2001/02/12 01:26:57 1.4
+++ ParameterTei.java 2001/10/04 03:25:32 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTei.java,v
1.4 2001/02/12 01:26:57 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/12 01:26:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ParameterTei.java,v
1.4.2.1 2001/10/04 03:25:32 craigmcc Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2001/10/04 03:25:32 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* tag, identifying the scripting object(s) to be made visible.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/12 01:26:57 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/10/04 03:25:32 $
*/
public class ParameterTei extends TagExtraInfo {
@@ -84,14 +84,14 @@
*/
public VariableInfo[] getVariableInfo(TagData data) {
- Object type = null;
+ String className = null;
if (data.getAttribute("multiple") == null)
- type = new String();
+ className = "java.lang.String";
else
- type = new String[0];
+ className = "java.lang.String[]";
return new VariableInfo[] {
new VariableInfo(data.getAttributeString("id"),
- type.getClass().getName(),
+ className,
true,
VariableInfo.AT_BEGIN)
};
