luehe 2003/03/31 13:14:05
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Node.java
Log:
Fixed wrong signature of setJspContext for SimpleTag handlers that are not supported
by tag files
Revision Changes Path
1.179 +11 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- Generator.java 31 Mar 2003 17:54:30 -0000 1.178
+++ Generator.java 31 Mar 2003 21:14:04 -0000 1.179
@@ -2436,8 +2436,8 @@
String nameFrom = tagVars[i].getNameFromAttribute();
if (nameFrom != null) {
- String aliaseName = n.getAttributeValue(nameFrom);
- if (aliaseName == null) continue;
+ String aliasedName = n.getAttributeValue(nameFrom);
+ if (aliasedName == null) continue;
if ( ! aliasSeen ) {
out.printin("java.util.HashMap ");
@@ -2450,7 +2450,7 @@
out.print(".put(");
out.print(quote(tagVars[i].getNameGiven()));
out.print(", ");
- out.print(quote(aliaseName));
+ out.print(quote(aliasedName));
out.println(");");
}
}
@@ -2466,7 +2466,10 @@
// Set context
if (simpleTag) {
// Generate alias map
- String aliasMapVar= generateAliasMap(n, tagHandlerVar);
+ String aliasMapVar = null;
+ if (n.isTagFile()) {
+ aliasMapVar = generateAliasMap(n, tagHandlerVar);
+ }
out.printin(tagHandlerVar);
if (aliasMapVar == null) {
out.println(".setJspContext(pageContext);");
@@ -3135,7 +3138,7 @@
boolean atBeginSeen = false;
boolean atEndSeen = false;
- // Determine if there is any aliases
+ // Determine if there are any aliases
boolean aliasSeen = false;
TagVariableInfo[] tagVars = tagInfo.getTagVariableInfos();
for (int i=0; i<tagVars.length; i++) {
1.70 +11 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Node.java 28 Mar 2003 02:13:02 -0000 1.69
+++ Node.java 31 Mar 2003 21:14:05 -0000 1.70
@@ -1368,6 +1368,14 @@
return tagFileInfo;
}
+ /*
+ * @return true if this custom action is supported by a tag file,
+ * false otherwise
+ */
+ public boolean isTagFile() {
+ return tagFileInfo != null;
+ }
+
public Class getTagHandlerClass() {
return tagHandlerClass;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
