Author: veithen
Date: Sat Jun 20 20:17:30 2015
New Revision: 1686669
URL: http://svn.apache.org/r1686669
Log:
Remove some unnecessary/redundant code from OMSourcedElementImpl.
Modified:
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/AxiomNamedInformationItemSupport.aj
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
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=1686669&r1=1686668&r2=1686669&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
Sat Jun 20 20:17:30 2015
@@ -31,11 +31,11 @@ public aspect AxiomChildNodeSupport {
return parent instanceof OMContainer ? (OMContainer)parent : null;
}
- public OMNode AxiomChildNode.getNextOMSiblingIfAvailable() {
+ public final OMNode AxiomChildNode.getNextOMSiblingIfAvailable() {
return (OMNode)coreGetNextSiblingIfAvailable();
}
- public OMNode AxiomChildNode.getNextOMSibling() {
+ public final OMNode AxiomChildNode.getNextOMSibling() {
return (OMNode)coreGetNextSibling();
}
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=1686669&r1=1686668&r2=1686669&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
Sat Jun 20 20:17:30 2015
@@ -69,11 +69,11 @@ public aspect AxiomContainerSupport {
coreSetState(DISCARDED);
}
- public XMLStreamReader AxiomContainer.getXMLStreamReader() {
+ public final XMLStreamReader AxiomContainer.getXMLStreamReader() {
return getXMLStreamReader(true);
}
- public XMLStreamReader AxiomContainer.getXMLStreamReaderWithoutCaching() {
+ public final XMLStreamReader
AxiomContainer.getXMLStreamReaderWithoutCaching() {
return getXMLStreamReader(false);
}
@@ -239,7 +239,7 @@ public aspect AxiomContainerSupport {
return new SAXSource(new XMLReaderImpl(this, cache), new
InputSource());
}
- public SAXResult AxiomContainer.getSAXResult() {
+ public final SAXResult AxiomContainer.getSAXResult() {
SAXResultContentHandler handler = new SAXResultContentHandler(this);
SAXResult result = new SAXResult();
result.setHandler(handler);
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=1686669&r1=1686668&r2=1686669&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
Sat Jun 20 20:17:30 2015
@@ -120,6 +120,7 @@ public aspect AxiomElementSupport {
}
}
+ // TODO: this is (incorrectly) overridden by the SOAPFaultReason
implementations for SOAP 1.2
public String AxiomElement.getText() {
String childText = null;
StringBuffer buffer = null;
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj?rev=1686669&r1=1686668&r2=1686669&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamedInformationItemSupport.aj
Sat Jun 20 20:17:30 2015
@@ -108,7 +108,7 @@ public aspect AxiomNamedInformationItemS
return qName;
}
- public boolean AxiomNamedInformationItem.hasName(QName name) {
+ public final boolean AxiomNamedInformationItem.hasName(QName name) {
if (name.getLocalPart().equals(getLocalName())) {
OMNamespace ns = getNamespace();
return ns == null && name.getNamespaceURI().length() == 0
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1686669&r1=1686668&r2=1686669&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Sat Jun 20 20:17:30 2015
@@ -126,7 +126,7 @@ public class OMElementImpl extends OMNod
public void checkChild(OMNode child) {
}
- public void build() throws OMException {
+ public final void build() throws OMException {
/**
* builder is null. Meaning this is a programatical created element
but it has children which are not completed
* Build them all.
@@ -202,7 +202,7 @@ public class OMElementImpl extends OMNod
return writer.toString();
}
- public OMElement cloneOMElement() {
+ public final OMElement cloneOMElement() {
if (log.isDebugEnabled()) {
log.debug("cloneOMElement start");
@@ -238,11 +238,11 @@ public class OMElementImpl extends OMNod
return getOMFactory().createOMElement(getLocalName(), getNamespace(),
targetParent);
}
- public void setLineNumber(int lineNumber) {
+ public final void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
- public int getLineNumber() {
+ public final int getLineNumber() {
return lineNumber;
}
@@ -261,7 +261,7 @@ public class OMElementImpl extends OMNod
}
/** This method will be called when one of the children becomes complete.
*/
- void notifyChildComplete() {
+ final void notifyChildComplete() {
if (getState() == INCOMPLETE && getBuilder() == null) {
Iterator iterator = getChildren();
while (iterator.hasNext()) {
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=1686669&r1=1686668&r2=1686669&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
Sat Jun 20 20:17:30 2015
@@ -62,7 +62,7 @@ public abstract class OMNodeImpl extends
}
}
- public OMInformationItem clone(OMCloneOptions options) {
+ public final OMInformationItem clone(OMCloneOptions options) {
return clone(options, null);
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1686669&r1=1686668&r2=1686669&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sat Jun 20 20:17:30 2015
@@ -24,10 +24,8 @@ import org.apache.axiom.om.OMCloneOption
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
@@ -49,7 +47,6 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.sax.SAXResult;
import java.io.IOException;
import java.io.StringWriter;
@@ -359,18 +356,6 @@ public class OMSourcedElementImpl extend
}
}
- public XMLStreamReader getXMLStreamReader() {
- return getXMLStreamReader(true);
- }
-
- public XMLStreamReader getXMLStreamReaderWithoutCaching() {
- return getXMLStreamReader(false);
- }
-
- public String getText() {
- return super.getText();
- }
-
private void ensureLocalNameSet() {
if (internalGetLocalName() == null) {
if (dataSource instanceof QNameAwareOMDataSource) {
@@ -452,10 +437,6 @@ public class OMSourcedElementImpl extend
}
}
- public boolean hasName(QName name) {
- return super.hasName(name);
- }
-
public String toStringWithConsume() throws XMLStreamException {
if (isExpanded()) {
return super.toStringWithConsume();
@@ -468,14 +449,6 @@ public class OMSourcedElementImpl extend
}
}
- public OMElement cloneOMElement() {
- return super.cloneOMElement();
- }
-
- public OMInformationItem clone(OMCloneOptions options) {
- return super.clone(options);
- }
-
OMNode clone(OMCloneOptions options, OMContainer targetParent) {
// If already expanded or this is not an OMDataSourceExt, then
// create a copy of the OM Tree
@@ -519,24 +492,10 @@ public class OMSourcedElementImpl extend
return targetOMSE;
}
- protected OMElement createClone(OMCloneOptions options, OMContainer
targetParent) {
- return super.createClone(options, targetParent);
- }
-
protected OMSourcedElement createClone(OMCloneOptions options,
OMDataSource ds) {
return getOMFactory().createOMElement(ds);
}
- public void setLineNumber(int lineNumber) {
- // no need to expand the tree, just call base method directly
- super.setLineNumber(lineNumber);
- }
-
- public int getLineNumber() {
- // no need to expand the tree, just call base method directly
- return super.getLineNumber();
- }
-
public void discard() throws OMException {
// discard without expanding the tree
setComplete(true);
@@ -568,15 +527,6 @@ public class OMSourcedElementImpl extend
return result;
}
- public OMNode getNextOMSibling() throws OMException {
- // no need to expand the tree, just call base method directly
- return super.getNextOMSibling();
- }
-
- public OMNode getNextOMSiblingIfAvailable() {
- return super.getNextOMSiblingIfAvailable();
- }
-
OMNamespace handleNamespace(QName qname) {
forceExpand();
return super.handleNamespace(qname);
@@ -641,14 +591,6 @@ public class OMSourcedElementImpl extend
}
}
- public void build() throws OMException {
- super.build();
- }
-
- void notifyChildComplete() {
- super.notifyChildComplete();
- }
-
/**
* Provide access to the data source encapsulated in OMSourcedElement.
* This is usesful when we want to access the raw data in the data source.
@@ -704,10 +646,6 @@ public class OMSourcedElementImpl extend
}
}
- public SAXResult getSAXResult() {
- return super.getSAXResult();
- }
-
class DeferredNamespace implements OMNamespace {
final String uri;
