Author: veithen
Date: Sat Jul 19 19:04:49 2014
New Revision: 1611945
URL: http://svn.apache.org/r1611945
Log:
Remove dead code.
Modified:
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
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
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=1611945&r1=1611944&r2=1611945&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
Sat Jul 19 19:04:49 2014
@@ -23,13 +23,10 @@ import static org.apache.axiom.dom.DOMEx
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.core.CoreDocument;
-import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.dom.DOMNode;
import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.OMXMLParserWrapper;
@@ -417,38 +414,11 @@ public abstract class NodeImpl extends I
// /
// /OMNode methods
// /
- public final void setNextOMSibling(OMNode node) {
- if (node == null) {
- internalSetNextSibling(null);
- return;
- }
- if (node instanceof NodeImpl) {
- internalSetNextSibling((NodeImpl)node);
- } else {
- throw new OMException("The node is not a " + NodeImpl.class);
- }
- }
- public final void setPreviousOMSibling(OMNode node) {
- if (node == null) {
- internalSetPreviousSibling(null);
- return;
- }
- if (node instanceof NodeImpl) {
- internalSetPreviousSibling((NodeImpl)node);
- } else {
- throw new OMException("The node is not a " + NodeImpl.class);
- }
- }
-
- public final void coreSetParent(CoreParentNode element) {
- setParent((ParentNode)element, false);
- }
-
- protected void setParent(ParentNode parent, boolean useDomSemantics) {
+ protected void setParent(ParentNode parent) {
// TODO: this is not OO; clean up this mess
if (parent == null) {
- ((CoreChildNode)this).internalUnsetParent(useDomSemantics ?
ownerDocument() : null);
+ ((CoreChildNode)this).internalUnsetParent(ownerDocument());
} else {
((CoreChildNode)this).internalSetParent(parent);
}
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=1611945&r1=1611944&r2=1611945&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
Sat Jul 19 19:04:49 2014
@@ -113,7 +113,7 @@ public abstract class ParentNode extends
throw newDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
if (newDomChild.parentNode() == null) {
- newDomChild.setParent(this, true);
+ newDomChild.setParent(this);
}
} else if (!(newDomChild instanceof CommentImpl
|| newDomChild instanceof ProcessingInstructionImpl
@@ -131,7 +131,7 @@ public abstract class ParentNode extends
if (coreGetLastKnownChild() == null &&
coreGetFirstChildIfAvailable() == null) {
coreSetLastChild((CoreChildNode)newDomChild);
coreSetFirstChild((CoreChildNode)newDomChild);
- newDomChild.setParent(this, true);
+ newDomChild.setParent(this);
} else {
((NodeImpl)coreGetLastKnownChild()).internalSetNextSibling(newDomChild);
newDomChild.internalSetPreviousSibling((NodeImpl)coreGetLastKnownChild());
@@ -139,7 +139,7 @@ public abstract class ParentNode extends
((NodeImpl)coreGetLastKnownChild()).internalSetNextSibling(null);
}
if (newDomChild.parentNode() == null) {
- newDomChild.setParent(this, true);
+ newDomChild.setParent(this);
}
} else {
NodeImpl tempNode = (NodeImpl)getFirstChild();
@@ -157,7 +157,7 @@ public abstract class ParentNode extends
NodeImpl child =
(NodeImpl)docFrag.coreGetFirstChildIfAvailable();
while (child != null) {
- child.setParent(this, true);
+ child.setParent(this);
child = child.internalGetNextSibling();
}
@@ -189,7 +189,7 @@ public abstract class ParentNode extends
NodeImpl child =
(NodeImpl)docFrag.coreGetFirstChildIfAvailable();
while (child != null) {
- child.setParent(this, true);
+ child.setParent(this);
child = child.internalGetNextSibling();
}
@@ -222,7 +222,7 @@ public abstract class ParentNode extends
}
if (!(newDomChild instanceof DocumentFragmentImpl) &&
newDomChild.parentNode() == null) {
- newDomChild.setParent(this, true);
+ newDomChild.setParent(this);
}
}
@@ -265,7 +265,7 @@ public abstract class ParentNode extends
NodeImpl child = (NodeImpl) docFrag.getFirstChild();
//set the parent of all kids to me
while(child != null) {
- child.setParent(this, true);
+ child.setParent(this);
child = child.internalGetNextSibling();
}
@@ -274,7 +274,7 @@ public abstract class ParentNode extends
} else {
head = newDomChild;
tail = newDomChild;
- newDomChild.setParent(this, true);
+ newDomChild.setParent(this);
}
// We use getNextSibling here to force bulding the node if
necessary
@@ -301,7 +301,7 @@ public abstract class ParentNode extends
// remove the old child's references to this tree
oldDomChild.internalSetNextSibling(null);
oldDomChild.internalSetPreviousSibling(null);
- oldDomChild.setParent(null, true);
+ oldDomChild.setParent(null);
}
tempNode = (NodeImpl)tempNode.getNextSibling();
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1611945&r1=1611944&r2=1611945&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
Sat Jul 19 19:04:49 2014
@@ -56,12 +56,4 @@ public abstract class SOAPElement extend
/** This has to be implemented by all the derived classes to check for the
correct parent. */
protected abstract void checkParent(OMElement parent)
throws SOAPProcessingException;
-
- protected void setParent(ParentNode parent, boolean useDomSemantics) {
- super.setParent(parent, useDomSemantics);
-
- if (!useDomSemantics && parent instanceof OMElement) {
- checkParent((OMElement) parent);
- }
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?rev=1611945&r1=1611944&r2=1611945&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
Sat Jul 19 19:04:49 2014
@@ -111,14 +111,6 @@ public abstract class SOAPHeaderBlockImp
protected abstract void checkParent(OMElement parent)
throws SOAPProcessingException;
- protected void setParent(ParentNode parent, boolean useDomSemantics) {
- super.setParent(parent, useDomSemantics);
-
- if (!useDomSemantics && parent instanceof OMElement) {
- checkParent((OMElement) parent);
- }
- }
-
protected final void copyData(OMCloneOptions options, SOAPHeaderBlock
targetSHB) {
// Copy the processed flag. The other SOAPHeaderBlock information
// (e.g. role, mustUnderstand) are attributes on the tag and are
copied elsewhere.
