You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/05/15 01:04:07 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath SourceTreeManager.java
sboag 01/05/14 16:04:07
Modified: java/src/org/apache/xalan/transformer Tag: DTM_EXP
ResultTreeHandler.java
java/src/org/apache/xml/dtm Tag: DTM_EXP
DTMManagerDefault.java DTMTreeWalker.java
java/src/org/apache/xpath Tag: DTM_EXP
SourceTreeManager.java
Log:
Changed things so that callers use getNodeNameX instead of
getPrefix for namespace nodes, to get the prefix being declared.
Revision Changes Path
No revision
No revision
1.37.2.5 +7 -4 xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -r1.37.2.4 -r1.37.2.5
--- ResultTreeHandler.java 2001/05/10 20:48:25 1.37.2.4
+++ ResultTreeHandler.java 2001/05/14 23:03:59 1.37.2.5
@@ -897,7 +897,7 @@
public void ensureNamespaceDeclDeclared(DTM dtm, int namespace) throws org.xml.sax.SAXException
{
String uri = dtm.getNodeValue(namespace);
- String prefix = dtm.getPrefix(namespace);
+ String prefix = dtm.getNodeNameX(namespace);
if ((uri != null && uri.length() > 0) && (null != prefix))
{
@@ -1048,7 +1048,8 @@
for (int namespace = dtm.getFirstNamespaceNode(src, true);
DTM.NULL != namespace; namespace = dtm.getNextNamespaceNode(src, namespace, true))
{
- String prefix = dtm.getPrefix(namespace);
+ // String prefix = dtm.getPrefix(namespace);
+ String prefix = dtm.getNodeNameX(namespace);
String desturi = getURI(prefix);
String srcURI = dtm.getStringValue(namespace);
@@ -1292,7 +1293,8 @@
DTM dtm = m_transformer.getXPathContext().getDTM(attr);
if(DTM.NAMESPACE_NODE == dtm.getNodeType(attr))
{
- String prefix = dtm.getPrefix(attr);
+ // String prefix = dtm.getPrefix(attr);
+ String prefix = dtm.getNodeNameX(attr);
String uri = getURI(prefix);
if ((null != uri) && uri.equals(dtm.getStringValue(attr)))
@@ -1316,7 +1318,8 @@
{
if(DTM.NAMESPACE_NODE == dtm.getNodeType(attr))
{
- String prefix = dtm.getPrefix(attr);
+ // String prefix = dtm.getPrefix(attr);
+ String prefix = dtm.getNodeNameX(attr);
String uri = getURI(prefix);
if ((null != uri) && uri.equals(dtm.getStringValue(attr)))
No revision
No revision
1.1.2.6 +8 -0 xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMManagerDefault.java
Index: DTMManagerDefault.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMManagerDefault.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- DTMManagerDefault.java 2001/05/14 05:19:11 1.1.2.5
+++ DTMManagerDefault.java 2001/05/14 23:04:02 1.1.2.6
@@ -132,7 +132,10 @@
m_dtms.add(dtm);
if(DUMPTREE)
+ {
+ System.out.println("Dumping DOM2DTM");
dtm.dumpDTM();
+ }
return dtm;
}
@@ -202,15 +205,20 @@
}
catch(RuntimeException re)
{
+ re.printStackTrace();
throw re;
}
catch(Exception e)
{
+ e.printStackTrace();
throw new org.apache.xml.utils.WrappedRuntimeException(e);
}
if(DUMPTREE)
+ {
+ System.out.println("Dumping SAX2DOM");
dtm.dumpDTM();
+ }
return dtm;
}
else
1.1.2.4 +4 -2 xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMTreeWalker.java
Index: DTMTreeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/Attic/DTMTreeWalker.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DTMTreeWalker.java 2001/05/14 05:19:11 1.1.2.3
+++ DTMTreeWalker.java 2001/05/14 23:04:02 1.1.2.4
@@ -275,7 +275,8 @@
for (int nsn = m_dtm.getFirstNamespaceNode(node, true); DTM.NULL != nsn;
nsn = m_dtm.getNextNamespaceNode(node, nsn, true))
{
- String prefix = m_dtm.getPrefix(nsn);
+ // String prefix = m_dtm.getPrefix(nsn);
+ String prefix = m_dtm.getNodeNameX(nsn);
this.m_contentHandler.startPrefixMapping(prefix,
m_dtm.getStringValue(nsn));
@@ -390,7 +391,8 @@
for (int nsn = m_dtm.getFirstNamespaceNode(node, true); DTM.NULL != nsn;
nsn = m_dtm.getNextNamespaceNode(node, nsn, true))
{
- String prefix = m_dtm.getPrefix(nsn);
+ // String prefix = m_dtm.getPrefix(nsn);
+ String prefix = m_dtm.getNodeNameX(nsn);
this.m_contentHandler.endPrefixMapping(prefix);
}
No revision
No revision
1.24.2.4 +1 -0 xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -r1.24.2.3 -r1.24.2.4
--- SourceTreeManager.java 2001/05/07 13:15:35 1.24.2.3
+++ SourceTreeManager.java 2001/05/14 23:04:05 1.24.2.4
@@ -347,6 +347,7 @@
}
catch (Exception e)
{
+ e.printStackTrace();
throw new TransformerException(e.getMessage(), locator, e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org