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/23 01:03:40 UTC
svn commit: r1692333 - 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: Wed Jul 22 23:03:39 2015
New Revision: 1692333
URL: http://svn.apache.org/r1692333
Log:
Define meaningful interfaces to extract character data from various node types.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj (with props)
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCommentSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj
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/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCDATASectionSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCommentSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
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/DOMElementSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextSupport.aj
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCommentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamespaceDeclarationSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomProcessingInstructionSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.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/CommentImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java Wed Jul 22 23:03:39 2015
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.core;
-public interface CoreAttribute extends NonDeferringParentNode {
+public interface CoreAttribute extends NonDeferringParentNode, CoreCharacterDataContainingParentNode {
/**
* Get the owner element of this attribute.
*
@@ -67,6 +67,4 @@ public interface CoreAttribute extends N
* of its owner element or if the attribute has no owner element
*/
CoreAttribute coreGetPreviousAttribute();
-
- String coreGetValue();
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttributeSupport.aj Wed Jul 22 23:03:39 2015
@@ -131,8 +131,4 @@ public aspect CoreAttributeSupport {
public final void CoreAttribute.coreSetSpecified(boolean specified) {
setFlag(Flags.DEFAULT_ATTR, !specified);
}
-
- public final String CoreAttribute.coreGetValue() {
- return coreGetCharacterData(ElementAction.RETURN_NULL);
- }
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java Wed Jul 22 23:03:39 2015
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreCDATASection {
- String coreGetData();
- void coreSetData(String data);
+public interface CoreCDATASection extends CoreChildNode, CoreCharacterDataContainer {
+ void coreSetCharacterData(String data);
}
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java Wed Jul 22 23:03:39 2015
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public interface CoreCharacterDataContainer extends CoreNode {
+ String coreGetCharacterData();
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java Wed Jul 22 23:03:39 2015
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public interface CoreCharacterDataContainingParentNode extends CoreCharacterDataContainer, CoreParentNode {
+
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj Wed Jul 22 23:03:39 2015
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public aspect CoreCharacterDataContainingParentNodeSupport {
+ public final String CoreCharacterDataContainingParentNode.coreGetCharacterData() {
+ String characterData = internalGetCharacterData(ElementAction.RETURN_NULL);
+ if (characterData == null) {
+ throw new IllegalStateException();
+ }
+ return characterData;
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataContainingParentNodeSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCharacterDataNode.java Wed Jul 22 23:03:39 2015
@@ -18,9 +18,8 @@
*/
package org.apache.axiom.core;
-public interface CoreCharacterDataNode extends CoreChildNode {
- String coreGetData();
- void coreSetData(String data);
+public interface CoreCharacterDataNode extends CoreChildNode, CoreCharacterDataContainer {
+ void coreSetCharacterData(String data);
/**
* Check whether this text node contains element content whitespace (also called
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java Wed Jul 22 23:03:39 2015
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreComment extends CoreChildNode {
- String coreGetData();
- void coreSetData(String data);
+public interface CoreComment extends CoreChildNode, CoreCharacterDataContainer {
+ void coreSetCharacterData(String data);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCommentSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCommentSupport.aj Wed Jul 22 23:03:39 2015
@@ -21,11 +21,11 @@ package org.apache.axiom.core;
public aspect CoreCommentSupport {
private String CoreComment.data;
- public final String CoreComment.coreGetData() {
+ public final String CoreComment.coreGetCharacterData() {
return data;
}
- public final void CoreComment.coreSetData(String data) {
+ public final void CoreComment.coreSetCharacterData(String data) {
this.data = data;
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java Wed Jul 22 23:03:39 2015
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreDocumentFragment extends NonDeferringParentNode {
+public interface CoreDocumentFragment extends CoreMixedContentContainer, NonDeferringParentNode {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java Wed Jul 22 23:03:39 2015
@@ -20,7 +20,7 @@ package org.apache.axiom.core;
import java.util.Iterator;
-public interface CoreElement extends CoreChildNode, CoreParentNode, DeferringParentNode {
+public interface CoreElement extends CoreChildNode, CoreMixedContentContainer, DeferringParentNode {
/**
* Specifies the value that should be returned by
* {@link CoreElement#coreSetAttribute(AttributeMatcher, String, String, CoreAttribute, NodeMigrationPolicy, ReturnValue)}.
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElementSupport.aj Wed Jul 22 23:03:39 2015
@@ -196,7 +196,7 @@ public aspect CoreElementSupport {
if (attr instanceof CoreNamespaceDeclaration) {
CoreNamespaceDeclaration decl = (CoreNamespaceDeclaration)attr;
if (prefix.equals(decl.coreGetDeclaredPrefix())) {
- return decl.coreGetValue();
+ return decl.coreGetCharacterData();
}
}
}
@@ -225,7 +225,7 @@ public aspect CoreElementSupport {
for (CoreAttribute attr = coreGetFirstAttribute(); attr != null; attr = attr.coreGetNextAttribute()) {
if (attr instanceof CoreNamespaceDeclaration) {
CoreNamespaceDeclaration decl = (CoreNamespaceDeclaration)attr;
- if (decl.coreGetValue().equals(namespaceURI)) {
+ if (decl.coreGetCharacterData().equals(namespaceURI)) {
return decl.coreGetDeclaredPrefix();
}
}
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java Wed Jul 22 23:03:39 2015
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public interface CoreMixedContentContainer extends CoreParentNode {
+ String coreGetCharacterData(ElementAction elementAction);
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj Wed Jul 22 23:03:39 2015
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public aspect CoreMixedContentContainerSupport {
+ public final String CoreMixedContentContainer.coreGetCharacterData(ElementAction elementAction) {
+ return internalGetCharacterData(elementAction);
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreMixedContentContainerSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
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=1692333&r1=1692332&r2=1692333&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 Wed Jul 22 23:03:39 2015
@@ -24,8 +24,6 @@ import org.apache.axiom.om.OMXMLParserWr
* Interface for parent nodes.
*/
public interface CoreParentNode extends CoreNode {
- enum ElementAction { SKIP, RECURSE, RETURN_NULL }
-
int COMPLETE = 0;
int INCOMPLETE = 1;
int DISCARDED = 2;
@@ -37,6 +35,5 @@ public interface CoreParentNode extends
void coreSetState(int state);
void build();
- String coreGetCharacterData(ElementAction elementAction);
void coreSetCharacterData(String text, DetachPolicy detachPolicy);
}
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=1692333&r1=1692332&r2=1692333&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 Wed Jul 22 23:03:39 2015
@@ -45,7 +45,7 @@ public aspect CoreParentNodeSupport {
Content content = new Content();
CoreCharacterDataNode cdata = coreGetNodeFactory().createCharacterDataNode();
cdata.internalSetParent(this);
- cdata.coreSetData((String)this.content);
+ cdata.coreSetCharacterData((String)this.content);
content.firstChild = cdata;
content.lastChild = cdata;
this.content = content;
@@ -200,7 +200,7 @@ public aspect CoreParentNodeSupport {
}
}
- public final String CoreParentNode.coreGetCharacterData(ElementAction elementAction) {
+ final String CoreParentNode.internalGetCharacterData(ElementAction elementAction) {
if (getState() == COMPACT) {
return (String)content;
} else {
@@ -228,27 +228,22 @@ public aspect CoreParentNodeSupport {
// Just continue
}
} else {
- String textValue;
- if (child instanceof CoreCharacterDataNode) {
- textValue = ((CoreCharacterDataNode)child).coreGetData();
- } else if (child instanceof CoreCDATASection) {
- textValue = ((CoreCDATASection)child).coreGetData();
- } else {
- textValue = null;
- }
- if (textValue != null && textValue.length() != 0) {
- if (textContent == null) {
- // This is the first non empty text node. Just save the string.
- textContent = textValue;
- } else {
- // We've already seen a non empty text node before. Concatenate using
- // a StringBuilder.
- if (buffer == null) {
- // This is the first text node we need to append. Initialize the
- // StringBuilder.
- buffer = new StringBuilder(textContent);
+ if (child instanceof CoreCharacterDataNode || child instanceof CoreCDATASection) {
+ String textValue = ((CoreCharacterDataContainer)child).coreGetCharacterData();
+ if (textValue.length() != 0) {
+ if (textContent == null) {
+ // This is the first non empty text node. Just save the string.
+ textContent = textValue;
+ } else {
+ // We've already seen a non empty text node before. Concatenate using
+ // a StringBuilder.
+ if (buffer == null) {
+ // This is the first text node we need to append. Initialize the
+ // StringBuilder.
+ buffer = new StringBuilder(textContent);
+ }
+ buffer.append(textValue);
}
- buffer.append(textValue);
}
}
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java Wed Jul 22 23:03:39 2015
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreProcessingInstruction extends CoreChildNode {
+public interface CoreProcessingInstruction extends CoreChildNode, CoreCharacterDataContainer {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstructionSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstructionSupport.aj Wed Jul 22 23:03:39 2015
@@ -30,11 +30,11 @@ public aspect CoreProcessingInstructionS
this.target = target;
}
- public final String CoreProcessingInstruction.coreGetValue() {
+ public final String CoreProcessingInstruction.coreGetCharacterData() {
return value;
}
- public final void CoreProcessingInstruction.coreSetValue(String value) {
+ public final void CoreProcessingInstruction.coreSetCharacterData(String value) {
this.value = value;
}
}
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java?rev=1692333&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java Wed Jul 22 23:03:39 2015
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core;
+
+public enum ElementAction { SKIP, RECURSE, RETURN_NULL }
\ No newline at end of file
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/ElementAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMAttributeSupport.aj Wed Jul 22 23:03:39 2015
@@ -62,7 +62,7 @@ public aspect DOMAttributeSupport {
}
public final String DOMAttribute.getValue() {
- return coreGetValue();
+ return coreGetCharacterData();
}
public final void DOMAttribute.setValue(String value) {
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCDATASectionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCDATASectionSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCDATASectionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCDATASectionSupport.aj Wed Jul 22 23:03:39 2015
@@ -30,6 +30,6 @@ public aspect DOMCDATASectionSupport {
}
public final void DOMCDATASection.setData(String data) {
- coreSetData(data);
+ coreSetCharacterData(data);
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCommentSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMCommentSupport.aj Wed Jul 22 23:03:39 2015
@@ -30,12 +30,12 @@ public aspect DOMCommentSupport {
}
public final String DOMComment.getData() {
- String data = coreGetData();
+ String data = coreGetCharacterData();
// TODO: review this
return data != null ? data : "";
}
public final void DOMComment.setData(String data) {
- coreSetData(data);
+ coreSetCharacterData(data);
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragmentSupport.aj Wed Jul 22 23:03:39 2015
@@ -21,6 +21,7 @@ package org.apache.axiom.dom;
import static org.apache.axiom.dom.DOMExceptionUtil.newDOMException;
import org.apache.axiom.core.CoreElement;
+import org.apache.axiom.core.ElementAction;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
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=1692333&r1=1692332&r2=1692333&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 Wed Jul 22 23:03:39 2015
@@ -111,14 +111,14 @@ public aspect DOMDocumentSupport {
public final Text DOMDocument.createTextNode(String data) {
DOMText text = (DOMText)coreGetNodeFactory().createCharacterDataNode();
text.coreSetOwnerDocument(this);
- text.coreSetData(data);
+ text.coreSetCharacterData(data);
return text;
}
public final CDATASection DOMDocument.createCDATASection(String data) throws DOMException {
DOMCDATASection cdataSection = (DOMCDATASection)coreGetNodeFactory().createCDATASection();
cdataSection.coreSetOwnerDocument(this);
- cdataSection.coreSetData(data);
+ cdataSection.coreSetCharacterData(data);
return cdataSection;
}
@@ -151,7 +151,7 @@ public aspect DOMDocumentSupport {
DOMProcessingInstruction pi = (DOMProcessingInstruction)coreGetNodeFactory().createProcessingInstruction();
pi.coreSetOwnerDocument(this);
pi.coreSetTarget(target);
- pi.coreSetValue(data);
+ pi.coreSetCharacterData(data);
return pi;
}
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj Wed Jul 22 23:03:39 2015
@@ -25,6 +25,7 @@ import org.apache.axiom.core.CoreElement
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.core.CoreNamespaceDeclaration;
+import org.apache.axiom.core.ElementAction;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMProcessingInstructionSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMProcessingInstructionSupport.aj Wed Jul 22 23:03:39 2015
@@ -24,11 +24,11 @@ public aspect DOMProcessingInstructionSu
}
public final String DOMProcessingInstruction.getData() {
- return coreGetValue();
+ return coreGetCharacterData();
}
public final void DOMProcessingInstruction.setData(String data) {
- coreSetValue(data);
+ coreSetCharacterData(data);
}
public final String DOMProcessingInstruction.getNodeName() {
@@ -36,10 +36,10 @@ public aspect DOMProcessingInstructionSu
}
public final String DOMProcessingInstruction.getNodeValue() {
- return coreGetValue();
+ return coreGetCharacterData();
}
public final void DOMProcessingInstruction.setNodeValue(String nodeValue) {
- coreSetValue(nodeValue);
+ coreSetCharacterData(nodeValue);
}
}
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=1692333&r1=1692332&r2=1692333&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 Wed Jul 22 23:03:39 2015
@@ -73,7 +73,7 @@ public aspect DOMTextNodeSupport {
DOMText newText;
if (content.length() > 0) {
newText = (DOMText)coreGetNodeFactory().createCharacterDataNode();
- newText.coreSetData(content);
+ newText.coreSetCharacterData(content);
} else {
newText = null;
}
Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMTextSupport.aj Wed Jul 22 23:03:39 2015
@@ -30,6 +30,6 @@ public aspect DOMTextSupport {
}
public final void DOMText.setData(String data) {
- coreSetData(data);
+ coreSetCharacterData(data);
}
}
Modified: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaProcessingInstructionSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaProcessingInstructionSupport.aj Wed Jul 22 23:03:39 2015
@@ -22,12 +22,12 @@ import org.apache.abdera.model.Processin
public aspect AbderaProcessingInstructionSupport {
public final String AbderaProcessingInstruction.getText() {
- return coreGetValue();
+ return coreGetCharacterData();
}
@SuppressWarnings("unchecked")
public final <T extends ProcessingInstruction> T AbderaProcessingInstruction.setText(String text) {
- coreSetValue(text);
+ coreSetCharacterData(text);
return (T)this;
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj Wed Jul 22 23:03:39 2015
@@ -38,7 +38,7 @@ public aspect AxiomAttributeSupport {
}
public final String AxiomAttribute.getAttributeValue() {
- return coreGetValue();
+ return coreGetCharacterData();
}
public final void AxiomAttribute.setAttributeValue(String value) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCommentSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomCommentSupport.aj Wed Jul 22 23:03:39 2015
@@ -29,14 +29,14 @@ public aspect AxiomCommentSupport {
}
public String AxiomComment.getValue() {
- return coreGetData();
+ return coreGetCharacterData();
}
public void AxiomComment.setValue(String text) {
- coreSetData(text);
+ coreSetCharacterData(text);
}
public final void AxiomComment.internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws OutputException {
- serializer.writeComment(coreGetData());
+ serializer.writeComment(coreGetCharacterData());
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj Wed Jul 22 23:03:39 2015
@@ -35,6 +35,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.core.AttributeMatcher;
import org.apache.axiom.core.CoreAttribute;
import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.core.ElementAction;
import org.apache.axiom.core.IdentityMapper;
import org.apache.axiom.core.NodeMigrationException;
import org.apache.axiom.core.NodeMigrationPolicy;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamespaceDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamespaceDeclarationSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamespaceDeclarationSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomNamespaceDeclarationSupport.aj Wed Jul 22 23:03:39 2015
@@ -28,7 +28,7 @@ public aspect AxiomNamespaceDeclarationS
}
public final OMNamespace AxiomNamespaceDeclaration.getDeclaredNamespace() {
- String namespaceURI = coreGetValue();
+ String namespaceURI = coreGetCharacterData();
if (!namespaceURI.equals(declaredNamespace.getNamespaceURI())) {
declaredNamespace = new OMNamespaceImpl(namespaceURI, declaredNamespace.getPrefix());
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomProcessingInstructionSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomProcessingInstructionSupport.aj Wed Jul 22 23:03:39 2015
@@ -32,14 +32,14 @@ public aspect AxiomProcessingInstruction
}
public final String AxiomProcessingInstruction.getValue() {
- return coreGetValue();
+ return coreGetCharacterData();
}
public final void AxiomProcessingInstruction.setValue(String value) {
- coreSetValue(value);
+ coreSetCharacterData(value);
}
public final void AxiomProcessingInstruction.internalSerialize(Serializer serializer, OMOutputFormat format, boolean cache) throws OutputException {
- serializer.writeProcessingInstruction(coreGetTarget() + " ", coreGetValue());
+ serializer.writeProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData());
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj Wed Jul 22 23:03:39 2015
@@ -194,11 +194,11 @@ public aspect AxiomTextSupport {
getTextContent(true).dataHandlerObject = dataHandlerObject;
}
- public final String AxiomText.coreGetData() {
+ public final String AxiomText.coreGetCharacterData() {
return getText();
}
- public final void AxiomText.coreSetData(String data) {
+ public final void AxiomText.coreSetCharacterData(String data) {
if (content instanceof TextContent) {
((TextContent)content).value = data;
} else {
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=1692333&r1=1692332&r2=1692333&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 Wed Jul 22 23:03:39 2015
@@ -101,7 +101,7 @@ public aspect AxiomNodeFactorySupport {
public final OMText AxiomNodeFactory.createOMText(OMContainer parent, String text, int type, boolean fromBuilder) {
AxiomText node = createAxiomText(parent, type, fromBuilder);
- node.coreSetData(text);
+ node.coreSetCharacterData(text);
return node;
}
@@ -131,7 +131,7 @@ public aspect AxiomNodeFactorySupport {
}
AxiomText node = createAxiomText(parent, type, false);
OMNamespace ns = ((AxiomElement)parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
- node.coreSetData(ns == null ? text.getLocalPart() : ns.getPrefix() + ":" + text.getLocalPart());
+ node.coreSetCharacterData(ns == null ? text.getLocalPart() : ns.getPrefix() + ":" + text.getLocalPart());
return node;
}
@@ -141,7 +141,7 @@ public aspect AxiomNodeFactorySupport {
public final OMText AxiomNodeFactory.createOMText(OMContainer parent, String s, String mimeType, boolean optimize) {
AxiomText node = createAxiomText(parent, OMNode.TEXT_NODE, false);
- node.coreSetData(s);
+ node.coreSetCharacterData(s);
node.internalSetMimeType(mimeType);
node.setOptimize(optimize);
node.setBinary(true);
@@ -191,7 +191,7 @@ public aspect AxiomNodeFactorySupport {
OMContainer parent, String piTarget, String piData, boolean fromBuilder) {
AxiomProcessingInstruction node = (AxiomProcessingInstruction)createProcessingInstruction();
node.coreSetTarget(piTarget);
- node.coreSetValue(piData);
+ node.coreSetCharacterData(piData);
if (parent != null) {
((OMContainerEx)parent).addChild(node, fromBuilder);
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/CommentImpl.java Wed Jul 22 23:03:39 2015
@@ -26,7 +26,7 @@ import org.apache.axiom.om.impl.common.A
public class CommentImpl extends LeafNode implements DOMComment, AxiomComment {
public CommentImpl(String value, OMFactory factory) {
super(factory);
- coreSetData(value);
+ coreSetCharacterData(value);
}
ChildNode createClone() {
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ProcessingInstructionImpl.java Wed Jul 22 23:03:39 2015
@@ -29,6 +29,6 @@ public class ProcessingInstructionImpl e
}
ChildNode createClone() {
- return (ChildNode)getOMFactory().createOMProcessingInstruction(null, coreGetTarget(), coreGetValue());
+ return (ChildNode)getOMFactory().createOMProcessingInstruction(null, coreGetTarget(), coreGetCharacterData());
}
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMCommentImpl.java Wed Jul 22 23:03:39 2015
@@ -35,10 +35,10 @@ public class OMCommentImpl extends OMLea
public OMCommentImpl(OMContainer parentNode, String contentText,
OMFactory factory, boolean fromBuilder) {
super(parentNode, factory, fromBuilder);
- coreSetData(contentText);
+ coreSetCharacterData(contentText);
}
OMNode clone(OMCloneOptions options, OMContainer targetParent) {
- return getOMFactory().createOMComment(targetParent, coreGetData());
+ return getOMFactory().createOMComment(targetParent, coreGetCharacterData());
}
}
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java?rev=1692333&r1=1692332&r2=1692333&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMProcessingInstructionImpl.java Wed Jul 22 23:03:39 2015
@@ -31,6 +31,6 @@ public class OMProcessingInstructionImpl
}
OMNode clone(OMCloneOptions options, OMContainer targetParent) {
- return getOMFactory().createOMProcessingInstruction(targetParent, coreGetTarget(), coreGetValue());
+ return getOMFactory().createOMProcessingInstruction(targetParent, coreGetTarget(), coreGetCharacterData());
}
}