You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/04/22 18:37:51 UTC
svn commit: r396143 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Author: antonio
Date: Sat Apr 22 09:37:49 2006
New Revision: 396143
URL: http://svn.apache.org/viewcvs?rev=396143&view=rev
Log:
Remove duplicated branches.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java?rev=396143&r1=396142&r2=396143&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java Sat Apr 22 09:37:49 2006
@@ -277,11 +277,8 @@
}
break;
case Node.DOCUMENT_FRAGMENT_NODE:
-
// ??;
- break;
case Node.DOCUMENT_NODE:
-
break;
case Node.ELEMENT_NODE:
NamedNodeMap atts = node.getAttributes();
@@ -325,10 +322,10 @@
if (StringUtils.equals(uri, namespaceURI)) {
// System.out.println("namespace is declared");
// prefix is declared correctly, do nothing
- } else if (uri != null) {
+ //} else if (uri != null) {
// System.out.println("prefix is declared with other namespace, overwriting it");
// prefix exists but is bound to another namespace, overwrite it
- currentElementInfo.put(prefix, namespaceURI);
+ // currentElementInfo.put(prefix, namespaceURI);
} else {
// System.out.println("prefix is not yet declared, declaring it now");
currentElementInfo.put(prefix, namespaceURI);
@@ -551,7 +548,6 @@
return new String[] {prefix, localName};
}
-
/**
* End processing of given node
*
@@ -560,9 +556,6 @@
protected void endNode(Node node) throws org.xml.sax.SAXException {
switch (node.getNodeType()) {
- case Node.DOCUMENT_NODE:
- break;
-
case Node.ELEMENT_NODE:
contentHandler.endElement(currentElementInfo.namespaceURI,
currentElementInfo.localName, currentElementInfo.qName);
@@ -576,9 +569,8 @@
//System.out.println("ending prefix mapping " + (String) entry.getKey());
}
}
-
currentElementInfo = currentElementInfo.parent;
- break;
+ case Node.DOCUMENT_NODE:
case Node.CDATA_SECTION_NODE:
break;
case Node.ENTITY_REFERENCE_NODE: