Author: ruchithf
Date: Thu Sep 14 06:33:10 2006
New Revision: 443343
URL: http://svn.apache.org/viewvc?view=rev&rev=443343
Log:
Using the proper node types from OMNode in relevant methods
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentimpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Thu Sep 14 06:33:10 2006
@@ -194,7 +194,7 @@
* @see org.apache.axiom.om.OMNode#getType()
*/
public int getType() {
- return Node.ATTRIBUTE_NODE;
+ return -1;
}
/**
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
Thu Sep 14 06:33:10 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNode;
import org.w3c.dom.Comment;
import org.w3c.dom.Node;
@@ -55,7 +56,7 @@
}
public int getType() {
- return Node.COMMENT_NODE;
+ return OMNode.COMMENT_NODE;
}
public void setType(int nodeType) throws OMException {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
Thu Sep 14 06:33:10 2006
@@ -27,7 +27,6 @@
import org.apache.axiom.om.impl.EmptyOMLocation;
import org.apache.axiom.om.impl.exception.OMStreamingException;
import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
@@ -1040,17 +1039,17 @@
int returnEvent = 0;
int nodeType = node.getType();
switch (nodeType) {
- case Node.ELEMENT_NODE:
+ case OMNode.ELEMENT_NODE:
OMElement element = (OMElement) node;
returnEvent = generateElementEvents(element);
break;
- case Node.TEXT_NODE:
+ case OMNode.TEXT_NODE:
returnEvent = generateTextEvents();
break;
- case Node.COMMENT_NODE:
+ case OMNode.COMMENT_NODE:
returnEvent = generateCommentEvents();
break;
- case Node.CDATA_SECTION_NODE:
+ case OMNode.CDATA_SECTION_NODE:
returnEvent = generateCdataEvents();
break;
default:
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentimpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentimpl.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentimpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentimpl.java
Thu Sep 14 06:33:10 2006
@@ -57,7 +57,7 @@
* @see org.apache.axiom.om.OMNode#getType()
*/
public int getType() throws OMException {
- return Node.DOCUMENT_FRAGMENT_NODE;
+ return -1;
}
/*
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Thu Sep 14 06:33:10 2006
@@ -15,20 +15,36 @@
*/
package org.apache.axiom.om.impl.dom;
-import org.apache.axiom.om.*;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMConstants;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.apache.axiom.om.impl.traverse.OMChildElementIterator;
import org.apache.axiom.om.impl.util.EmptyIterator;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.util.ElementHelper;
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -179,7 +195,7 @@
* @see org.apache.axiom.om.OMNode#getType()
*/
public int getType() throws OMException {
- return Node.ELEMENT_NODE;
+ return OMNode.ELEMENT_NODE;
}
/*
@@ -922,7 +938,7 @@
OMText textNode;
while (child != null) {
- if (child.getType() == Node.TEXT_NODE) {
+ if (child.getType() == OMNode.TEXT_NODE) {
textNode = (OMText) child;
if (textNode.getText() != null
&& !"".equals(textNode.getText())) {
@@ -941,7 +957,7 @@
OMText textNode;
while (child != null) {
- if (child.getType() == Node.TEXT_NODE) {
+ if (child.getType() == OMNode.TEXT_NODE) {
textNode = (OMText) child;
if (textNode.getText() != null
&& !"".equals(textNode.getText())) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
Thu Sep 14 06:33:10 2006
@@ -247,7 +247,7 @@
* @see org.apache.axiom.om.OMNode#getType()
*/
public int getType() throws OMException {
- return Node.TEXT_NODE;
+ return OMNode.TEXT_NODE;
}
/*
@@ -296,11 +296,11 @@
*/
private void writeOutput(XMLStreamWriter writer) throws XMLStreamException
{
int type = getType();
- if (type == Node.TEXT_NODE || type == SPACE_NODE) {
+ if (type == OMNode.TEXT_NODE || type == SPACE_NODE) {
writer.writeCharacters(this.getText());
- } else if (type == Node.CDATA_SECTION_NODE) {
+ } else if (type == OMNode.CDATA_SECTION_NODE) {
writer.writeCData(this.getText());
- } else if (type == Node.ENTITY_REFERENCE_NODE) {
+ } else if (type == OMNode.ENTITY_REFERENCE_NODE) {
writer.writeEntityRef(this.getText());
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?view=diff&rev=443343&r1=443342&r2=443343
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
Thu Sep 14 06:33:10 2006
@@ -15,9 +15,31 @@
*/
package org.apache.axiom.om.impl.dom.factory;
-import org.apache.axiom.om.*;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMComment;
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMDocType;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMProcessingInstruction;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.dom.*;
+import org.apache.axiom.om.impl.dom.AttrImpl;
+import org.apache.axiom.om.impl.dom.CommentImpl;
+import org.apache.axiom.om.impl.dom.DocumentFragmentimpl;
+import org.apache.axiom.om.impl.dom.DocumentImpl;
+import org.apache.axiom.om.impl.dom.ElementImpl;
+import org.apache.axiom.om.impl.dom.NamespaceImpl;
+import org.apache.axiom.om.impl.dom.OMDOMException;
+import org.apache.axiom.om.impl.dom.ParentNode;
+import org.apache.axiom.om.impl.dom.TextImpl;
import org.w3c.dom.Node;
import javax.xml.namespace.QName;
@@ -219,7 +241,7 @@
*/
public OMText createOMText(String text, int type) {
switch (type) {
- case Node.TEXT_NODE:
+ case OMNode.TEXT_NODE:
return new TextImpl(this.document, text, this);
default:
throw new OMDOMException("Only Text nodes are supported right
now");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
