jkesselm 01/06/11 12:26:21
Modified: java/src/org/apache/xml/dtm/ref/sax2dtm Tag: DTM_EXP
SAX2DTM.java
Log:
Revised namespace support
Revision Changes Path
No revision
No revision
1.1.2.7 +8 -6
xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/Attic/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/Attic/SAX2DTM.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SAX2DTM.java 2001/06/04 07:49:27 1.1.2.6
+++ SAX2DTM.java 2001/06/11 19:26:17 1.1.2.7
@@ -71,7 +71,6 @@
import org.apache.xml.utils.IntStack;
import org.apache.xml.utils.XMLCharacterRecognizer;
import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.dtm.*;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
import org.apache.xml.utils.WrappedRuntimeException;
@@ -84,7 +83,6 @@
implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler,
DeclHandler, LexicalHandler
{
-
/** simple DEBUG flag, for dumping diagnostics info. */
private static final boolean DEBUG = false;
@@ -858,10 +856,7 @@
m_prevsib[nodeIndex] = previousSibling;
m_parent[nodeIndex] = parentIndex;
m_exptype[nodeIndex] = expandedTypeID;
- m_dataOrQName[nodeIndex] = dataOrPrefix;
-
- if(DTM.NAMESPACE_NODE == type)
- m_haveSeenNamespace = true;
+ m_dataOrQName[nodeIndex] = dataOrPrefix;
if (DTM.NULL != parentIndex && type != DTM.ATTRIBUTE_NODE
&& type != DTM.NAMESPACE_NODE)
@@ -875,6 +870,9 @@
if (DTM.NULL != previousSibling)
m_nextsib[previousSibling] = nodeIndex;
+ if(type == DTM.NAMESPACE_NODE)
+ declareNamespaceInContext(parentIndex,nodeIndex);
+
return nodeIndex;
}
@@ -1666,6 +1664,10 @@
for (int i = startDecls; i < nDecls; i += 2)
{
+ // %TBD% JJK OUCH! We're explicitly reasserting the prefixes on every
+ // element. That is NOT USEFUL given that both Scott and Joe
implemented
+ // search-the-parents logic and we're supposedly trying to distinguish
+ // inherited from local.
prefix = (String) m_prefixMappings.elementAt(i);
if (prefix == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
