mkwan 2003/01/10 08:20:37
Modified: java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
SAXImpl.java DOMImpl.java
Log:
Remove the node type check in SAXImpl.lessThan() and DOMImpl.lessThan().
In DTM, the handle of an attribute node immediately follows its parent
element node. We can compare the order directly using the node handles.
Revision Changes Path
No revision
No revision
1.1.2.23 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java
Index: SAXImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- SAXImpl.java 21 Dec 2002 10:24:38 -0000 1.1.2.22
+++ SAXImpl.java 10 Jan 2003 16:20:34 -0000 1.1.2.23
@@ -277,6 +277,7 @@
return true;
}
+ /*
// Hack for ordering attribute nodes
if (getNodeType(node1) == DTM.ATTRIBUTE_NODE) {
node1 = getParent(node1);
@@ -285,6 +286,7 @@
if (getNodeType(node2) == DTM.ATTRIBUTE_NODE) {
node2 = getParent(node2);
}
+ */
return (node1 < node2);
}
1.68.2.21 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.68.2.20
retrieving revision 1.68.2.21
diff -u -r1.68.2.20 -r1.68.2.21
--- DOMImpl.java 21 Dec 2002 10:24:38 -0000 1.68.2.20
+++ DOMImpl.java 10 Jan 2003 16:20:35 -0000 1.68.2.21
@@ -371,6 +371,7 @@
if (node2 == DTM.NULL)
return true;
+ /*
// Hack for ordering attribute nodes
if (getNodeType(node1) == DTM.ATTRIBUTE_NODE) {
node1 = getParent(node1);
@@ -378,6 +379,7 @@
if (getNodeType(node2) == DTM.ATTRIBUTE_NODE) {
node2 = getParent(node2);
}
+ */
return (node1 < node2);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
