svn commit: r1698451 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/ implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/

[veithen]

Author: veithen
Date: Sat Aug 29 09:49:21 2015
New Revision: 1698451

URL: http://svn.apache.org/r1698451
Log:
Use DataHandler instead of Object internally.

Modified:
    
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomTextSupport.aj
    
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
    
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.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=1698451&r1=1698450&r2=1698451&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
 Sat Aug 29 09:49:21 2015
@@ -103,8 +103,7 @@ public aspect AxiomTextSupport {
         }
     }
 
-    // TODO: should be final, but Abdera overrides this method
-    public Object AxiomText.getDataHandler() {
+    public final DataHandler AxiomText.getDataHandler() {
         Object content = coreGetCharacterData();
         if (content instanceof TextContent) {
             return ((TextContent)content).getDataHandler();

Modified: 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java?rev=1698451&r1=1698450&r2=1698451&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
 (original)
+++ 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
 Sat Aug 29 09:49:21 2015
@@ -32,10 +32,6 @@ public class FOMCDATASection extends CDA
         super(factory);
     }
 
-    public DataHandler getDataHandler() {
-        return (DataHandler)super.getDataHandler();
-    }
-
     public InputStream getInputStream() {
         try {
             return getDataHandler().getInputStream();

Modified: 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java?rev=1698451&r1=1698450&r2=1698451&view=diff
==============================================================================
--- 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java
 (original)
+++ 
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterDataNode.java
 Sat Aug 29 09:49:21 2015
@@ -32,10 +32,6 @@ public class FOMCharacterDataNode extend
         super(factory);
     }
 
-    public DataHandler getDataHandler() {
-        return (DataHandler)super.getDataHandler();
-    }
-
     public InputStream getInputStream() {
         try {
             return getDataHandler().getInputStream();