svn commit: r1692430 - in /webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common: AxiomTextSupport.aj TextContent.java

[ve...@apache.org]

Author: veithen
Date: Thu Jul 23 18:58:55 2015
New Revision: 1692430

URL: http://svn.apache.org/r1692430
Log:
Since OMText doesn't have a setText method, TextContent#value can be final.

Modified:
    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/TextContent.java

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=1692430&r1=1692429&r2=1692430&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 Thu Jul 23 18:58:55 2015
@@ -44,8 +44,7 @@ public aspect AxiomTextSupport {
         if (content instanceof TextContent) {
             return (TextContent)content;
         } else if (force) {
-            TextContent textContent = new TextContent();
-            textContent.value = (String)content;
+            TextContent textContent = new TextContent((String)content);
             content = textContent;
             return textContent;
         } else {
@@ -199,19 +198,14 @@ public aspect AxiomTextSupport {
     }
 
     public final void AxiomText.coreSetCharacterData(String data) {
-        if (content instanceof TextContent) {
-            ((TextContent)content).value = data;
-        } else {
-            content = data;
-        }
+        content = data;
     }
     
     public final AxiomText AxiomText.doClone() {
         AxiomText clone = createInstanceOfSameType();
         if (content instanceof TextContent) {
             TextContent textContent = (TextContent)content;
-            TextContent clonedTextContent = new TextContent();
-            clonedTextContent.value = textContent.value;
+            TextContent clonedTextContent = new TextContent(textContent.value);
             clonedTextContent.optimize = textContent.optimize;
             clonedTextContent.mimeType = textContent.mimeType;
             clonedTextContent.binary = textContent.binary;

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/TextContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/TextContent.java?rev=1692430&r1=1692429&r2=1692430&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/TextContent.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/TextContent.java Thu Jul 23 18:58:55 2015
@@ -23,7 +23,7 @@ import javax.activation.DataHandler;
 import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
 
 final class TextContent {
-    String value;
+    final String value;
     
     String mimeType;
     
@@ -38,4 +38,8 @@ final class TextContent {
 
     boolean optimize;
     boolean binary;
+    
+    TextContent(String value) {
+        this.value = value;
+    }
 }