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 2016/03/08 22:27:03 UTC

svn commit: r1734158 - 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/

Author: veithen
Date: Tue Mar  8 21:27:03 2016
New Revision: 1734158

URL: http://svn.apache.org/viewvc?rev=1734158&view=rev
Log:
Remove the deprecated discard 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=1734158&r1=1734157&r2=1734158&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 Tue Mar  8 21:27:03 2016
@@ -47,10 +47,6 @@ public final class PushBuilder extends A
         return -1;
     }
 
-    public final void discard(OMElement el) throws OMException {
-        throw new UnsupportedOperationException();
-    }
-
     public final void setCache(boolean b) throws OMException {
         throw new UnsupportedOperationException();
     }

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=1734158&r1=1734157&r2=1734158&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 Tue Mar  8 21:27:03 2016
@@ -78,12 +78,6 @@ public class StAXOMBuilder extends Abstr
         ((AxiomContainer)container).discarded();
     }
     
-    // For compatibility only
-    public final void discard(OMElement element) throws OMException {
-        discard((CoreParentNode)element);
-        element.discard();
-    }
-    
     public final void discard(CoreParentNode container) {
         int targetElementLevel = builderHandler.depth;
         Context current = builderHandler.context;

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=1734158&r1=1734157&r2=1734158&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 Tue Mar  8 21:27:03 2016
@@ -42,11 +42,6 @@ public interface OMXMLParserWrapper {
     int next() throws OMException;
 
     /**
-     * @deprecated Use {@link OMNode#discard()} to discard elements.
-     */
-    void discard(OMElement el) throws OMException;
-
-    /**
      * @param b
      * @throws org.apache.axiom.om.OMException
      *

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=1734158&r1=1734157&r2=1734158&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 Tue Mar  8 21:27:03 2016
@@ -75,10 +75,6 @@ public class StAXSOAPModelBuilder implem
         return target.getSOAPMessage();
     }
 
-    public void discard(OMElement el) throws OMException {
-        target.discard(el);
-    }
-
     public void setCache(boolean b) throws OMException {
         target.setCache(b);
     }