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 2013/07/15 20:16:49 UTC
svn commit: r1503392 - in /webservices/axiom/trunk/modules:
axiom-api/src/main/java/org/apache/axiom/om/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/
Author: veithen
Date: Mon Jul 15 18:16:49 2013
New Revision: 1503392
URL: http://svn.apache.org/r1503392
Log:
Removed the setBuilder method from OMElement. It is an internal method that should not be part of the public API.
Note that strictly speaking, removing that method breaks compatibility with earlier 1.2.x versions. However, using that method in application code would almost inevitably lead to corruption of the internal state of the OMElement. Therefore we can assume that this method is never used in application code and that it is safe to remove it.
Modified:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Modified: webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java?rev=1503392&r1=1503391&r2=1503392&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java Mon Jul 15 18:16:49 2013
@@ -386,13 +386,6 @@ public interface OMElement extends OMNod
void removeAttribute(OMAttribute attr);
/**
- * Method setBuilder.
- *
- * @param wrapper
- */
- void setBuilder(OMXMLParserWrapper wrapper);
-
- /**
* Returns the first child element of the element.
*
* @return Returns the first child element of the element, or <tt>null</tt> if none was found.
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1503392&r1=1503391&r2=1503392&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Mon Jul 15 18:16:49 2013
@@ -833,15 +833,6 @@ public class ElementImpl extends ParentN
}
/**
- * Sets the OM builder.
- *
- * @see org.apache.axiom.om.OMElement#setBuilder (org.apache.axiom.om.OMXMLParserWrapper)
- */
- public void setBuilder(OMXMLParserWrapper wrapper) {
- this.builder = wrapper;
- }
-
- /**
* Sets the local name.
*
* @see org.apache.axiom.om.OMElement#setLocalName(String)
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1503392&r1=1503391&r2=1503392&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Mon Jul 15 18:16:49 2013
@@ -627,11 +627,6 @@ public class OMElementImpl extends OMNod
return addAttribute(new OMAttributeImpl(attributeName, namespace, value, this.factory));
}
- /** Method setBuilder. */
- public void setBuilder(OMXMLParserWrapper wrapper) {
- this.builder = wrapper;
- }
-
/**
* Method getBuilder.
*
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1503392&r1=1503391&r2=1503392&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Mon Jul 15 18:16:49 2013
@@ -280,7 +280,7 @@ public class OMSourcedElementImpl extend
isExpanded = true;
StAXOMBuilder builder = new StAXOMBuilder(getOMFactory(), readerFromDS, this, characterEncoding);
builder.setAutoClose(true);
- super.setBuilder(builder);
+ this.builder = builder;
setComplete(false);
}
}
@@ -436,11 +436,6 @@ public class OMSourcedElementImpl extend
super.removeAttribute(attr);
}
- public void setBuilder(OMXMLParserWrapper wrapper) {
- throw new UnsupportedOperationException(
- "Builder cannot be set for element backed by data source");
- }
-
public OMXMLParserWrapper getBuilder() {
forceExpand();
return super.getBuilder();
@@ -1012,7 +1007,7 @@ public class OMSourcedElementImpl extend
this.dataSource = dataSource;
setComplete(false);
isExpanded = false;
- super.setBuilder(null);
+ builder = null;
if (isLossyPrefix(dataSource)) {
// Create a deferred namespace that forces an expand to get the prefix
definedNamespace = new DeferredNamespace(definedNamespace.getNamespaceURI());