You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/05/30 21:25:37 UTC
svn commit: r1344425 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/
Author: veithen
Date: Wed May 30 19:25:36 2012
New Revision: 1344425
URL: http://svn.apache.org/viewvc?rev=1344425&view=rev
Log:
* Node types are fixed, except for OMText which can be a CDATA section, text or space. Therefore there is no need to have a nodeType attribute in OMNodeImpl.
* Removed the setType method from the internal OMNodeEx interface.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CDATASectionImpl.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/DocumentTypeImpl.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/ProcessingInstructionImpl.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-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java Wed May 30 19:25:36 2012
@@ -20,7 +20,6 @@
package org.apache.axiom.om.impl;
import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSerializable;
@@ -42,8 +41,6 @@ public interface OMNodeEx extends OMNode
public void setComplete(boolean state);
- public void setType(int nodeType) throws OMException;
-
/**
* Serializes the node. Note that this is an internal method that MUST NOT be used outside of
* Axiom. Please use {@link OMSerializable#serialize(XMLStreamWriter, boolean)} instead.
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CDATASectionImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CDATASectionImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CDATASectionImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CDATASectionImpl.java Wed May 30 19:25:36 2012
@@ -38,12 +38,6 @@ public class CDATASectionImpl extends Te
return OMNode.CDATA_SECTION_NODE;
}
- public void setType(int nodeType) throws OMException {
- if (nodeType != OMNode.CDATA_SECTION_NODE) {
- throw new UnsupportedOperationException();
- }
- }
-
public Node cloneNode(boolean deep) {
CDATASectionImpl textImpl = new CDATASectionImpl(this.textValue, this.factory);
textImpl.setOwnerDocument(ownerDocument());
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?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- 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 Wed May 30 19:25:36 2012
@@ -22,7 +22,6 @@ package org.apache.axiom.om.impl.dom;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.w3c.dom.Comment;
@@ -57,11 +56,6 @@ public class CommentImpl extends Charact
return OMNode.COMMENT_NODE;
}
- public void setType(int nodeType) throws OMException {
- throw new UnsupportedOperationException(
- "You should not set the node type of a comment");
- }
-
public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
writer.writeComment(this.textValue);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentTypeImpl.java Wed May 30 19:25:36 2012
@@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocType;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMNodeEx;
@@ -52,10 +51,6 @@ public class DocumentTypeImpl extends Le
throw new UnsupportedOperationException();
}
- public void setType(int nodeType) throws OMException {
- throw new UnsupportedOperationException();
- }
-
public int getType() {
return DTD_NODE;
}
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?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- 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 Wed May 30 19:25:36 2012
@@ -296,16 +296,6 @@ public class ElementImpl extends ParentN
return OMNode.ELEMENT_NODE;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axiom.om.OMNode#setType(int)
- */
- public void setType(int nodeType) throws OMException {
- // Do nothing ...
- // This is an Eement Node...
- }
-
// /
// / org.w3c.dom.Element methods
// /
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java Wed May 30 19:25:36 2012
@@ -24,7 +24,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
@@ -50,12 +49,6 @@ public class ProcessingInstructionImpl e
return OMNode.PI_NODE;
}
- public void setType(int nodeType) throws OMException {
- if (nodeType != OMNode.PI_NODE) {
- throw new OMException("Can't change the type of a ProcessingInstruction node");
- }
- }
-
public short getNodeType() {
return Node.PROCESSING_INSTRUCTION_NODE;
}
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?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- 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 Wed May 30 19:25:36 2012
@@ -97,19 +97,6 @@ public class TextImpl extends TextNodeIm
return isWhitespace ? OMNode.SPACE_NODE : OMNode.TEXT_NODE;
}
- public void setType(int nodeType) throws OMException {
- switch (nodeType) {
- case OMNode.TEXT_NODE:
- isWhitespace = false;
- break;
- case OMNode.SPACE_NODE:
- isWhitespace = true;
- break;
- default:
- throw new UnsupportedOperationException();
- }
- }
-
public Node cloneNode(boolean deep) {
TextImpl textImpl = new TextImpl(this.textValue, this.factory);
textImpl.setOwnerDocument(ownerDocument());
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java Wed May 30 19:25:36 2012
@@ -42,7 +42,10 @@ public class OMCommentImpl extends OMNod
OMFactory factory) {
super(parentNode, factory, true);
this.value = contentText;
- nodeType = OMNode.COMMENT_NODE;
+ }
+
+ public final int getType() {
+ return OMNode.COMMENT_NODE;
}
public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocTypeImpl.java Wed May 30 19:25:36 2012
@@ -42,7 +42,6 @@ public class OMDocTypeImpl extends OMNod
OMFactory factory) {
super(parentNode, factory, true);
this.value = contentText;
- nodeType = OMNode.DTD_NODE;
}
/**
@@ -54,6 +53,10 @@ public class OMDocTypeImpl extends OMNod
this(parentNode, null, factory);
}
+ public final int getType() {
+ return OMNode.DTD_NODE;
+ }
+
public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
writer.writeDTD(this.value);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Wed May 30 19:25:36 2012
@@ -740,7 +740,6 @@ public class OMElementImpl extends OMNod
return this;
}
- /** Gets the type of node, as this is the super class of all the nodes. */
public int getType() {
return OMNode.ELEMENT_NODE;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java Wed May 30 19:25:36 2012
@@ -49,9 +49,6 @@ public abstract class OMNodeImpl extends
/** Field previousSibling */
protected OMNodeImpl previousSibling;
- /** Field nodeType */
- protected int nodeType;
-
/**
* Constructor OMNodeImpl
*
@@ -252,26 +249,6 @@ public abstract class OMNodeImpl extends
}
/**
- * Gets the type of node, as this is the super class of all the nodes.
- *
- * @return Returns the type of node as indicated by {@link #setType}
- * @see #setType
- */
- public int getType() {
- return nodeType;
- }
-
- /**
- * Method setType.
- *
- * @param nodeType
- * @throws OMException
- */
- public void setType(int nodeType) throws OMException {
- this.nodeType = nodeType;
- }
-
- /**
* Gets the previous sibling.
*
* @return boolean
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java Wed May 30 19:25:36 2012
@@ -45,7 +45,6 @@ public class OMProcessingInstructionImpl
super(parentNode, factory, true);
this.target = target;
this.value = value;
- nodeType = OMNode.PI_NODE;
}
/**
@@ -58,6 +57,10 @@ public class OMProcessingInstructionImpl
this(parentNode, null, null, factory);
}
+ public final int getType() {
+ return OMNode.PI_NODE;
+ }
+
public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
writer.writeProcessingInstruction(this.target + " ", this.value);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=1344425&r1=1344424&r2=1344425&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Wed May 30 19:25:36 2012
@@ -47,6 +47,8 @@ public class OMTextImpl extends OMNodeIm
public static final OMNamespace XOP_NS = new OMNamespaceImpl(
"http://www.w3.org/2004/08/xop/include", "xop");
+ private int nodeType;
+
protected String value = null;
protected char[] charArray;
@@ -239,6 +241,10 @@ public class OMTextImpl extends OMNodeIm
this.nodeType = TEXT_NODE;
}
+ public final int getType() {
+ return nodeType;
+ }
+
/**
* Writes the relevant output.
*