You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2003/04/16 23:54:48 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/trax TemplatesHandlerImpl.java
santiagopg 2003/04/16 14:54:48
Modified: java/src/org/apache/xalan/xsltc/trax
TemplatesHandlerImpl.java
Log:
Set SourceLocator in stylesheet instead of XSLTC object. This ensures
proper use of user-defined URIResolvers in a TemplatesHandler.
Revision Changes Path
1.22 +18 -17 xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
Index: TemplatesHandlerImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TemplatesHandlerImpl.java 1 Apr 2003 21:19:06 -0000 1.21
+++ TemplatesHandlerImpl.java 16 Apr 2003 21:54:48 -0000 1.22
@@ -170,11 +170,6 @@
try {
XSLTC xsltc = _parser.getXSLTC();
- // Set a document loader (for xsl:include/import) if defined
- if (_uriResolver != null) {
- xsltc.setSourceLoader(this);
- }
-
// Set the translet class name if not already set
String transletName = null;
if (_systemId != null) {
@@ -197,12 +192,18 @@
stylesheet = _parser.makeStylesheet(root);
stylesheet.setSystemId(_systemId);
stylesheet.setParentStylesheet(null);
+
+ // Set a document loader (for xsl:include/import) if defined
+ if (_uriResolver != null) {
+ stylesheet.setSourceLoader(this);
+ }
+
_parser.setCurrentStylesheet(stylesheet);
// Set it as top-level in the XSLTC object
xsltc.setStylesheet(stylesheet);
- // Create AST under the Stylesheet element
+ // Create AST under the Stylesheet element
_parser.createAST(stylesheet);
}
@@ -263,7 +264,7 @@
}
// -- ContentHandler --------------------------------------------------
-
+
/**
* Re-initialize parser and forward SAX2 event.
*/
@@ -275,7 +276,7 @@
/**
* Just forward SAX2 event to parser object.
*/
- public void endDocument() {
+ public void endDocument() {
_parser.endDocument();
}
@@ -289,19 +290,19 @@
/**
* Just forward SAX2 event to parser object.
*/
- public void endPrefixMapping(String prefix) {
+ public void endPrefixMapping(String prefix) {
_parser.endPrefixMapping(prefix);
}
/**
* Just forward SAX2 event to parser object.
*/
- public void startElement(String uri, String localname, String qname,
- Attributes attributes) throws SAXException
+ public void startElement(String uri, String localname, String qname,
+ Attributes attributes) throws SAXException
{
_parser.startElement(uri, localname, qname, attributes);
}
-
+
/**
* Just forward SAX2 event to parser object.
*/
@@ -315,25 +316,25 @@
public void characters(char[] ch, int start, int length) {
_parser.characters(ch, start, length);
}
-
+
/**
* Just forward SAX2 event to parser object.
*/
public void processingInstruction(String name, String value) {
_parser.processingInstruction(name, value);
}
-
+
/**
* Just forward SAX2 event to parser object.
*/
- public void ignorableWhitespace(char[] ch, int start, int length) {
+ public void ignorableWhitespace(char[] ch, int start, int length) {
_parser.ignorableWhitespace(ch, start, length);
}
/**
* Just forward SAX2 event to parser object.
*/
- public void skippedEntity(String name) {
+ public void skippedEntity(String name) {
_parser.skippedEntity(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org