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/21 00:10:08 UTC

svn commit: r1692031 - in /webservices/axiom/trunk: aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/ implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/

Author: veithen
Date: Mon Jul 20 22:10:08 2015
New Revision: 1692031

URL: http://svn.apache.org/r1692031
Log:
Resolve a TODO item.

Modified:
    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/DOMTextSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java

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=1692031&r1=1692030&r2=1692031&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 Mon Jul 20 22:10:08 2015
@@ -28,4 +28,8 @@ public aspect DOMCDATASectionSupport {
     public final String DOMCDATASection.getNodeName() {
         return "#cdata-section";
     }
+
+    public final void DOMCDATASection.setData(String data) {
+        coreSetData(data);
+    }
 }

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=1692031&r1=1692030&r2=1692031&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 Mon Jul 20 22:10:08 2015
@@ -28,4 +28,8 @@ public aspect DOMTextSupport {
     public final short DOMText.getNodeType() {
         return Node.TEXT_NODE;
     }
+
+    public final void DOMText.setData(String data) {
+        coreSetData(data);
+    }
 }

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=1692031&r1=1692030&r2=1692031&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 Mon Jul 20 22:10:08 2015
@@ -35,8 +35,7 @@ import org.apache.axiom.util.UIDGenerato
 import org.apache.axiom.util.base64.Base64Utils;
 
 public aspect AxiomTextSupport {
-    // TODO: should be private
-    public String AxiomText.value;
+    private String AxiomText.value;
     
     private String AxiomText.mimeType;
     

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java?rev=1692031&r1=1692030&r2=1692031&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/TextNodeImpl.java Mon Jul 20 22:10:08 2015
@@ -35,11 +35,6 @@ public abstract class TextNodeImpl exten
         super(factory);
     }
 
-    /** Sets the text value of data. */
-    public void setData(String data) throws DOMException {
-        this.value = data;
-    }
-
     /**
      * Breaks this node into two nodes at the specified offset, keeping both in the tree as
      * siblings. After being split, this node will contain all the content up to the offset point. A
@@ -49,11 +44,12 @@ public abstract class TextNodeImpl exten
      * node has no data.
      */
     public Text splitText(int offset) throws DOMException {
-        if (offset < 0 || offset > this.value.length()) {
+        String value = getData();
+        if (offset < 0 || offset > value.length()) {
             throw newDOMException(DOMException.INDEX_SIZE_ERR);
         }
-        String newValue = this.value.substring(offset);
-        this.deleteData(offset, this.value.length());
+        String newValue = value.substring(offset);
+        this.deleteData(offset, value.length());
 
         TextImpl newText = (TextImpl) this.getOwnerDocument().createTextNode(
                 newValue);
@@ -84,7 +80,8 @@ public abstract class TextNodeImpl exten
     }
 
     public String toString() {
-        return (this.value != null) ? value : "";
+        String value = getData();
+        return value != null ? value : "";
     }
 
     void beforeClone(OMCloneOptions options) {