ws-commits mailing list archives

Author: veithen
Date: Fri Mar 11 20:01:42 2016
New Revision: 1734625

URL: http://svn.apache.org/viewvc?rev=1734625&view=rev
Log:
Get rid of the isClosed method.

Modified:
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
    webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
    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/StAXHelper.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java?rev=1734625&r1=1734624&r2=1734625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
Fri Mar 11 20:01:42 2016
@@ -22,5 +22,4 @@ public interface Builder {
     void next();
     boolean isCompleted();
     void close();
-    boolean isClosed();
 }

Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1734625&r1=1734624&r2=1734625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
Fri Mar 11 20:01:42 2016
@@ -129,8 +129,6 @@ public aspect CoreParentNodeSupport {
         Builder builder = coreGetBuilder();
         if (builder == null) {
             throw new IllegalStateException("The node has no builder");
-        } else if (builder.isClosed()) {
-            throw new IllegalStateException("The builder has already been closed");
         } else if (!builder.isCompleted()) {
             builder.next();
         } else {

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=1734625&r1=1734624&r2=1734625&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:01:42 2016
@@ -56,9 +56,4 @@ public final class PushBuilder extends A
         // Force processing of the SAX source
         getDocument();
     }
-
-    @Override
-    public final boolean isClosed() {
-        return true;
-    }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java?rev=1734625&r1=1734624&r2=1734625&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
Fri Mar 11 20:01:42 2016
@@ -162,7 +162,7 @@ public class StAXHelper implements XmlRe
 
     public final void close() {
         try {
-            if (!isClosed()) {
+            if (!_isClosed) {
                 parser.close();
                 if (closeable != null) {
                     closeable.close();
@@ -184,10 +184,6 @@ public class StAXHelper implements XmlRe
         }
     }
 
-    public final boolean isClosed() {
-        return _isClosed;
-    }
-    
     @Override
     public boolean proceed() throws StreamException {
         return next() == XMLStreamReader.END_DOCUMENT;

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=1734625&r1=1734624&r2=1734625&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:01:42 2016
@@ -89,10 +89,6 @@ public class StAXOMBuilder extends Abstr
         return this.charEncoding;
     }
     
-    public final boolean isClosed() {
-        return helper.isClosed();
-    }
-    
     public final void detach() throws OMException {
         if (detachable != null) {
             detachable.detach();