Author: veithen
Date: Wed Jun 24 21:35:06 2015
New Revision: 1687374
URL: http://svn.apache.org/r1687374
Log:
Get rid of "declare parents".
Removed:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/InformationItem.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragmentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.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/TextNodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
Wed Jun 24 21:35:06 2015
@@ -46,7 +46,7 @@ public aspect CoreAttributeSupport {
owner = newOwnerDocument;
}
- final CoreNode CoreAttribute.getRootOrOwnerDocument() {
+ public final CoreNode CoreAttribute.getRootOrOwnerDocument() {
if (owner == null) {
return this;
} else {
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
Wed Jun 24 21:35:06 2015
@@ -62,7 +62,7 @@ public aspect CoreChildNodeSupport {
setFlag(Flags.HAS_PARENT, false);
}
- final CoreNode CoreChildNode.getRootOrOwnerDocument() {
+ public final CoreNode CoreChildNode.getRootOrOwnerDocument() {
if (owner == null) {
return this;
} else {
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragmentSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragmentSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragmentSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragmentSupport.aj
Wed Jun 24 21:35:06 2015
@@ -21,7 +21,7 @@ package org.apache.axiom.core;
public aspect CoreDocumentFragmentSupport {
private CoreDocument CoreDocumentFragment.ownerDocument;
- final CoreNode CoreDocumentFragment.getRootOrOwnerDocument() {
+ public final CoreNode CoreDocumentFragment.getRootOrOwnerDocument() {
if (ownerDocument == null) {
return this;
} else {
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentSupport.aj
Wed Jun 24 21:35:06 2015
@@ -19,7 +19,7 @@
package org.apache.axiom.core;
public aspect CoreDocumentSupport {
- final CoreNode CoreDocument.getRootOrOwnerDocument() {
+ public final CoreNode CoreDocument.getRootOrOwnerDocument() {
return this;
}
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreNodeSupport.aj
Wed Jun 24 21:35:06 2015
@@ -21,7 +21,7 @@ package org.apache.axiom.core;
public aspect CoreNodeSupport {
int CoreNode.flags;
- abstract CoreNode CoreNode.getRootOrOwnerDocument();
+ public abstract CoreNode CoreNode.getRootOrOwnerDocument();
/**
* Get the owner document to which this node belongs.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
Wed Jun 24 21:35:06 2015
@@ -24,8 +24,6 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
public aspect AxiomChildNodeSupport {
- declare parents: (InformationItem+ && OMNode+) implements AxiomChildNode;
-
public final OMContainer AxiomChildNode.getParent() {
CoreParentNode parent = coreGetParent();
return parent instanceof OMContainer ? (OMContainer)parent : null;
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
Wed Jun 24 21:35:06 2015
@@ -55,8 +55,6 @@ import org.apache.commons.logging.LogFac
import org.xml.sax.InputSource;
public aspect AxiomContainerSupport {
- declare parents: (InformationItem+ && OMContainer+) implements
AxiomContainer;
-
private static final Log log =
LogFactory.getLog(AxiomContainerSupport.class);
private static final OMXMLStreamReaderConfiguration
defaultReaderConfiguration = new OMXMLStreamReaderConfiguration();
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
Wed Jun 24 21:35:06 2015
@@ -65,8 +65,6 @@ import org.apache.commons.logging.LogFac
* {@link OMElement} interface.
*/
public aspect AxiomElementSupport {
- declare parents: (InformationItem+ && OMElement+) implements AxiomElement;
-
private static final Log log =
LogFactory.getLog(AxiomElementSupport.class);
final void AxiomElement.beforeSetLocalName() {
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
Wed Jun 24 21:35:06 2015
@@ -29,15 +29,12 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axiom.util.base64.Base64Utils;
public aspect AxiomTextSupport {
- declare parents: (InformationItem+ && OMText+) implements AxiomText;
-
// TODO: should be private
public String AxiomText.value;
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
Wed Jun 24 21:35:06 2015
@@ -22,11 +22,11 @@ import org.apache.axiom.dom.DOMChildNode
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.AxiomChildNode;
import org.w3c.dom.Element;
-public abstract class ChildNode extends NodeImpl implements DOMChildNode,
OMNode {
+public abstract class ChildNode extends NodeImpl implements DOMChildNode,
AxiomChildNode {
public ChildNode(OMFactory factory) {
super(factory);
}
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=1687374&r1=1687373&r2=1687374&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
Wed Jun 24 21:35:06 2015
@@ -27,7 +27,6 @@ import org.apache.axiom.om.OMCloneOption
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.InformationItem;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -37,7 +36,7 @@ import org.w3c.dom.UserDataHandler;
import java.util.Hashtable;
-public abstract class NodeImpl extends InformationItem implements DOMNode {
+public abstract class NodeImpl implements DOMNode {
/** Holds the user data objects */
private Hashtable userData; // Will be initialized in setUserData()
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
Wed Jun 24 21:35:06 2015
@@ -24,14 +24,13 @@ import static org.apache.axiom.dom.DOMEx
import org.apache.axiom.dom.DOMTextNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.OMNodeEx;
+import org.apache.axiom.om.impl.common.AxiomText;
import org.w3c.dom.DOMException;
import org.w3c.dom.Text;
import javax.activation.DataHandler;
-public abstract class TextNodeImpl extends LeafNode implements DOMTextNode,
OMText, OMNodeEx {
+public abstract class TextNodeImpl extends LeafNode implements DOMTextNode,
AxiomText {
public TextNodeImpl(OMFactory factory) {
super(factory);
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMInformationItemImpl.java
Wed Jun 24 21:35:06 2015
@@ -19,8 +19,7 @@
package org.apache.axiom.om.impl.llom;
import org.apache.axiom.om.impl.common.AxiomInformationItem;
-import org.apache.axiom.om.impl.common.InformationItem;
-public abstract class OMInformationItemImpl extends InformationItem implements
AxiomInformationItem {
+public abstract class OMInformationItemImpl implements AxiomInformationItem {
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=1687374&r1=1687373&r2=1687374&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Wed Jun 24 21:35:06 2015
@@ -25,9 +25,10 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.impl.common.AxiomChildNode;
/** Class OMNodeImpl */
-public abstract class OMNodeImpl extends OMSerializableImpl implements OMNode {
+public abstract class OMNodeImpl extends OMSerializableImpl implements
AxiomChildNode {
/**
* Constructor OMNodeImpl
*
