morten 01/11/30 01:32:30
Modified: java/src/org/apache/xalan/xsltc/compiler Stylesheet.java
Log:
Modified the order in which top-level elements are parsed. This to make sure
that xsl:namespace-alias elements are parsed before xsl:import and include,
so that namespace aliases are global to all included stylesheets.
PR: bugzilla 4876
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.33 +4 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Stylesheet.java 2001/11/22 14:13:21 1.32
+++ Stylesheet.java 2001/11/30 09:32:30 1.33
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Stylesheet.java,v 1.32 2001/11/22 14:13:21 morten Exp $
+ * @(#)$Id: Stylesheet.java,v 1.33 2001/11/30 09:32:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -371,7 +371,8 @@
// variables and/or parameters before we parse the other elements...
for (int i=0; i<count; i++) {
SyntaxTreeNode child = (SyntaxTreeNode)contents.elementAt(i);
- if (child instanceof VariableBase) {
+ if ((child instanceof VariableBase) ||
+ (child instanceof NamespaceAlias)) {
parser.getSymbolTable().setCurrentNode(child);
child.parseContents(parser);
}
@@ -390,6 +391,7 @@
for (int i=0; i<count; i++) {
SyntaxTreeNode child = (SyntaxTreeNode)contents.elementAt(i);
if (!(child instanceof VariableBase) &&
+ !(child instanceof NamespaceAlias) &&
!(child instanceof Import) &&
!(child instanceof Include)) {
parser.getSymbolTable().setCurrentNode(child);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
