jkesselm 01/07/20 05:42:31
Modified: java/src/org/apache/xalan/transformer TreeWalker2Result.java
Log:
Redundant test removed, possibly redundant code flagged for %REVIEW%
Revision Changes Path
1.12 +49 -50
xml-xalan/java/src/org/apache/xalan/transformer/TreeWalker2Result.java
Index: TreeWalker2Result.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TreeWalker2Result.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TreeWalker2Result.java 2001/06/12 19:15:28 1.11
+++ TreeWalker2Result.java 2001/07/20 12:42:31 1.12
@@ -114,8 +114,8 @@
super.traverse(pos);
}
-
- /**
+
+ /**
* End processing of given node
*
*
@@ -143,58 +143,57 @@
protected void startNode(int node) throws org.xml.sax.SAXException
{
- XPathContext xcntxt = m_transformer.getXPathContext();
+ XPathContext xcntxt = m_transformer.getXPathContext();
try
{
- if (DTM.ELEMENT_NODE == m_dtm.getNodeType(node))
- {
- xcntxt.pushCurrentNode(node);
-
- if(m_startNode != node)
- {
- super.startNode(node);
- }
- else
- {
- String elemName = m_dtm.getNodeName(node);
- String localName = m_dtm.getLocalName(node);
- String namespace = m_dtm.getNamespaceURI(node);
-
- //xcntxt.pushCurrentNode(node);
- m_handler.startElement(namespace, localName,
elemName, null);
+ if (DTM.ELEMENT_NODE == m_dtm.getNodeType(node))
+ {
+ xcntxt.pushCurrentNode(node);
+
+ if(m_startNode != node)
+ {
+ super.startNode(node);
+ }
+ else
+ {
+ String elemName = m_dtm.getNodeName(node);
+ String localName = m_dtm.getLocalName(node);
+ String namespace = m_dtm.getNamespaceURI(node);
+
+ //xcntxt.pushCurrentNode(node);
+ m_handler.startElement(namespace, localName, elemName, null);
- if (DTM.ELEMENT_NODE ==
m_dtm.getNodeType(node))
- {
- boolean hasNSDecls = false;
- DTM dtm = m_dtm;
- for (int ns =
dtm.getFirstNamespaceNode(node, true);
- DTM.NULL != ns; ns =
dtm.getNextNamespaceNode(node, ns, true))
- {
-
m_handler.ensureNamespaceDeclDeclared(dtm, ns);
- }
-
- if(hasNSDecls)
- {
- m_handler.addNSDeclsToAttrs();
- }
-
- for (int attr =
dtm.getFirstAttribute(node);
- DTM.NULL != attr;
attr = dtm.getNextAttribute(attr))
- {
- m_handler.addAttribute(attr);
- }
- }
- }
-
- }
- else
- {
- xcntxt.pushCurrentNode(node);
- super.startNode(node);
- xcntxt.popCurrentNode();
- }
- }
+ boolean hasNSDecls = false;
+ DTM dtm = m_dtm;
+ for (int ns = dtm.getFirstNamespaceNode(node, true);
+ DTM.NULL != ns; ns = dtm.getNextNamespaceNode(node, ns, true))
+ {
+ m_handler.ensureNamespaceDeclDeclared(dtm, ns);
+ }
+
+ // %REVIEW% This flag is apparently never set true. Is that
+ // a bug, or should this code be phased out?
+ if(hasNSDecls)
+ {
+ m_handler.addNSDeclsToAttrs();
+ }
+
+ for (int attr = dtm.getFirstAttribute(node);
+ DTM.NULL != attr; attr = dtm.getNextAttribute(attr))
+ {
+ m_handler.addAttribute(attr);
+ }
+ }
+
+ }
+ else
+ {
+ xcntxt.pushCurrentNode(node);
+ super.startNode(node);
+ xcntxt.popCurrentNode();
+ }
+ }
catch(javax.xml.transform.TransformerException te)
{
throw new org.xml.sax.SAXException(te);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
