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 2015/07/22 00:55:30 UTC
svn commit: r1692200 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
aspects/fom-aspects/src/main/java/org/apache/axiom/fom/
aspects/om-aspects/src/main/ja...
Author: veithen
Date: Tue Jul 21 22:55:30 2015
New Revision: 1692200
URL: http://svn.apache.org/r1692200
Log:
Rename CoreCharacterData to CoreCharacterDataNode.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
- copied, changed from r1692185, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterData.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNodeSupport.aj
- copied, changed from r1692185, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSupport.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterDataNode.java
- copied, changed from r1692185, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterData.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNode.java
- copied, changed from r1692185, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterData.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNodeSupport.aj
- copied, changed from r1692185, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataSupport.aj
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java
- copied, changed from r1692185, webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterData.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSupport.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterData.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterData.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataSupport.aj
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Flags.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMText.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/CharacterDataImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java (from r1692185, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterData.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterData.java&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterData.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java Tue Jul 21 22:55:30 2015
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.core;
-public interface CoreCharacterData extends CoreChildNode {
+public interface CoreCharacterDataNode extends CoreChildNode {
String coreGetData();
void coreSetData(String data);
Copied: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNodeSupport.aj (from r1692185, webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSupport.aj)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNodeSupport.aj?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNodeSupport.aj&p1=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSupport.aj&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNodeSupport.aj Tue Jul 21 22:55:30 2015
@@ -18,12 +18,12 @@
*/
package org.apache.axiom.core;
-public aspect CoreCharacterDataSupport {
- public final boolean CoreCharacterData.coreIsIgnorable() {
+public aspect CoreCharacterDataNodeSupport {
+ public final boolean CoreCharacterDataNode.coreIsIgnorable() {
return getFlag(Flags.IGNORABLE);
}
- public final void CoreCharacterData.coreSetIgnorable(boolean ignorable) {
+ public final void CoreCharacterDataNode.coreSetIgnorable(boolean ignorable) {
setFlag(Flags.IGNORABLE, ignorable);
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj Tue Jul 21 22:55:30 2015
@@ -43,7 +43,7 @@ public aspect CoreParentNodeSupport {
final Content CoreParentNode.getContent(boolean create) {
if (getState() == COMPACT) {
Content content = new Content();
- CoreCharacterData cdata = coreGetNodeFactory().createCharacterData();
+ CoreCharacterDataNode cdata = coreGetNodeFactory().createCharacterDataNode();
cdata.internalSetParent(this);
cdata.coreSetData((String)this.content);
content.firstChild = cdata;
@@ -229,8 +229,8 @@ public aspect CoreParentNodeSupport {
}
} else {
String textValue;
- if (child instanceof CoreCharacterData) {
- textValue = ((CoreCharacterData)child).coreGetData();
+ if (child instanceof CoreCharacterDataNode) {
+ textValue = ((CoreCharacterDataNode)child).coreGetData();
} else if (child instanceof CoreCDATASection) {
textValue = ((CoreCDATASection)child).coreGetData();
} else {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Flags.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Flags.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Flags.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Flags.java Tue Jul 21 22:55:30 2015
@@ -37,7 +37,7 @@ final class Flags {
static final int DEFAULT_ATTR = 8;
/**
- * Used to store the information returned by {@link CoreCharacterData#coreIsIgnorable()}.
+ * Used to store the information returned by {@link CoreCharacterDataNode#coreIsIgnorable()}.
*/
static final int IGNORABLE = 16;
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NodeFactory.java Tue Jul 21 22:55:30 2015
@@ -21,7 +21,7 @@ package org.apache.axiom.core;
public interface NodeFactory {
CoreDocument createDocument();
CoreDocumentTypeDeclaration createDocumentTypeDeclaration();
- CoreCharacterData createCharacterData();
+ CoreCharacterDataNode createCharacterDataNode();
CoreCDATASection createCDATASection();
CoreNSUnawareAttribute createAttribute(CoreDocument document, String name, String value, String type);
CoreNSAwareAttribute createAttribute(CoreDocument document, String namespaceURI, String localName, String prefix, String value, String type);
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj Tue Jul 21 22:55:30 2015
@@ -109,7 +109,7 @@ public aspect DOMDocumentSupport {
}
public final Text DOMDocument.createTextNode(String data) {
- DOMText text = (DOMText)coreGetNodeFactory().createCharacterData();
+ DOMText text = (DOMText)coreGetNodeFactory().createCharacterDataNode();
text.coreSetOwnerDocument(this);
text.coreSetData(data);
return text;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMText.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMText.java (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMText.java Tue Jul 21 22:55:30 2015
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.dom;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
-public interface DOMText extends DOMTextNode, CoreCharacterData {
+public interface DOMText extends DOMTextNode, CoreCharacterDataNode {
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj Tue Jul 21 22:55:30 2015
@@ -72,7 +72,7 @@ public aspect DOMTextNodeSupport {
public final Text DOMTextNode.replaceWholeText(String content) throws DOMException {
DOMText newText;
if (content.length() > 0) {
- newText = (DOMText)coreGetNodeFactory().createCharacterData();
+ newText = (DOMText)coreGetNodeFactory().createCharacterDataNode();
newText.coreSetData(content);
} else {
newText = null;
Copied: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterDataNode.java (from r1692185, webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterData.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterDataNode.java?p2=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterDataNode.java&p1=webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterData.java&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterData.java (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaCharacterDataNode.java Tue Jul 21 22:55:30 2015
@@ -19,8 +19,8 @@
package org.apache.axiom.fom;
import org.apache.abdera.model.TextValue;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
-public interface AbderaCharacterData extends TextValue, AbderaChildNode, CoreCharacterData {
+public interface AbderaCharacterDataNode extends TextValue, AbderaChildNode, CoreCharacterDataNode {
}
Copied: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNode.java (from r1692185, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterData.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNode.java?p2=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNode.java&p1=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterData.java&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterData.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNode.java Tue Jul 21 22:55:30 2015
@@ -18,8 +18,8 @@
*/
package org.apache.axiom.om.impl.common;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
-public interface AxiomCharacterData extends CoreCharacterData, AxiomText {
+public interface AxiomCharacterDataNode extends CoreCharacterDataNode, AxiomText {
}
Copied: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNodeSupport.aj (from r1692185, webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataSupport.aj)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNodeSupport.aj?p2=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNodeSupport.aj&p1=webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataSupport.aj&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCharacterDataNodeSupport.aj Tue Jul 21 22:55:30 2015
@@ -20,13 +20,13 @@ package org.apache.axiom.om.impl.common;
import org.apache.axiom.om.OMNode;
-public aspect AxiomCharacterDataSupport {
- public final int AxiomCharacterData.getType() {
+public aspect AxiomCharacterDataNodeSupport {
+ public final int AxiomCharacterDataNode.getType() {
return coreIsIgnorable() ? OMNode.SPACE_NODE : OMNode.TEXT_NODE;
}
- public final AxiomText AxiomCharacterData.createInstanceOfSameType() {
- AxiomCharacterData instance = (AxiomCharacterData)coreGetNodeFactory().createCharacterData();
+ public final AxiomText AxiomCharacterDataNode.createInstanceOfSameType() {
+ AxiomCharacterDataNode instance = (AxiomCharacterDataNode)coreGetNodeFactory().createCharacterDataNode();
instance.coreSetIgnorable(coreIsIgnorable());
return instance;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj Tue Jul 21 22:55:30 2015
@@ -32,7 +32,7 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.common.AxiomCDATASection;
-import org.apache.axiom.om.impl.common.AxiomCharacterData;
+import org.apache.axiom.om.impl.common.AxiomCharacterDataNode;
import org.apache.axiom.om.impl.common.AxiomDocType;
import org.apache.axiom.om.impl.common.AxiomDocument;
import org.apache.axiom.om.impl.common.AxiomElement;
@@ -76,11 +76,11 @@ public aspect AxiomNodeFactorySupport {
AxiomText node;
switch (type) {
case OMNode.TEXT_NODE: {
- node = (AxiomCharacterData)createCharacterData();
+ node = (AxiomCharacterDataNode)createCharacterDataNode();
break;
}
case OMNode.SPACE_NODE: {
- AxiomCharacterData cdata = (AxiomCharacterData)createCharacterData();
+ AxiomCharacterDataNode cdata = (AxiomCharacterDataNode)createCharacterDataNode();
cdata.coreSetIgnorable(true);
node = cdata;
break;
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextImpl.java Tue Jul 21 22:55:30 2015
@@ -21,9 +21,9 @@ package org.apache.axiom.om.impl.dom;
import org.apache.axiom.dom.DOMText;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomCharacterData;
+import org.apache.axiom.om.impl.common.AxiomCharacterDataNode;
-public class TextImpl extends TextNodeImpl implements DOMText, AxiomCharacterData {
+public class TextImpl extends TextNodeImpl implements DOMText, AxiomCharacterDataNode {
public TextImpl(OMFactory factory) {
super(factory);
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java Tue Jul 21 22:55:30 2015
@@ -20,7 +20,7 @@
package org.apache.axiom.om.impl.dom.factory;
import org.apache.axiom.core.CoreCDATASection;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreDocumentTypeDeclaration;
import org.apache.axiom.core.CoreNSAwareAttribute;
@@ -302,7 +302,7 @@ public class OMDOMFactory implements Axi
return new DocumentTypeImpl(this);
}
- public final CoreCharacterData createCharacterData() {
+ public final CoreCharacterDataNode createCharacterDataNode() {
return new TextImpl(this);
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/CharacterDataImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/CharacterDataImpl.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/CharacterDataImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/CharacterDataImpl.java Tue Jul 21 22:55:30 2015
@@ -19,9 +19,9 @@
package org.apache.axiom.om.impl.llom;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.common.AxiomCharacterData;
+import org.apache.axiom.om.impl.common.AxiomCharacterDataNode;
-public class CharacterDataImpl extends OMTextImpl implements AxiomCharacterData {
+public class CharacterDataImpl extends OMTextImpl implements AxiomCharacterDataNode {
public CharacterDataImpl(OMFactory factory) {
super(factory);
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java Tue Jul 21 22:55:30 2015
@@ -20,7 +20,7 @@
package org.apache.axiom.om.impl.llom.factory;
import org.apache.axiom.core.CoreCDATASection;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreDocumentTypeDeclaration;
import org.apache.axiom.core.CoreNSAwareAttribute;
@@ -304,7 +304,7 @@ public class OMLinkedListImplFactory imp
return new OMDocTypeImpl(this);
}
- public CoreCharacterData createCharacterData() {
+ public CoreCharacterDataNode createCharacterDataNode() {
return new CharacterDataImpl(this);
}
Copied: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java (from r1692185, webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java?p2=webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java&p1=webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java&r1=1692185&r2=1692200&rev=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java Tue Jul 21 22:55:30 2015
@@ -22,13 +22,13 @@ import java.io.InputStream;
import javax.activation.DataHandler;
-import org.apache.axiom.fom.AbderaCharacterData;
+import org.apache.axiom.fom.AbderaCharacterDataNode;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.CharacterDataImpl;
-public class FOMCharacterData extends CharacterDataImpl implements AbderaCharacterData {
+public class FOMCharacterDataNode extends CharacterDataImpl implements AbderaCharacterDataNode {
- public FOMCharacterData(OMFactory factory) {
+ public FOMCharacterDataNode(OMFactory factory) {
super(factory);
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1692200&r1=1692199&r2=1692200&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Tue Jul 21 22:55:30 2015
@@ -55,7 +55,7 @@ import org.apache.abdera.util.Constants;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.util.Version;
import org.apache.axiom.core.CoreCDATASection;
-import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.core.CoreCharacterDataNode;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.fom.AbderaFactory;
@@ -643,8 +643,8 @@ public class FOMFactory extends OMLinked
}
@Override
- public CoreCharacterData createCharacterData() {
- return new FOMCharacterData(this);
+ public CoreCharacterDataNode createCharacterDataNode() {
+ return new FOMCharacterDataNode(this);
}
@Override