horwat 01/04/24 19:52:55
Modified: jasper/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
jasper/src/share/org/apache/jasper/compiler
TagBeginGenerator.java
Log:
Implementation of the following JSP 1.2 PFD2 changes:
JSP.E.1.3 Assigning String literals to Object attribute
- can assign string literals to an attribute or property of type Object
Revision Changes Path
1.6 +5 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspRuntimeLibrary.java 2001/02/04 01:07:12 1.5
+++ JspRuntimeLibrary.java 2001/04/25 02:52:54 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
1.5 2001/02/04 01:07:12 glenn Exp $
- * $Revision: 1.5 $
- * $Date: 2001/02/04 01:07:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
1.6 2001/04/25 02:52:54 horwat Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/04/25 02:52:54 $
*
* ====================================================================
*
@@ -167,6 +167,8 @@
return new Long(s);
} else if ( t.equals(Double.class) || t.equals(Double.TYPE) ) {
return new Double(s);
+ } else if ( t.equals(Object.class) ) {
+ return new Object[] {s};
} else if ( t.equals(String.class) ) {
return s;
} else if ( t.equals(java.io.File.class) ) {
1.11 +2 -0
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagBeginGenerator.java
Index: TagBeginGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TagBeginGenerator.java 2001/04/20 00:00:59 1.10
+++ TagBeginGenerator.java 2001/04/25 02:52:54 1.11
@@ -298,6 +298,8 @@
return Long.valueOf(s).toString() + "l";
} else if (c == Long.class) {
return "new Long(" + Long.valueOf(s).toString() + "l)";
+ } else if (c == Object.class) {
+ return "new String(" + s + ")";
} else {
return "(" + c.getName() +
")JspRuntimeLibrary.getValueFromPropertyEditorManager(" +
