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 2012/05/13 19:25:25 UTC
svn commit: r1337944 - in /webservices/axiom/branches/CLONE: ./
modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/
modules/axiom-testsuite/src/main/java/org/apache/axiom/t...
Author: veithen
Date: Sun May 13 17:25:25 2012
New Revision: 1337944
URL: http://svn.apache.org/viewvc?rev=1337944&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java
- copied unchanged from r1337941, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromOMText.java
Modified:
webservices/axiom/branches/CLONE/ (props changed)
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Propchange: webservices/axiom/branches/CLONE/
------------------------------------------------------------------------------
Merged /webservices/commons/trunk/modules/axiom:r1337926-1337941
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java?rev=1337944&r1=1337943&r2=1337944&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java Sun May 13 17:25:25 2012
@@ -71,8 +71,8 @@ public class TextImpl extends TextNodeIm
super(parent, text, factory);
}
- public TextImpl(OMContainer parent, TextNodeImpl source, OMFactory factory) {
- super(parent, source, factory);
+ public TextImpl(DocumentImpl ownerNode, TextNodeImpl source, OMFactory factory) {
+ super(ownerNode, source, factory);
}
public TextImpl(String contentID, OMContainer parent, OMXMLParserWrapper builder,
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=1337944&r1=1337943&r2=1337944&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java Sun May 13 17:25:25 2012
@@ -101,8 +101,8 @@ public abstract class TextNodeImpl exten
* @param source TextImpl
* @param factory
*/
- public TextNodeImpl(OMContainer parent, TextNodeImpl source, OMFactory factory) {
- super((DocumentImpl) ((ParentNode) parent).getOwnerDocument(), factory);
+ public TextNodeImpl(DocumentImpl ownerNode, TextNodeImpl source, OMFactory factory) {
+ super(ownerNode, factory);
this.done = true;
// Copy the value of the text
Modified: webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?rev=1337944&r1=1337943&r2=1337944&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java Sun May 13 17:25:25 2012
@@ -214,7 +214,9 @@ public class OMDOMFactory implements OMF
public OMText createOMText(OMContainer parent, OMText source) {
- return new TextImpl(parent, (TextImpl) source, this);
+ TextImpl text = new TextImpl(null, (TextImpl) source, this);
+ parent.addChild(text);
+ return text;
}
public OMText createOMText(OMContainer parent, char[] charArary, int type) {
Modified: webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1337944&r1=1337943&r2=1337944&view=diff
==============================================================================
--- webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/CLONE/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sun May 13 17:25:25 2012
@@ -308,6 +308,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMProcessingInstructionWithoutParent(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMText(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextFromDataHandlerProvider(metaFactory));
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextFromOMText(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextWithNullParent(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestFactoryIsSingleton(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestGetMetaFactory(metaFactory));