Author: veithen
Date: Fri Jun 5 07:07:54 2015
New Revision: 1683667
URL: http://svn.apache.org/r1683667
Log:
Eliminate some other hacks from DOOM.
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1683667&r1=1683666&r2=1683667&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Fri Jun 5 07:07:54 2015
@@ -29,12 +29,10 @@ import org.apache.axiom.om.OMCloneOption
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.OMAttributeEx;
import org.apache.axiom.om.impl.common.AxiomAttribute;
import org.apache.axiom.om.impl.common.AxiomText;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -371,10 +369,6 @@ public class AttrImpl extends RootNode i
(namespace != null ? namespace.hashCode() : 0);
}
- public void internalSerialize(Serializer serializer, OMOutputFormat
format, boolean cache) {
- throw new UnsupportedOperationException();
- }
-
ParentNode shallowClone(OMCloneOptions options, ParentNode targetParent,
boolean namespaceRepairing) {
// Note: targetParent is always null here
return new AttrImpl(getLocalName(), getNamespace(), type,
getOMFactory());
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=1683667&r1=1683666&r2=1683667&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
Fri Jun 5 07:07:54 2015
@@ -24,11 +24,6 @@ import org.apache.axiom.dom.DOMDocumentF
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
public class DocumentFragmentImpl extends RootNode implements
DOMDocumentFragment {
@@ -39,22 +34,6 @@ public class DocumentFragmentImpl extend
public final NodeFactory coreGetNodeFactory() {
return (NodeFactory)getOMFactory();
}
-
- public void internalSerialize(Serializer serializer, OMOutputFormat
format, boolean cache) {
- // TODO
- throw new UnsupportedOperationException("TODO");
- }
-
- public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException
{
- // TODO
- throw new UnsupportedOperationException("TODO");
- }
-
- public void serializeAndConsume(XMLStreamWriter xmlWriter)
- throws XMLStreamException {
- // TODO
- throw new UnsupportedOperationException("TODO");
- }
ParentNode shallowClone(OMCloneOptions options, ParentNode targetParent,
boolean namespaceRepairing) {
return new DocumentFragmentImpl(getOMFactory());
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=1683667&r1=1683666&r2=1683667&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
Fri Jun 5 07:07:54 2015
@@ -26,11 +26,8 @@ import org.apache.axiom.dom.DOMNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.common.InformationItem;
-import org.apache.axiom.om.impl.common.serializer.push.OutputException;
-import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -391,10 +388,6 @@ public abstract class NodeImpl extends I
public abstract OMXMLParserWrapper getBuilder();
abstract void build();
-
- // This method is actually defined by ISerializable, but ISerializable is
only implemented
- // by certain subclasses (for the reason, see AXIOM-385).
- public abstract void internalSerialize(Serializer serializer,
OMOutputFormat format, boolean cache) throws OutputException;
public final OMInformationItem clone(OMCloneOptions options) {
return (OMInformationItem)clone(options, null, true, true);
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java?rev=1683667&r1=1683666&r2=1683667&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPMessageImpl.java
Fri Jun 5 07:07:54 2015
@@ -24,10 +24,10 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.AxiomElement;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.om.impl.dom.DocumentImpl;
-import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
@@ -61,7 +61,7 @@ public class SOAPMessageImpl extends Doc
protected void internalSerialize(Serializer serializer, OMOutputFormat
format,
boolean cache, boolean
includeXMLDeclaration) throws OutputException {
- ((NodeImpl)getDocumentElement()).internalSerialize(serializer, format,
cache);
+ ((AxiomElement)getDocumentElement()).internalSerialize(serializer,
format, cache);
}
protected DocumentImpl createClone(OMCloneOptions options) {
