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 2015/07/19 12:50:08 UTC
svn commit: r1691812 - in /webservices/axiom:
experimental/dom/src/main/java/org/apache/axiom/dom/impl/
trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
Author: veithen
Date: Sun Jul 19 10:50:08 2015
New Revision: 1691812
URL: http://svn.apache.org/r1691812
Log:
Some more cleanup.
Modified:
webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/ProcessingInstructionImpl.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.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/om/impl/dom/ParentNode.java
Modified: webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java (original)
+++ webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java Sun Jul 19 10:50:08 2015
@@ -78,4 +78,9 @@ abstract class NodeImpl implements DOMNo
// TODO
throw new UnsupportedOperationException();
}
+
+ public final void normalize() {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
}
Modified: webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/ProcessingInstructionImpl.java?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/ProcessingInstructionImpl.java (original)
+++ webservices/axiom/experimental/dom/src/main/java/org/apache/axiom/dom/impl/ProcessingInstructionImpl.java Sun Jul 19 10:50:08 2015
@@ -20,6 +20,6 @@ package org.apache.axiom.dom.impl;
import org.apache.axiom.dom.DOMProcessingInstruction;
-abstract class ProcessingInstructionImpl extends LeafNode implements DOMProcessingInstruction {
+final class ProcessingInstructionImpl extends LeafNode implements DOMProcessingInstruction {
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj Sun Jul 19 10:50:08 2015
@@ -20,10 +20,15 @@ package org.apache.axiom.dom;
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
public aspect DOMAttributeSupport {
+ public final Document DOMAttribute.getOwnerDocument() {
+ return (Document)coreGetOwnerDocument(true);
+ }
+
public final short DOMAttribute.getNodeType() {
return Node.ATTRIBUTE_NODE;
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj Sun Jul 19 10:50:08 2015
@@ -22,10 +22,15 @@ import static org.apache.axiom.dom.DOMEx
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
public aspect DOMDocumentFragmentSupport {
+ public final Document DOMDocumentFragment.getOwnerDocument() {
+ return (Document)coreGetOwnerDocument(true);
+ }
+
public final short DOMDocumentFragment.getNodeType() {
return Node.DOCUMENT_FRAGMENT_NODE;
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj Sun Jul 19 10:50:08 2015
@@ -25,6 +25,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -34,6 +35,10 @@ import org.w3c.dom.Text;
public aspect DOMDocumentSupport {
private final DOMConfigurationImpl DOMDocument.domConfig = new DOMConfigurationImpl();
+ public final Document DOMDocument.getOwnerDocument() {
+ return null;
+ }
+
public final String DOMDocument.getNodeName() {
return "#document";
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj Sun Jul 19 10:50:08 2015
@@ -27,11 +27,16 @@ import org.apache.axiom.core.CoreNSAware
import org.apache.axiom.core.CoreNamespaceDeclaration;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.TypeInfo;
public aspect DOMElementSupport {
+ public final Document DOMElement.getOwnerDocument() {
+ return (Document)coreGetOwnerDocument(true);
+ }
+
public final short DOMElement.getNodeType() {
return Node.ELEMENT_NODE;
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMEntityReferenceSupport.aj Sun Jul 19 10:50:08 2015
@@ -22,9 +22,14 @@ import static org.apache.axiom.dom.DOMEx
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
public aspect DOMEntityReferenceSupport {
+ public final Document DOMEntityReference.getOwnerDocument() {
+ return (Document)coreGetOwnerDocument(true);
+ }
+
public final String DOMEntityReference.getNodeValue() {
return null;
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMLeafNodeSupport.aj Sun Jul 19 10:50:08 2015
@@ -22,11 +22,16 @@ import static org.apache.axiom.dom.DOMEx
import org.apache.axiom.core.CoreElement;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public aspect DOMLeafNodeSupport {
+ public final Document DOMLeafNode.getOwnerDocument() {
+ return (Document)coreGetOwnerDocument(true);
+ }
+
public final String DOMLeafNode.getPrefix() {
return null;
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Sun Jul 19 10:50:08 2015
@@ -73,10 +73,6 @@ public class DocumentImpl extends Parent
super(factory);
}
- public Document getOwnerDocument() {
- return null;
- }
-
public void internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws OutputException {
internalSerialize(serializer, format, cache, !format.isIgnoreXMLDeclaration());
}
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=1691812&r1=1691811&r2=1691812&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 Sun Jul 19 10:50:08 2015
@@ -333,10 +333,6 @@ public abstract class NodeImpl implement
}
}
- public Document getOwnerDocument() {
- return ownerDocument();
- }
-
ParentNode parentNode() {
// TODO: get rid of this
if (this instanceof CoreChildNode) {
@@ -350,15 +346,6 @@ public abstract class NodeImpl implement
// /OMNode methods
// /
- protected void setParent(ParentNode parent) {
- // TODO: this is not OO; clean up this mess
- if (parent == null) {
- ((CoreChildNode)this).internalUnsetParent(ownerDocument());
- } else {
- ((CoreChildNode)this).internalSetParent(parent);
- }
- }
-
public abstract OMXMLParserWrapper getBuilder();
public final OMInformationItem clone(OMCloneOptions options) {
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1691812&r1=1691811&r2=1691812&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Sun Jul 19 10:50:08 2015
@@ -68,9 +68,6 @@ public abstract class ParentNode extends
// Throw exception since there cannot be two document elements
throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
- if (newDomChild.parentNode() == null) {
- newDomChild.setParent(this);
- }
} else if (!(newDomChild instanceof CommentImpl
|| newDomChild instanceof ProcessingInstructionImpl
|| newDomChild instanceof DocumentFragmentImpl