zongaro 2002/12/17 11:06:39
Modified: java/src/org/apache/xml/dtm/ref/sax2dtm Tag: XSLTC_DTM
SAX2DTM.java
Log:
Changed dispatchCharactersEvents and getStringValue methods to use _parent to
determine whether a node is a descendant of another, in the same way that
DescendantIterator does, rather than using the more expensive _level.
Revision Changes Path
No revision
No revision
1.28.2.9 +6 -8
xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java,v
retrieving revision 1.28.2.8
retrieving revision 1.28.2.9
diff -u -r1.28.2.8 -r1.28.2.9
--- SAX2DTM.java 10 Dec 2002 18:48:50 -0000 1.28.2.8
+++ SAX2DTM.java 17 Dec 2002 19:06:38 -0000 1.28.2.9
@@ -506,12 +506,11 @@
{
int offset = -1;
int length = 0;
- int level = _level(identity);
+ int startNode = identity;
identity = firstChild;
- while (DTM.NULL != identity && (_level(identity) > level))
- {
+ do {
type = _type(identity);
if (isTextType(type))
@@ -527,7 +526,7 @@
}
identity = getNextNodeIdentity(identity);
- }
+ } while (DTM.NULL != identity && (_parent(identity) >= startNode));
if (length > 0)
{
@@ -1212,12 +1211,11 @@
{
int offset = -1;
int length = 0;
- int level = _level(identity);
+ int startNode = identity;
identity = firstChild;
- while (DTM.NULL != identity && (_level(identity) > level))
- {
+ do {
type = _type(identity);
if (isTextType(type))
@@ -1233,7 +1231,7 @@
}
identity = getNextNodeIdentity(identity);
- }
+ } while (DTM.NULL != identity && (_parent(identity) >= startNode));
if (length > 0)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
