morten 01/05/02 03:26:06
Modified: java/src/org/apache/xalan/xsltc/compiler ApplyImports.java
ApplyTemplates.java Attribute.java
AttributeSet.java CallTemplate.java Comment.java
Copy.java CopyOf.java DecimalFormatting.java
Fallback.java ForEach.java If.java Import.java
Include.java Key.java LiteralElement.java
Message.java NamespaceAlias.java Number.java
Output.java Param.java Parser.java
ProcessingInstruction.java Sort.java
Stylesheet.java SyntaxTreeNode.java Template.java
Text.java TopLevelElement.java TransletOutput.java
UseAttributeSets.java ValueOf.java Variable.java
When.java Whitespace.java WithParam.java XSLTC.java
XslAttribute.java XslElement.java
Log:
Removed all references to the ProjectX parser and DOM implementation from
the compiler package. The only side-effect (so far) is the lack of line-
numbers in error and warning messages.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
Index: ApplyImports.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplyImports.java 2001/04/17 18:51:18 1.1
+++ ApplyImports.java 2001/05/02 10:24:32 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ApplyImports.java,v 1.1 2001/04/17 18:51:18 sboag Exp $
+ * @(#)$Id: ApplyImports.java,v 1.2 2001/05/02 10:24:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,12 @@
import java.util.Vector;
import java.util.Enumeration;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -93,7 +98,7 @@
return hasContents();
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String select = element.getAttribute("select");
final String mode = element.getAttribute("mode");
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
Index: ApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplyTemplates.java 2001/04/17 18:51:18 1.1
+++ ApplyTemplates.java 2001/05/02 10:24:33 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ApplyTemplates.java,v 1.1 2001/04/17 18:51:18 sboag Exp $
+ * @(#)$Id: ApplyTemplates.java,v 1.2 2001/05/02 10:24:33 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,12 @@
import java.util.Vector;
import java.util.Enumeration;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -92,7 +97,7 @@
return hasContents();
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String select = element.getAttribute("select");
final String mode = element.getAttribute("mode");
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Attribute.java
Index: Attribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Attribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Attribute.java 2001/04/17 18:51:19 1.1
+++ Attribute.java 2001/05/02 10:24:35 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Attribute.java,v 1.1 2001/04/17 18:51:19 sboag Exp $
+ * @(#)$Id: Attribute.java,v 1.2 2001/05/02 10:24:35 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.*;
final class Attribute extends Instruction {
@@ -75,7 +76,7 @@
displayContents(indent + IndentIncrement);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_name = parser.getQName(element.getAttribute("name"));
parseChildren(element, parser);
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java
Index: AttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeSet.java 2001/04/17 18:51:20 1.1
+++ AttributeSet.java 2001/05/02 10:24:36 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AttributeSet.java,v 1.1 2001/04/17 18:51:20 sboag Exp $
+ * @(#)$Id: AttributeSet.java,v 1.2 2001/05/02 10:24:36 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,12 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -78,7 +83,7 @@
private UseAttributeSets _useSets;
private String _methodName;
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_name = parser.getQName(element.getAttribute("name"));
final String useSets = element.getAttribute("use-attribute-sets");
if (useSets.length() > 0) {
1.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java
Index: CallTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallTemplate.java 2001/04/17 18:51:22 1.1
+++ CallTemplate.java 2001/05/02 10:24:39 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CallTemplate.java,v 1.1 2001/04/17 18:51:22 sboag Exp $
+ * @(#)$Id: CallTemplate.java,v 1.2 2001/05/02 10:24:39 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,11 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -82,7 +86,7 @@
return elementCount() > 0;
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_name = parser.getQName(element.getAttribute("name"));
parseChildren(element, parser);
}
1.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java
Index: Comment.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Comment.java 2001/04/17 18:51:23 1.1
+++ Comment.java 2001/05/02 10:24:41 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Comment.java,v 1.1 2001/04/17 18:51:23 sboag Exp $
+ * @(#)$Id: Comment.java,v 1.2 2001/05/02 10:24:41 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,9 +64,12 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
import org.w3c.dom.*;
+import org.xml.sax.*;
+
+import org.w3c.dom.*;
import java.util.Vector;
import java.util.Enumeration;
@@ -78,7 +81,8 @@
import org.apache.xalan.xsltc.compiler.util.*;
final class Comment extends Instruction {
- public void parseContents(ElementEx element, Parser parser) {
+
+ public void parseContents(Element element, Parser parser) {
parseChildren(element, parser);
}
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java
Index: Copy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Copy.java 2001/04/17 18:51:24 1.1
+++ Copy.java 2001/05/02 10:24:42 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Copy.java,v 1.1 2001/04/17 18:51:24 sboag Exp $
+ * @(#)$Id: Copy.java,v 1.2 2001/05/02 10:24:42 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,12 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -74,7 +79,7 @@
final class Copy extends Instruction {
private UseAttributeSets _useSets;
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String useSets = element.getAttribute("use-attribute-sets");
if (useSets.length() > 0) {
_useSets = new UseAttributeSets(useSets, parser);
1.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java
Index: CopyOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopyOf.java 2001/04/17 18:51:25 1.1
+++ CopyOf.java 2001/05/02 10:24:43 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CopyOf.java,v 1.1 2001/04/17 18:51:25 sboag Exp $
+ * @(#)$Id: CopyOf.java,v 1.2 2001/05/02 10:24:43 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,11 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -79,7 +83,7 @@
Util.println("select " + _select.toString());
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_select = parser.parseExpression(this, element, "select");
// make sure required attribute(s) have been set
if (_select.isDummy()) {
1.3 +6 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
Index: DecimalFormatting.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DecimalFormatting.java 2001/05/01 14:11:37 1.2
+++ DecimalFormatting.java 2001/05/02 10:24:44 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DecimalFormatting.java,v 1.2 2001/05/01 14:11:37 morten Exp $
+ * @(#)$Id: DecimalFormatting.java,v 1.3 2001/05/02 10:24:44 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,8 +64,11 @@
package org.apache.xalan.xsltc.compiler;
+import javax.xml.parsers.*;
+
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -83,7 +86,7 @@
private static final String DFS_CLASS = "java.text.DecimalFormatSymbols";
private static final String DFS_SIG =
"Ljava/text/DecimalFormatSymbols;";
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
NamedNodeMap attributes = element.getAttributes();
final int nAttributes = attributes.getLength();
for (int i = 0; i < nAttributes; i++) {
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java
Index: Fallback.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Fallback.java 2001/04/17 18:51:27 1.1
+++ Fallback.java 2001/05/02 10:24:45 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Fallback.java,v 1.1 2001/04/17 18:51:27 sboag Exp $
+ * @(#)$Id: Fallback.java,v 1.2 2001/05/02 10:24:45 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,12 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -97,7 +102,7 @@
* Parse contents only if this fallback element is put in place of
* some unsupported element or non-XSLTC extension element
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
if (_active) {
parseChildren(element, parser);
}
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java
Index: ForEach.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ForEach.java 2001/04/17 18:51:29 1.1
+++ ForEach.java 2001/05/02 10:24:46 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ForEach.java,v 1.1 2001/04/17 18:51:29 sboag Exp $
+ * @(#)$Id: ForEach.java,v 1.2 2001/05/02 10:24:46 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,12 @@
import java.util.Vector;
import java.util.Enumeration;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -83,7 +88,7 @@
displayContents(indent + IndentIncrement);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_select = parser.parseExpression(this, element, "select");
parseChildren(element, parser);
1.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java
Index: If.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- If.java 2001/04/17 18:51:31 1.1
+++ If.java 2001/05/02 10:24:47 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: If.java,v 1.1 2001/04/17 18:51:31 sboag Exp $
+ * @(#)$Id: If.java,v 1.2 2001/05/02 10:24:47 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,11 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -80,7 +84,7 @@
displayContents(indent + IndentIncrement);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_test = parser.parseExpression(this, element, "test");
parseChildren(element, parser);
1.2 +9 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Import.java 2001/04/17 18:51:32 1.1
+++ Import.java 2001/05/02 10:24:48 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Import.java,v 1.1 2001/04/17 18:51:32 sboag Exp $
+ * @(#)$Id: Import.java,v 1.2 2001/05/02 10:24:48 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,12 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Enumeration;
-import com.sun.xml.tree.ElementEx;
+
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -80,7 +85,7 @@
return(_imported);
}
- public void parseContents(ElementEx element, final Parser parser) {
+ public void parseContents(Element element, final Parser parser) {
try {
final Stylesheet context = parser.getCurrentStylesheet();
final String href = element.getAttribute("href");
@@ -88,7 +93,7 @@
if (context.checkForLoop(toImport))
throw new Exception(toImport.toString() + " already loaded");
- final ElementEx stylesheetEl = parser.parse(toImport);
+ final Element stylesheetEl = parser.parse(toImport);
if (stylesheetEl == null) return;
final Stylesheet _imported = parser.makeStylesheet(stylesheetEl);
if (_imported == null) return;
1.2 +8 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java
Index: Include.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Include.java 2001/04/17 18:51:32 1.1
+++ Include.java 2001/05/02 10:24:50 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Include.java,v 1.1 2001/04/17 18:51:32 sboag Exp $
+ * @(#)$Id: Include.java,v 1.2 2001/05/02 10:24:50 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,11 @@
import java.net.MalformedURLException;
import java.util.Enumeration;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -81,7 +85,7 @@
return(_included);
}
- public void parseContents(ElementEx element, final Parser parser) {
+ public void parseContents(Element element, final Parser parser) {
try {
final Stylesheet context = parser.getCurrentStylesheet();
final String href = element.getAttribute("href");
@@ -89,7 +93,7 @@
if (context.checkForLoop(toInclude))
throw new Exception(toInclude.toString() + " already loaded");
- final ElementEx stylesheetEl = parser.parse(toInclude);
+ final Element stylesheetEl = parser.parse(toInclude);
if (stylesheetEl == null) return;
final Stylesheet _included = parser.makeStylesheet(stylesheetEl);
if (_included == null) return;
1.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java
Index: Key.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Key.java 2001/04/17 18:51:33 1.1
+++ Key.java 2001/05/02 10:24:51 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Key.java,v 1.1 2001/04/17 18:51:33 sboag Exp $
+ * @(#)$Id: Key.java,v 1.2 2001/05/02 10:24:51 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -62,7 +62,11 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import javax.xml.parsers.*;
+
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.compiler.util.Type;
@@ -76,7 +80,7 @@
private Expression _use;
private Type _useType;
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
// make sure values are provided
_name = parser.getQName(element.getAttribute("name"));
_match = parser.parsePattern(this, element, "match");
1.3 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
Index: LiteralElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LiteralElement.java 2001/05/01 13:16:18 1.2
+++ LiteralElement.java 2001/05/02 10:24:53 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralElement.java,v 1.2 2001/05/01 13:16:18 morten Exp $
+ * @(#)$Id: LiteralElement.java,v 1.3 2001/05/02 10:24:53 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,8 +68,10 @@
import java.util.Enumeration;
import java.util.Vector;
+import javax.xml.parsers.*;
+
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+import org.xml.sax.*;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -185,7 +187,7 @@
* Determines the final QName for the element and its attributes.
* Registers all namespaces that are used by the element/attributes
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final SymbolTable stable = parser.getSymbolTable();
// Find the closest literal element ancestor (if there is one)
1.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java
Index: Message.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Message.java 2001/04/17 18:51:36 1.1
+++ Message.java 2001/05/02 10:24:54 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Message.java,v 1.1 2001/04/17 18:51:36 sboag Exp $
+ * @(#)$Id: Message.java,v 1.2 2001/05/02 10:24:54 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
import org.apache.xalan.xsltc.compiler.util.Type;
@@ -76,7 +76,7 @@
final class Message extends Instruction {
private boolean _terminate = false;
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
String termstr = element.getAttribute("terminate");
if (termstr != null) {
_terminate = termstr.equals("yes");
1.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
Index: NamespaceAlias.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamespaceAlias.java 2001/04/17 18:51:38 1.1
+++ NamespaceAlias.java 2001/05/02 10:24:55 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NamespaceAlias.java,v 1.1 2001/04/17 18:51:38 sboag Exp $
+ * @(#)$Id: NamespaceAlias.java,v 1.2 2001/05/02 10:24:55 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,9 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -80,7 +82,7 @@
* The namespace alias definitions given here have an impact only on
* literal elements and literal attributes.
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
sPrefix = element.getAttribute("stylesheet-prefix");
rPrefix = element.getAttribute("result-prefix");
parser.getSymbolTable().addPrefixAlias(sPrefix,rPrefix);
1.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java
Index: Number.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Number.java 2001/04/17 18:51:39 1.1
+++ Number.java 2001/05/02 10:24:56 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Number.java,v 1.1 2001/04/17 18:51:39 sboag Exp $
+ * @(#)$Id: Number.java,v 1.2 2001/05/02 10:24:56 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.classfile.JavaClass;
@@ -103,7 +103,7 @@
"___any_node_counter" // LEVEL_ANY
};
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
NamedNodeMap attributes = element.getAttributes();
final int nAttributes = attributes.getLength();
1.2 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java
Index: Output.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Output.java 2001/04/17 18:51:40 1.1
+++ Output.java 2001/05/02 10:24:57 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Output.java,v 1.1 2001/04/17 18:51:40 sboag Exp $
+ * @(#)$Id: Output.java,v 1.2 2001/05/02 10:24:57 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,18 +64,18 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.runtime.TextOutput;
-
-import org.w3c.dom.*;
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
+import org.w3c.dom.*;
+
import de.fub.bytecode.generic.*;
import de.fub.bytecode.classfile.JavaClass;
+import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.runtime.TextOutput;
+
final class Output extends TopLevelElement {
// These attributes are extracted from the xsl:output element
@@ -138,7 +138,7 @@
/**
* Scans the attribute list for the xsl:output instruction
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_method = element.getAttribute("method");
_version = element.getAttribute("version");
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java
Index: Param.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Param.java 2001/04/17 18:51:41 1.1
+++ Param.java 2001/05/02 10:24:59 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Param.java,v 1.1 2001/04/17 18:51:41 sboag Exp $
+ * @(#)$Id: Param.java,v 1.2 2001/05/02 10:24:59 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,15 +64,20 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import com.sun.xml.tree.ElementEx;
+
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+
import de.fub.bytecode.generic.Instruction;
import de.fub.bytecode.generic.*;
import de.fub.bytecode.classfile.Field;
+
import org.apache.xalan.xsltc.compiler.util.*;
final class Param extends TopLevelElement {
+
private QName _name;
private boolean _isLocal; // true if the param is local
private Expression _select;
@@ -132,7 +137,7 @@
return _name;
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
// Parse attributes name and select (if present)
final String name = element.getAttribute("name");
1.4 +110 -100
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Parser.java 2001/05/01 14:11:38 1.3
+++ Parser.java 2001/05/02 10:25:00 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Parser.java,v 1.3 2001/05/01 14:11:38 morten Exp $
+ * @(#)$Id: Parser.java,v 1.4 2001/05/02 10:25:00 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -74,10 +74,10 @@
import java.util.StringTokenizer;
import java.net.MalformedURLException;
+import javax.xml.parsers.*;
+
import org.w3c.dom.*;
import org.xml.sax.*;
-import com.sun.xml.tree.*;
-import com.sun.xml.parser.Resolver;
import java_cup.runtime.Symbol;
@@ -277,7 +277,7 @@
* and then parse, typecheck and compile the instance.
* Must be called after <code>parse()</code>.
*/
- public Stylesheet makeStylesheet(ElementEx element)
+ public Stylesheet makeStylesheet(Element element)
throws CompilerException {
try {
Stylesheet stylesheet;
@@ -287,7 +287,7 @@
// Get the name of this element and try to map it to a class
final QName qName = getQName(element.getTagName());
- final String namespace = element.getNamespace();
+ final String namespace = element.getNamespaceURI();
final String classname = (String)_instructionClasses.get(qName);
// Make a Stylesheet object from the root node if it is an
@@ -317,7 +317,7 @@
* Update the symbol table with the namespace declarations defined in
* <tt>element</tt>.
*/
- public void pushNamespaces(ElementEx element) {
+ public void pushNamespaces(Element element) {
pushPopNamespaces(element, true);
}
@@ -325,7 +325,7 @@
* Update the symbol table with the namespace declarations defined in
* <tt>element</tt>.
*/
- public void popNamespaces(ElementEx element) {
+ public void popNamespaces(Element element) {
pushPopNamespaces(element, false);
}
@@ -334,7 +334,7 @@
* <tt>element</tt>. The declarations are added or removed form the
* symbol table depending on the value of <tt>push</tt>.
*/
- private void pushPopNamespaces(ElementEx element, boolean push) {
+ private void pushPopNamespaces(Element element, boolean push) {
final NamedNodeMap map = element.getAttributes();
final int n = map.getLength();
for (int i = 0; i < n; i++) {
@@ -362,18 +362,18 @@
}
}
- public void createAST(ElementEx stylesheetElement, Stylesheet
stylesheet) {
+ public void createAST(Element element, Stylesheet stylesheet) {
try {
if (stylesheet != null) {
- stylesheet.parseContents(stylesheetElement, this);
+ stylesheet.parseContents(element, this);
final int precedence = stylesheet.getImportPrecedence();
final Enumeration elements = stylesheet.elements();
while (elements.hasMoreElements()) {
- Object element = elements.nextElement();
+ Object child = elements.nextElement();
// GTM: fixed bug # 4415344
- if (element instanceof Text){
+ if (child instanceof Text){
throw new TypeCheckError(new ErrorMsg(
- "character data '" + ((Text)element).getText() +
+ "character data '" + ((Text)child).getText() +
"' found outside top level stylesheet element."));
}
}
@@ -387,25 +387,31 @@
addError(new ErrorMsg(e.toString())); // TODO
}
}
+
+ public Element parse(URL url) {
+ return(parse(url.toString()));
+ }
- public ElementEx parse(URL stylesheetURL) {
+ public Element parse(String stylesheetURL) {
try {
- final InputSource input =
- Resolver.createInputSource(stylesheetURL, true);
- com.sun.xml.parser.Parser parser = new com.sun.xml.parser.Parser();
- final XmlDocumentBuilderEx builder = new XmlDocumentBuilderEx();
- builder.setDisableNamespaces(false); // enable namespaces
- parser.setDocumentHandler(builder);
- parser.parse(input);
- final XmlDocument document = builder.getDocument();
- return (ElementEx)getStylesheet(document);
+ // Get an instance of the document builder factory
+ final DocumentBuilderFactory factory =
+ DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+
+ // Then make an instance of the actual document builder
+ final DocumentBuilder builder = factory.newDocumentBuilder();
+ if (!builder.isNamespaceAware()) { // Must be namespace aware
+ addError(new ErrorMsg("SAX parser is not namespace aware"));
+ }
+
+ // Parse the stylesheet document and return the root element
+ Document document = builder.parse(stylesheetURL);
+ return document.getDocumentElement();
}
- catch (FileNotFoundException e) {
- addError(new ErrorMsg(ErrorMsg.FILENOTF_ERR, stylesheetURL));
+ catch (ParserConfigurationException e) {
+ addError(new ErrorMsg("JAXP parser not configured correctly"));
}
- catch (MalformedURLException e) {
- addError(new ErrorMsg(ErrorMsg.INVALURI_ERR, stylesheetURL));
- }
catch (IOException e) {
addError(new ErrorMsg(ErrorMsg.FILECANT_ERR, stylesheetURL));
}
@@ -415,9 +421,6 @@
catch (SAXException e) {
addError(new ErrorMsg(e.getMessage()));
}
- catch (CompilerException e) {
- addError(new ErrorMsg(e.getMessage()));
- }
return null;
}
@@ -428,14 +431,14 @@
* same as the value declared in the <?xml-stylesheet...?> processing
* instruction (P.I.). In the xml-stylesheet P.I. the value is labeled
* as the 'href' data of the P.I. The extracted DOM representing the
- * stylesheet is returned as an ElementEx object.
+ * stylesheet is returned as an Element object.
*/
- private ElementEx getStylesheet(XmlDocument doc) throws
CompilerException {
+ private Element getStylesheet(Document doc) throws CompilerException {
// Get the xml-stylesheet processing instruction (P.I.)
org.w3c.dom.ProcessingInstruction stylesheetPI = getStylesheetPI(doc);
// If there is none we assume this is a pure XSL file and return root.
- if (stylesheetPI == null ) return (ElementEx)doc.getDocumentElement();
+ if (stylesheetPI == null ) return (Element)doc.getDocumentElement();
// Get href value from P.I. to identify the correct stylesheet
String href = getXmlStylesheetPIHrefValue(stylesheetPI);
@@ -458,7 +461,7 @@
Node attr = map.getNamedItem("id");
String attrValue = attr.getNodeValue();
if ((href == null) || (href.equals(attrValue))) {
- return (ElementEx)curr;
+ return (Element)curr;
}
}
}
@@ -469,7 +472,7 @@
// the absence of an href should be an error. See 'href == null'
// above.... we will remove this comment and associated line
// after test suite confirms it has not damaged anything else.
- // if (href == null) return (ElementEx)doc.getDocumentElement();
+ // if (href == null) return (Element)doc.getDocumentElement();
// If we did not find the references stylesheet in the current XML
// file we assume it is an external file and load that...
@@ -479,30 +482,30 @@
/**
* For embedded stylesheets: Load an external file with stylesheet
*/
- private ElementEx loadExternalStylesheet(XmlDocument doc, String url)
+ private Element loadExternalStylesheet(Document doc, String url)
throws CompilerException {
try {
// Check if the URL is a local file
if ((new File(url)).exists()) url = "file:"+url;
- // Create the input source from the URL
- InputSource input = Resolver.createInputSource(new URL(url), true);
-
- // Parse the input document
- com.sun.xml.parser.Parser parser = new com.sun.xml.parser.Parser();
- final XmlDocumentBuilderEx builder = new XmlDocumentBuilderEx();
- builder.setDisableNamespaces(false); // enable namespaces
- parser.setDocumentHandler(builder);
- parser.parse(input);
-
- // Get the document handler and return the root element
- doc = builder.getDocument();
- return (ElementEx)doc.getDocumentElement();
- }
- catch (MalformedURLException e) {
- throw new CompilerException("Could not find stylesheet - '"+url+
- "' is not a named element in the "+
- "current file nor a valid URL.");
+ // Get an instance of the document builder factory
+ final DocumentBuilderFactory factory =
+ DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+
+ // Then make an instance of the actual document builder
+ final DocumentBuilder builder = factory.newDocumentBuilder();
+ if (!builder.isNamespaceAware()) { // Must be namespace aware
+ addError(new ErrorMsg("SAX parser is not namespace aware"));
+ }
+
+ // Parse the stylesheet document and return the root element
+ Document document = builder.parse(url);
+ return document.getDocumentElement();
+ }
+ catch (ParserConfigurationException e) {
+ throw new CompilerException("JAXP parser not configured "+
+ "correctly");
}
catch (IOException e) {
throw new CompilerException("Could not find stylesheet - '"+url+
@@ -518,20 +521,41 @@
/**
* Returns the first xml-stylesheet processing instruction found in the
DOM.
*/
- private org.w3c.dom.ProcessingInstruction getStylesheetPI(XmlDocument
doc) {
- TreeWalker walker = new TreeWalker(doc);
- Node node = null;
- String embStylesheetName = null;
-
- while ((node = walker.getNext()) != null ) {
- if(node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
- org.w3c.dom.ProcessingInstruction curr;
- curr = (org.w3c.dom.ProcessingInstruction)node;
- if (curr.getTarget().equals("xml-stylesheet")) {
- return curr;
- }
- }
- }
+ private org.w3c.dom.ProcessingInstruction getStylesheetPI(Document doc) {
+
+ Node node = doc;
+
+ while (node != null) {
+ switch (node.getNodeType ()) {
+ case Node.PROCESSING_INSTRUCTION_NODE:
+ org.w3c.dom.ProcessingInstruction pi =
+ (org.w3c.dom.ProcessingInstruction)node;
+ if (pi.getTarget().equals("xml-stylesheet")) return pi;
+ // FALLTHROUGH
+ case Node.DOCUMENT_FRAGMENT_NODE:
+ case Node.DOCUMENT_NODE:
+ case Node.ELEMENT_NODE:
+ // First try to traverse any children of the node
+ Node child = node.getFirstChild();
+ if (child != null) {
+ node = child;
+ break;
+ }
+ // FALLTHROUGH
+ default:
+ // Then try the siblings
+ Node next = node.getNextSibling();
+ if (next == null) {
+ // Then step up to the parent node
+ Node parent = node.getParentNode();
+ if ((parent == null) || (node == doc)) return null;
+ node = parent;
+ }
+ else {
+ node = next;
+ }
+ }
+ }
return null;
}
@@ -784,36 +808,22 @@
_template = template;
}
- private ElementEx findFallback(ElementEx root) {
- /*
- Node node = root.getNextSibling();
- while (node != null) {
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- String namespace = ((ElementEx)node).getNamespace();
- String localname = ((ElementEx)node).getLocalName();
- if (namespace.equals(XSLT_URI) && localname.equals("fallback"))
- return (ElementEx)node;
- //else
- // node = null; // Stop when
- }
- node = node.getNextSibling();
- }
- */
+ private Element findFallback(Element root) {
final NodeList nodes = root.getChildNodes();
final int length = (nodes != null) ? nodes.getLength() : 0;
for (int i = 0; i < length; i++) {
Node node = nodes.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
- ElementEx child = (ElementEx)node;
- String namespace = child.getNamespace();
+ Element child = (Element)node;
+ String namespace = child.getNamespaceURI();
String localname = child.getLocalName();
if (namespace.equals(XSLT_URI) &&
localname.equals("fallback")) {
return child;
}
else {
- ElementEx result = findFallback(child);
+ Element result = findFallback(child);
if (result != null) return result;
}
}
@@ -821,8 +831,8 @@
return null;
}
- public Fallback makeFallback(ElementEx root) {
- ElementEx element = findFallback(root);
+ public Fallback makeFallback(Element root) {
+ Element element = findFallback(root);
if (element != null) {
Fallback fallback = (Fallback)makeInstance(FALLBACK_CLASS, element);
fallback.activate();
@@ -838,14 +848,14 @@
* Creates an object that is of a sub-class of SyntaxTreeNode
* from the node in the DOM (if possible).
*/
- public SyntaxTreeNode makeInstance(ElementEx element) {
+ public SyntaxTreeNode makeInstance(Element element) {
QName qName = getQName(element.getTagName());
String className = (String)_instructionClasses.get(qName);
if (className != null) {
return makeInstance(className, element);
}
else {
- final String namespace = element.getNamespace();
+ final String namespace = element.getNamespaceURI();
if (namespace != null) {
// Check if the element belongs in our namespace
if (namespace.equals(XSLT_URI)) {
@@ -873,7 +883,7 @@
}
}
- private SyntaxTreeNode makeInstance(String className, ElementEx element)
{
+ private SyntaxTreeNode makeInstance(String className, Element element) {
if (className != null) {
try {
final Class clazz = Class.forName(className);
@@ -902,20 +912,20 @@
}
public Expression parseExpression(SyntaxTreeNode parent,
- ElementEx element, String attrName) {
+ Element element, String attrName) {
return parseExpression(parent, element, attrName, null);
}
public Expression parseExpression(SyntaxTreeNode parent,
- ElementEx element, String attrName,
+ Element element, String attrName,
String defaultValue) {
String expression = element.getAttribute(attrName);
if (expression.length() == 0 && defaultValue != null) {
expression = defaultValue;
}
- final int line = ((Integer)element.getUserObject()).intValue();
+ //final int line = ((Integer)element.getUserObject()).intValue();
return (Expression)parseTopLevel(parent, "<EXPRESSION>" +
expression,
- line, expression);
+ -1 /*line*/, expression);
}
public Pattern parsePattern(SyntaxTreeNode parent, String pattern) {
@@ -923,11 +933,11 @@
}
public Pattern parsePattern(SyntaxTreeNode parent,
- ElementEx element, String attrName) {
+ Element element, String attrName) {
final String pattern = element.getAttribute(attrName);
- final int line = ((Integer)element.getUserObject()).intValue();
- return (Pattern)parseTopLevel(parent,
- "<PATTERN>" + pattern, line, pattern);
+ //final int line = ((Integer)element.getUserObject()).intValue();
+ return (Pattern)parseTopLevel(parent, "<PATTERN>" + pattern,
+ -1 /*line*/, pattern);
}
private SyntaxTreeNode parseTopLevel(SyntaxTreeNode parent,
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
Index: ProcessingInstruction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessingInstruction.java 2001/04/17 18:51:43 1.1
+++ ProcessingInstruction.java 2001/05/02 10:25:01 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ProcessingInstruction.java,v 1.1 2001/04/17 18:51:43 sboag Exp $
+ * @(#)$Id: ProcessingInstruction.java,v 1.2 2001/05/02 10:25:01 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -71,7 +72,7 @@
final class ProcessingInstruction extends Instruction {
private AttributeValue _name; // name treated as AVT (7.1.3)
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String name =element.getAttribute("name");
_name = AttributeValue.create(this, name, parser);
if (name.equals("xml")) {
1.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java
Index: Sort.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Sort.java 2001/04/17 18:51:47 1.1
+++ Sort.java 2001/05/02 10:25:02 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Sort.java,v 1.1 2001/04/17 18:51:47 sboag Exp $
+ * @(#)$Id: Sort.java,v 1.2 2001/05/02 10:25:02 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,9 +69,11 @@
import java.util.NoSuchElementException;
import java.text.Collator;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+
import de.fub.bytecode.classfile.JavaClass;
import de.fub.bytecode.classfile.Field;
import de.fub.bytecode.classfile.Method;
@@ -93,7 +95,7 @@
/**
* Parse the attributes of the xsl:sort element
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
// Parse the select expression (node string value if no expression)
_select = parser.parseExpression(this, element, "select", "string(.)");
1.3 +12 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Stylesheet.java 2001/05/01 14:11:39 1.2
+++ Stylesheet.java 2001/05/02 10:25:04 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Stylesheet.java,v 1.2 2001/05/01 14:11:39 morten Exp $
+ * @(#)$Id: Stylesheet.java,v 1.3 2001/05/02 10:25:04 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -70,14 +70,22 @@
import java.util.StringTokenizer;
import java.net.URL;
+import javax.xml.parsers.*;
+
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import de.fub.bytecode.classfile.JavaClass;
+
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.DOM;
public final class Stylesheet extends SyntaxTreeNode {
@@ -245,7 +253,7 @@
* entry to the symbol table mapping the name <tt>%stylesheet%</tt>
* to an instance of this class.
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final SymbolTable stable = parser.getSymbolTable();
// Add namespace declarations to symbol table
1.2 +14 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
Index: SyntaxTreeNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyntaxTreeNode.java 2001/04/17 18:51:48 1.1
+++ SyntaxTreeNode.java 2001/05/02 10:25:05 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SyntaxTreeNode.java,v 1.1 2001/04/17 18:51:48 sboag Exp $
+ * @(#)$Id: SyntaxTreeNode.java,v 1.2 2001/05/02 10:25:05 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,8 +66,11 @@
import java.util.Vector;
import java.util.Enumeration;
+
+import javax.xml.parsers.*;
+
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -180,7 +183,7 @@
* This method is normally overriden by subclasses.
* By default, it parses all the children of <tt>element</tt>.
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
parseChildren(element, parser);
}
@@ -188,7 +191,7 @@
* Parse all the children of <tt>element</tt>.
* XSLT commands are recognized by the XSLT namespace
*/
- public final void parseChildren(ElementEx element, Parser parser) {
+ public final void parseChildren(Element element, Parser parser) {
final NodeList nl = element.getChildNodes();
final int n = nl != null ? nl.getLength() : 0;
Vector locals = null; // only create when needed
@@ -198,7 +201,7 @@
switch (node.getNodeType()) {
case Node.ELEMENT_NODE:
- final ElementEx child = (ElementEx)node;
+ final Element child = (Element)node;
// Add namespace declarations to symbol table
parser.pushNamespaces(child);
final SyntaxTreeNode instance = parser.makeInstance(child);
@@ -367,17 +370,17 @@
return _line;
}
- protected static void reportError(ElementEx element, Parser parser,
+ protected static void reportError(Element element, Parser parser,
int errorCode, String errMsg) {
- final int lineNumber = ((Integer)element.getUserObject()).intValue();
- final ErrorMsg error = new ErrorMsg(errorCode, lineNumber, errMsg);
+ //final int lineNumber = ((Integer)element.getUserObject()).intValue();
+ final ErrorMsg error = new ErrorMsg(errorCode, -1 /*lineNumber*/,
errMsg);
parser.addError(error);
}
- protected static void reportWarning(ElementEx element, Parser parser,
+ protected static void reportWarning(Element element, Parser parser,
int errorCode, String errMsg) {
- final int lineNumber = ((Integer)element.getUserObject()).intValue();
- final ErrorMsg error = new ErrorMsg(errorCode, lineNumber, errMsg);
+ //final int lineNumber = ((Integer)element.getUserObject()).intValue();
+ final ErrorMsg error = new ErrorMsg(errorCode, -1 /*lineNumber*/,
errMsg);
parser.addWarning(error);
}
1.3 +5 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java
Index: Template.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Template.java 2001/05/01 13:16:19 1.2
+++ Template.java 2001/05/02 10:25:06 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Template.java,v 1.2 2001/05/01 13:16:19 morten Exp $
+ * @(#)$Id: Template.java,v 1.3 2001/05/02 10:25:06 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
@@ -206,7 +207,7 @@
return _stylesheet;
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String name = element.getAttribute("name");
final String mode = element.getAttribute("mode");
@@ -251,7 +252,7 @@
parser.setTemplate(null); // clear template
}
- public void parseSimplified(ElementEx element, Parser parser) {
+ public void parseSimplified(Element element, Parser parser) {
_stylesheet = super.getStylesheet();
1.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java
Index: Text.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Text.java 2001/04/17 18:51:49 1.1
+++ Text.java 2001/05/02 10:25:07 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Text.java,v 1.1 2001/04/17 18:51:49 sboag Exp $
+ * @(#)$Id: Text.java,v 1.2 2001/05/02 10:25:07 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.w3c.dom.*;
-import com.sun.xml.tree.ElementEx;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -90,7 +90,7 @@
Util.println(_text);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String str = element.getAttribute("disable-output-escaping");
if ((str != null) && (str.equals("yes"))) {
_escaping = false;
1.2 +2 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java
Index: TopLevelElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TopLevelElement.java 2001/04/17 18:51:49 1.1
+++ TopLevelElement.java 2001/05/02 10:25:08 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TopLevelElement.java,v 1.1 2001/04/17 18:51:49 sboag Exp $
+ * @(#)$Id: TopLevelElement.java,v 1.2 2001/05/02 10:25:08 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,6 +63,7 @@
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java
Index: TransletOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransletOutput.java 2001/04/17 18:51:49 1.1
+++ TransletOutput.java 2001/05/02 10:25:10 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransletOutput.java,v 1.1 2001/04/17 18:51:49 sboag Exp $
+ * @(#)$Id: TransletOutput.java,v 1.2 2001/05/02 10:25:10 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -76,7 +77,7 @@
Util.println("TransletOutput " + _port);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_port = AttributeValue.create(this,
element.getAttribute("port"), parser);
parseChildren(element, parser);
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
Index: UseAttributeSets.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UseAttributeSets.java 2001/04/17 18:51:51 1.1
+++ UseAttributeSets.java 2001/05/02 10:25:12 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UseAttributeSets.java,v 1.1 2001/04/17 18:51:51 sboag Exp $
+ * @(#)$Id: UseAttributeSets.java,v 1.2 2001/05/02 10:25:12 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
1.2 +6 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java
Index: ValueOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValueOf.java 2001/04/17 18:51:51 1.1
+++ ValueOf.java 2001/05/02 10:25:13 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ValueOf.java,v 1.1 2001/04/17 18:51:51 sboag Exp $
+ * @(#)$Id: ValueOf.java,v 1.2 2001/05/02 10:25:13 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,10 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
+import de.fub.bytecode.generic.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -80,7 +83,7 @@
Util.println("select " + _select.toString());
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
_select = parser.parseExpression(this, element, "select");
// make sure required attribute(s) have been set
1.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Variable.java 2001/04/17 18:51:51 1.1
+++ Variable.java 2001/05/02 10:25:15 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Variable.java,v 1.1 2001/04/17 18:51:51 sboag Exp $
+ * @(#)$Id: Variable.java,v 1.2 2001/05/02 10:25:15 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,9 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import com.sun.xml.tree.ElementEx;
+
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.Instruction;
import de.fub.bytecode.generic.*;
@@ -179,7 +181,7 @@
return _stackIndex;
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
// parse attributes name and select (if present)
final String name = element.getAttribute("name");
if (name.length() > 0) {
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java
Index: When.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- When.java 2001/04/17 18:51:52 1.1
+++ When.java 2001/05/02 10:25:16 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: When.java,v 1.1 2001/04/17 18:51:52 sboag Exp $
+ * @(#)$Id: When.java,v 1.2 2001/05/02 10:25:16 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.*;
final class When extends Instruction {
@@ -82,7 +83,7 @@
return _test;
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
boolean ignore = false;
_test = parser.parseExpression(this, element, "test");
if (_test instanceof ElementAvailableCall) {
1.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java
Index: Whitespace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Whitespace.java 2001/04/17 18:51:52 1.1
+++ Whitespace.java 2001/05/02 10:25:17 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Whitespace.java,v 1.1 2001/04/17 18:51:52 sboag Exp $
+ * @(#)$Id: Whitespace.java,v 1.2 2001/05/02 10:25:17 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,9 +65,11 @@
import java.util.Vector;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+
import de.fub.bytecode.classfile.JavaClass;
import de.fub.bytecode.classfile.Field;
import de.fub.bytecode.classfile.Method;
@@ -159,7 +161,7 @@
* Parse the attributes of the xsl:strip/preserve-space element.
* The element should have not contents (ignored if any).
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
// Determine if this is an xsl:strip- or preserve-space element
_action = element.getTagName().endsWith("strip-space")
? STRIP_SPACE : PRESERVE_SPACE;
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java
Index: WithParam.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WithParam.java 2001/04/17 18:51:52 1.1
+++ WithParam.java 2001/05/02 10:25:18 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: WithParam.java,v 1.1 2001/04/17 18:51:52 sboag Exp $
+ * @(#)$Id: WithParam.java,v 1.2 2001/05/02 10:25:18 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import de.fub.bytecode.generic.*;
@@ -83,7 +84,7 @@
displayContents(indent + IndentIncrement);
}
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final String name = element.getAttribute("name");
if (name.length() > 0) {
_name = parser.getQName(name);
1.3 +11 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java
Index: XSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTC.java 2001/04/27 20:06:12 1.2
+++ XSLTC.java 2001/05/02 10:25:19 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XSLTC.java,v 1.2 2001/04/27 20:06:12 curcuru Exp $
+ * @(#)$Id: XSLTC.java,v 1.3 2001/05/02 10:25:19 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -79,8 +79,11 @@
import java.net.MalformedURLException;
import java.util.jar.*;
-import com.sun.xml.tree.*;
+import javax.xml.parsers.*;
+import org.w3c.dom.Element;
+import org.xml.sax.*;
+
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.util.getopt.*;
import org.apache.xalan.xsltc.DOM;
@@ -180,7 +183,7 @@
setClassName(Util.toJavaName(Util.noExtName(baseName)));
}
- final ElementEx stylesheetElement = _parser.parse(stylesheet);
+ final Element stylesheetElement = _parser.parse(stylesheet);
if (_parser.errorsFound()) {
_parser.printErrors();
return false;
@@ -484,16 +487,18 @@
// create the manifest
final Manifest manifest = new Manifest();
manifest.getMainAttributes()
- .put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ .put(java.util.jar.Attributes.Name.MANIFEST_VERSION, "1.0");
final Map map = manifest.getEntries();
// create manifest
Enumeration classes = _classes.elements();
final String now = (new Date()).toString();
- final Attributes.Name dateAttr = new Attributes.Name("Date");
+ final java.util.jar.Attributes.Name dateAttr =
+ new java.util.jar.Attributes.Name("Date");
while (classes.hasMoreElements()) {
final JavaClass clazz = (JavaClass)classes.nextElement();
- final Attributes attr = new Attributes();
+ final java.util.jar.Attributes attr =
+ new java.util.jar.Attributes();
attr.put(dateAttr, now);
map.put(classFileName(clazz.getClassName()), attr);
}
1.2 +4 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java
Index: XslAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XslAttribute.java 2001/04/17 18:51:53 1.1
+++ XslAttribute.java 2001/05/02 10:25:20 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XslAttribute.java,v 1.1 2001/04/17 18:51:53 sboag Exp $
+ * @(#)$Id: XslAttribute.java,v 1.2 2001/05/02 10:25:20 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,8 @@
import java.util.Vector;
-import com.sun.xml.tree.ElementEx;
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -96,7 +97,7 @@
/**
* Parses the attribute's contents. Special care taken for namespaces.
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final SymbolTable stable = parser.getSymbolTable();
String namespace = element.getAttribute("namespace");
1.3 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java
Index: XslElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XslElement.java 2001/05/01 13:16:19 1.2
+++ XslElement.java 2001/05/02 10:25:22 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XslElement.java,v 1.2 2001/05/01 13:16:19 morten Exp $
+ * @(#)$Id: XslElement.java,v 1.3 2001/05/02 10:25:22 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,9 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import com.sun.xml.tree.ElementEx;
+
+import org.w3c.dom.*;
+
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -98,7 +100,7 @@
* around the problem by treating the namaspace attribute as a constant.
* (Yes, I know this is a hack, bad, bad, bad.)
*/
- public void parseContents(ElementEx element, Parser parser) {
+ public void parseContents(Element element, Parser parser) {
final SymbolTable stable = parser.getSymbolTable();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
