ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1734627 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/ axiom-api/src/main/java/org/apache/axiom/om/ axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/
Date Fri, 11 Mar 2016 20:29:37 GMT
Author: veithen
Date: Fri Mar 11 20:29:37 2016
New Revision: 1734627

URL: http://svn.apache.org/viewvc?rev=1734627&view=rev
Log:
Remove the getCharacterEncoding method from OMXMLParserWrapper.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java?rev=1734627&r1=1734626&r2=1734627&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
Fri Mar 11 20:29:37 2016
@@ -44,10 +44,6 @@ public final class PushBuilder extends A
         }
     }
 
-    public final String getCharacterEncoding() {
-        throw new UnsupportedOperationException();
-    }
-
     public final void close() {
         // This is a no-op
     }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1734627&r1=1734626&r2=1734627&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
Fri Mar 11 20:29:37 2016
@@ -39,8 +39,6 @@ public class StAXOMBuilder extends Abstr
 
     private final Detachable detachable;
     
-    private String charEncoding = null;
-    
     private final CustomBuilderManager customBuilderManager = new CustomBuilderManager();
     
     protected StAXOMBuilder(NodeFactory nodeFactory, XMLStreamReader parser,
@@ -53,7 +51,6 @@ public class StAXOMBuilder extends Abstr
         }
         reader = new StAXPullReader(parser, handler, closeable, autoClose);
         this.detachable = detachable;
-        charEncoding = parser.getEncoding();
         builderHandler.addListener(customBuilderManager);
     }
     
@@ -73,25 +70,10 @@ public class StAXOMBuilder extends Abstr
         customBuilderManager.register(selector, customBuilder);
     }
     
-    public final String getCharsetEncoding() {
-        return builderHandler.getDocument().getCharsetEncoding();
-    }
-
     public final void close() {
         reader.dispose();
     }
 
-    /**
-     * Returns the encoding style of the XML data
-     * @return the character encoding, defaults to "UTF-8"
-     */
-    public final String getCharacterEncoding() {
-        if(this.charEncoding == null){
-            return "UTF-8";
-        }
-        return this.charEncoding;
-    }
-    
     public final void detach() throws OMException {
         if (detachable != null) {
             detachable.detach();

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java?rev=1734627&r1=1734626&r2=1734627&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
Fri Mar 11 20:29:37 2016
@@ -85,12 +85,6 @@ public interface OMXMLParserWrapper {
     OMElement getDocumentElement(boolean discardDocument);
 
     /**
-     * Returns the encoding style of the XML data
-     * @return the character encoding, defaults to "UTF-8"
-     */
-    public String getCharacterEncoding();
-    
-    /**
      * Close this builder. This method frees the resources associated with this builder.
In
      * particular, it releases the resources held by the underlying parser. This method does
      * <b>not</b> close the underlying input source.

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1734627&r1=1734626&r2=1734627&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
(original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
Fri Mar 11 20:29:37 2016
@@ -86,10 +86,6 @@ public class StAXSOAPModelBuilder implem
         return target.getDocumentElement(discardDocument);
     }
 
-    public String getCharacterEncoding() {
-        return target.getCharacterEncoding();
-    }
-
     public void close() {
         target.close();
     }



Mime
View raw message