ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1729488 - in /webservices/axiom/trunk: aspects/core-aspects/src/main/java/org/apache/axiom/core/ aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializ...
Date Tue, 09 Feb 2016 22:21:19 GMT
Author: veithen
Date: Tue Feb  9 22:21:18 2016
New Revision: 1729488

URL: http://svn.apache.org/viewvc?rev=1729488&view=rev
Log:
Rename the getBuilder method in the core model to coreGetBuilder because its signature will
change, resulting in conflict with the Axiom API.

Modified:
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreLeafNodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
    webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
Tue Feb  9 22:21:18 2016
@@ -30,7 +30,7 @@ public interface CoreParentNode extends
     int DISCARDED = 3;
     int COMPACT = 4;
     
-    OMXMLParserWrapper getBuilder();
+    OMXMLParserWrapper coreGetBuilder();
     void coreSetBuilder(OMXMLParserWrapper builder);
     int getState();
     void coreSetState(int state);

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
Tue Feb  9 22:21:18 2016
@@ -118,10 +118,10 @@ public aspect CoreChildNodeSupport {
         CoreChildNode nextSibling = coreGetNextSiblingIfAvailable();
         if (nextSibling == null) {
             CoreParentNode parent = coreGetParent();
-            if (parent != null && parent.getBuilder() != null) {
+            if (parent != null && parent.coreGetBuilder() != null) {
                 switch (parent.getState()) {
                     case CoreParentNode.DISCARDED:
-                        ((Builder)parent.getBuilder()).debugDiscarded(parent);
+                        ((Builder)parent.coreGetBuilder()).debugDiscarded(parent);
                         throw new NodeUnavailableException();
                     case CoreParentNode.INCOMPLETE:
                         do {

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreElementSupport.aj
Tue Feb  9 22:21:18 2016
@@ -35,7 +35,7 @@ public aspect CoreElementSupport {
     private CoreAttribute CoreElement.firstAttribute;
 
     final void CoreElement.beforeDetach() {
-        if (getState() == CoreParentNode.INCOMPLETE && getBuilder() == coreGetParent().getBuilder())
{
+        if (getState() == CoreParentNode.INCOMPLETE && coreGetBuilder() == coreGetParent().coreGetBuilder())
{
             build();
         }
     }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
Tue Feb  9 22:21:18 2016
@@ -107,7 +107,7 @@ public aspect CoreParentNodeSupport {
     }
 
     public void CoreParentNode.buildNext() {
-        OMXMLParserWrapper builder = getBuilder();
+        OMXMLParserWrapper builder = coreGetBuilder();
         if (builder == null) {
             throw new IllegalStateException("The node has no builder");
         } else if (((Builder)builder).isClosed()) {
@@ -126,7 +126,7 @@ public aspect CoreParentNodeSupport {
         if (firstChild == null) {
             switch (getState()) {
                 case CoreParentNode.DISCARDED:
-                    ((Builder)getBuilder()).debugDiscarded(this);
+                    ((Builder)coreGetBuilder()).debugDiscarded(this);
                     throw new NodeUnavailableException();
                 case CoreParentNode.INCOMPLETE:
                     do {
@@ -214,12 +214,12 @@ public aspect CoreParentNodeSupport {
             // We need to call this first because if may modify the state (applies to OMSourcedElements)
             CoreChildNode child = coreGetFirstChildIfAvailable();
             boolean updateState;
-            if (getState() == INCOMPLETE && getBuilder() != null) {
+            if (getState() == INCOMPLETE && coreGetBuilder() != null) {
                 CoreChildNode lastChild = coreGetLastKnownChild();
                 if (lastChild instanceof CoreParentNode) {
                     ((CoreParentNode)lastChild).build();
                 }
-                ((Builder)getBuilder()).discard((OMContainer)this);
+                ((Builder)coreGetBuilder()).discard((OMContainer)this);
                 updateState = true;
             } else {
                 updateState = false;

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
Tue Feb  9 22:21:18 2016
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMXMLParserWr
 public aspect DeferringParentNodeSupport {
     private OMXMLParserWrapper DeferringParentNode.builder;
 
-    public final OMXMLParserWrapper DeferringParentNode.getBuilder() {
+    public final OMXMLParserWrapper DeferringParentNode.coreGetBuilder() {
         forceExpand();
         return builder;
     }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
Tue Feb  9 22:21:18 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.core.NonDeferrin
 import org.apache.axiom.om.OMXMLParserWrapper;
 
 public aspect NonDeferringParentNodeSupport {
-    public final OMXMLParserWrapper NonDeferringParentNode.getBuilder() {
+    public final OMXMLParserWrapper NonDeferringParentNode.coreGetBuilder() {
         return null;
     }
 

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Tue Feb  9 22:21:18 2016
@@ -588,7 +588,7 @@ final class Navigator extends PullSerial
             } else {
                 CoreParentNode parent = current.coreGetParent();
                 node = parent;
-                if (parent.getState() == CoreParentNode.COMPLETE || parent.getState() ==
CoreParentNode.COMPACT || parent.getBuilder() == null) { // TODO: review this condition
+                if (parent.getState() == CoreParentNode.COMPLETE || parent.getState() ==
CoreParentNode.COMPACT || parent.coreGetBuilder() == null) { // TODO: review this condition
                     visited = true;
                     return true;
                 } else {
@@ -639,13 +639,13 @@ final class Navigator extends PullSerial
             namespaceCount = -1;
         } else {
             CoreParentNode container = (CoreParentNode)node;
-            Builder builder = (Builder)container.getBuilder();
+            Builder builder = (Builder)container.coreGetBuilder();
             int depth = 1;
             // Find the root node for the builder (i.e. the topmost node having the same
             // builder as the current node)
             while (container != rootNode && container instanceof CoreElement) {
                 CoreParentNode parent = ((CoreElement)container).coreGetParent();
-                if (parent.getBuilder() != builder) {
+                if (parent.coreGetBuilder() != builder) {
                     break;
                 }
                 container = parent;
@@ -676,7 +676,7 @@ final class Navigator extends PullSerial
         } else {
             container = ((CoreChildNode)node).coreGetParent();
         }
-        OMXMLParserWrapper builder = container.getBuilder();
+        OMXMLParserWrapper builder = container.coreGetBuilder();
         // Delegate to the builder's parser.
         if (builder != null && builder instanceof Builder) {
             Builder staxBuilder = (Builder) builder;

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
Tue Feb  9 22:21:18 2016
@@ -25,7 +25,7 @@ import org.apache.axiom.om.impl.stream.S
 import org.apache.axiom.om.impl.stream.XmlHandler;
 
 public interface AxiomSerializable extends OMSerializable, AxiomInformationItem {
-    OMXMLParserWrapper getBuilder();
+    OMXMLParserWrapper coreGetBuilder();
     
     void setComplete(boolean state);
 

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
Tue Feb  9 22:21:18 2016
@@ -77,6 +77,10 @@ public aspect AxiomContainerSupport {
         coreSetState(DISCARDED);
     }
 
+    public final OMXMLParserWrapper AxiomContainer.getBuilder() {
+        return coreGetBuilder();
+    }
+
     public final XMLStreamReader AxiomContainer.getXMLStreamReader() {
         return getXMLStreamReader(true);
     }
@@ -94,7 +98,7 @@ public aspect AxiomContainerSupport {
     }
     
     public final XMLStreamReader AxiomContainer.defaultGetXMLStreamReader(boolean cache,
OMXMLStreamReaderConfiguration configuration) {
-        OMXMLParserWrapper builder = getBuilder();
+        OMXMLParserWrapper builder = coreGetBuilder();
         if (builder != null && builder.isCompleted() && !cache &&
!isComplete()) {
             throw new UnsupportedOperationException("The parser is already consumed!");
         }
@@ -160,7 +164,7 @@ public aspect AxiomContainerSupport {
     }
     
     public final void AxiomContainer.build() {
-        OMXMLParserWrapper builder = getBuilder();
+        OMXMLParserWrapper builder = coreGetBuilder();
         // builder is null. Meaning this is a programatical created element but it has children
which are not completed
         // Build them all.
         if (builder == null && getState() == INCOMPLETE) {
@@ -351,7 +355,7 @@ public aspect AxiomContainerSupport {
 
     final void AxiomContainer.serializeChildren(XmlHandler handler, OMOutputFormat format,
boolean cache) throws StreamException {
         if (getState() == AxiomContainer.DISCARDED) {
-            Builder builder = (Builder)getBuilder();
+            Builder builder = (Builder)coreGetBuilder();
             if (builder != null) {
                 builder.debugDiscarded(this);
             }
@@ -373,8 +377,8 @@ public aspect AxiomContainerSupport {
             // Next, if the container is incomplete, disable caching (temporarily)
             // and serialize the nodes that have not been built yet by copying the
             // events from the underlying XMLStreamReader.
-            if (!isComplete() && getBuilder() != null) {
-                Builder builder = (Builder)getBuilder();
+            if (!isComplete() && coreGetBuilder() != null) {
+                Builder builder = (Builder)coreGetBuilder();
                 StAXHelper helper = new StAXHelper(builder.disableCaching(), handler);
                 int depth = 0;
                 loop: while (true) {
@@ -407,7 +411,7 @@ public aspect AxiomContainerSupport {
     }
 
     public final void AxiomContainer.notifyChildComplete() {
-        if (getState() == INCOMPLETE && getBuilder() == null) {
+        if (getState() == INCOMPLETE && coreGetBuilder() == null) {
             for (Iterator<OMNode> iterator = getChildren(); iterator.hasNext(); ) {
                 OMNode node = iterator.next();
                 if (!node.isComplete()) {

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreLeafNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreLeafNodeSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreLeafNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreLeafNodeSupport.aj
Tue Feb  9 22:21:18 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.om.OMXMLParserWr
 import org.apache.axiom.om.impl.intf.AxiomCoreLeafNode;
 
 public aspect AxiomCoreLeafNodeSupport {
-    public final OMXMLParserWrapper AxiomCoreLeafNode.getBuilder() {
+    public final OMXMLParserWrapper AxiomCoreLeafNode.coreGetBuilder() {
         return null;
     }
 

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
Tue Feb  9 22:21:18 2016
@@ -241,8 +241,8 @@ public aspect AxiomElementSupport {
     }
 
     public final void AxiomElement.discard() {
-        if (getState() == CoreParentNode.INCOMPLETE && getBuilder() != null) {
-            ((Builder)getBuilder()).discard((OMContainer)this);
+        if (getState() == CoreParentNode.INCOMPLETE && coreGetBuilder() != null)
{
+            ((Builder)coreGetBuilder()).discard((OMContainer)this);
         }
         detach();
     }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
Tue Feb  9 22:21:18 2016
@@ -52,7 +52,7 @@ public aspect AxiomSerializableSupport {
     }
 
     public void AxiomSerializable.close(boolean build) {
-        OMXMLParserWrapper builder = getBuilder();
+        OMXMLParserWrapper builder = coreGetBuilder();
         if (build) {
             this.build();
         }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodySupport.aj
Tue Feb  9 22:21:18 2016
@@ -36,7 +36,7 @@ public aspect AxiomSOAPBodySupport {
     }
 
     private boolean AxiomSOAPBody.hasLookahead() {
-        StAXOMBuilder builder = (StAXOMBuilder)getBuilder();
+        StAXOMBuilder builder = (StAXOMBuilder)coreGetBuilder();
         if (builder != null && !builder.isCompleted() && builder.getTarget()
== this) {
             CoreChildNode child = coreGetFirstChildIfAvailable();
             while (child != null) {
@@ -58,7 +58,7 @@ public aspect AxiomSOAPBodySupport {
     public final boolean AxiomSOAPBody.hasFault() {
         // Set hasSOAPFault if it matches the name matches a SOAP Fault
         if (hasLookahead()) {
-            StAXOMBuilder builder = (StAXOMBuilder)getBuilder();
+            StAXOMBuilder builder = (StAXOMBuilder)coreGetBuilder();
             return SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(builder.getLocalName())
                     && getSOAPHelper().getEnvelopeURI().equals(builder.getNamespaceURI());
         } else {
@@ -68,7 +68,7 @@ public aspect AxiomSOAPBodySupport {
 
     public final OMNamespace AxiomSOAPBody.getFirstElementNS() {
         if (hasLookahead()) {
-            StAXOMBuilder builder = (StAXOMBuilder)getBuilder();
+            StAXOMBuilder builder = (StAXOMBuilder)coreGetBuilder();
             String ns = builder.getNamespaceURI();
             if (ns == null) {
                 return null;
@@ -88,7 +88,7 @@ public aspect AxiomSOAPBodySupport {
     
     public final String AxiomSOAPBody.getFirstElementLocalName() {
         if (hasLookahead()) {
-            return ((StAXOMBuilder)getBuilder()).getLocalName();
+            return ((StAXOMBuilder)coreGetBuilder()).getLocalName();
         } else {
             OMElement element = getFirstElement();
             if (element == null) {

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=1729488&r1=1729487&r2=1729488&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
Tue Feb  9 22:21:18 2016
@@ -304,5 +304,5 @@ public abstract class NodeImpl implement
     // /OMNode methods
     // /
 
-    public abstract OMXMLParserWrapper getBuilder();
+    public abstract OMXMLParserWrapper coreGetBuilder();
 }

Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Tue Feb  9 22:21:18 2016
@@ -137,7 +137,7 @@ public abstract class SOAPEnvelopeImpl e
             // let's try to close the builder/parser here since we are now done with the
             // non-caching code block serializing the top-level SOAPEnvelope element
             // TODO: should use 'instance of OMXMLParserWrapper' instead?  StAXBuilder is
more generic
-            OMXMLParserWrapper builder = getBuilder();
+            OMXMLParserWrapper builder = coreGetBuilder();
             if ((builder != null) && (builder instanceof Builder)) {
                 try {
                     if (log.isDebugEnabled()) {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1729488&r1=1729487&r2=1729488&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Tue Feb  9 22:21:18 2016
@@ -655,7 +655,7 @@ public class FOMElement extends FOMChild
      * consumed, only that that particular element has been completely parsed.
      */
     public <T extends Base> T complete() {
-        if (!isComplete() && getBuilder() != null)
+        if (!isComplete() && coreGetBuilder() != null)
             build();
         return (T)this;
     }



Mime
View raw message