You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2001/11/27 00:36:46 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler TagGeneratorBase.java
kinman 01/11/26 15:36:46
Modified: jasper/src/share/org/apache/jasper/compiler
TagGeneratorBase.java
Log:
PR: 5050
-- Accept taglib prefices containing "-".
Revision Changes Path
1.5 +8 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagGeneratorBase.java
Index: TagGeneratorBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagGeneratorBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagGeneratorBase.java 2001/09/07 20:27:52 1.4
+++ TagGeneratorBase.java 2001/11/26 23:36:46 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagGeneratorBase.java,v 1.4 2001/09/07 20:27:52 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/09/07 20:27:52 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagGeneratorBase.java,v 1.5 2001/11/26 23:36:46 kinman Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/11/26 23:36:46 $
*
* ====================================================================
*
@@ -145,6 +145,11 @@
* "$1", '.' with "$2", and ':' with "$3".
*/
protected String getTagVarName(String prefix, String shortTagName) {
+ if (prefix.indexOf('-') >= 0)
+ prefix = substitute(prefix, '-', "$1");
+ if (prefix.indexOf('.') >= 0)
+ prefix = substitute(prefix, '.', "$2");
+
if (shortTagName.indexOf('-') >= 0)
shortTagName = substitute(shortTagName, '-', "$1");
if (shortTagName.indexOf('.') >= 0)
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>