You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2002/07/26 03:07:15 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler ImplicitTagLibraryInfo.java TagFileProcessor.java TagLibraryInfoImpl.java
luehe 2002/07/25 18:07:14
Modified: jasper2/src/share/org/apache/jasper/compiler
ImplicitTagLibraryInfo.java TagFileProcessor.java
TagLibraryInfoImpl.java
Log:
When constructing a TagInfo from the tag directives of a TagFile,
include a reference to the TagLibraryInfo to which the TagInfo
belongs.
Revision Changes Path
1.2 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Index: ImplicitTagLibraryInfo.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImplicitTagLibraryInfo.java 25 Jul 2002 22:28:45 -0000 1.1
+++ ImplicitTagLibraryInfo.java 26 Jul 2002 01:07:14 -0000 1.2
@@ -112,7 +112,8 @@
break;
} else if (path.endsWith(".tag")) {
tagVector.addElement(TagFileProcessor.parseTagFile(pc,
- path));
+ path,
+ this));
}
}
1.4 +15 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TagFileProcessor.java 25 Jul 2002 22:28:45 -0000 1.3
+++ TagFileProcessor.java 26 Jul 2002 01:07:14 -0000 1.4
@@ -83,12 +83,13 @@
static class TagFileVisitor extends Node.Visitor {
private ErrorDispatcher err;
+ private TagLibraryInfo tagLibInfo;
private String name = null;
private String tagclass = null;
private TagExtraInfo tei = null;
private String bodycontent = "JSP"; // Default body content is JSP
- private String info = null;
+ private String description = null;
private String displayName = null;
private String smallIcon = null;
private String largeIcon = null;
@@ -136,7 +137,7 @@
new JspUtil.ValidAttribute("description")
};
- public TagFileVisitor(Compiler compiler) {
+ public TagFileVisitor(Compiler compiler, TagLibraryInfo tagLibInfo) {
err = compiler.getErrorDispatcher();
}
@@ -151,7 +152,7 @@
n.getAttributeValue("dynamic-attributes"));
smallIcon = n.getAttributeValue("small-icon");
largeIcon = n.getAttributeValue("large-icon");
- info = n.getAttributeValue("description");
+ description = n.getAttributeValue("description");
displayName = n.getAttributeValue("display-name");
}
@@ -263,8 +264,11 @@
fragmentInputs);
}
- return new TagInfo(name, tagclass, bodycontent,
- info, null,
+ return new TagInfo(name,
+ tagclass,
+ bodycontent,
+ description,
+ tagLibInfo,
tei,
tagAttributeInfo,
displayName,
@@ -276,7 +280,8 @@
}
}
- public static TagInfo parseTagFile(ParserController pc, String tagfile)
+ public static TagInfo parseTagFile(ParserController pc, String tagfile,
+ TagLibraryInfo tagLibInfo)
throws JasperException {
Node.Nodes page = null;
@@ -287,7 +292,8 @@
"jsp.error.file.not.found", tagfile);
}
- TagFileVisitor tagFileVisitor = new TagFileVisitor(pc.getCompiler());
+ TagFileVisitor tagFileVisitor = new TagFileVisitor(pc.getCompiler(),
+ tagLibInfo);
page.visit(tagFileVisitor);
return tagFileVisitor.getTagInfo();
1.7 +5 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TagLibraryInfoImpl.java 25 Jul 2002 22:28:45 -0000 1.6
+++ TagLibraryInfoImpl.java 26 Jul 2002 01:07:14 -0000 1.7
@@ -443,7 +443,8 @@
if ("path".equals(tname)) {
String tagFilePath = child.getBody();
tagInfo = TagFileProcessor.parseTagFile(parserController,
- tagFilePath);
+ tagFilePath,
+ this);
break;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>