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/01/23 12:08:16 UTC

svn commit: r1726378 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/ axiom-api/src/main/java/org/apache/axiom/om/impl/ implementa...

Author: veithen
Date: Sat Jan 23 11:08:16 2016
New Revision: 1726378

URL: http://svn.apache.org/viewvc?rev=1726378&view=rev
Log:
Eliminate OMAttributeEx.

Removed:
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMAttributeEx.java
Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareAttribute.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj?rev=1726378&r1=1726377&r2=1726378&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomAttributeSupport.aj Sat Jan 23 11:08:16 2016
@@ -54,8 +54,4 @@ public aspect AxiomAttributeSupport {
     public final void AxiomAttribute.setAttributeType(String type) {
         coreSetType(type);
     }
-
-    public final void AxiomAttribute.setSpecified(boolean specified) {
-        coreSetSpecified(specified);
-    }
 }

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=1726378&r1=1726377&r2=1726378&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 Sat Jan 23 11:08:16 2016
@@ -19,6 +19,7 @@
 
 package org.apache.axiom.om.impl.common.builder;
 
+import org.apache.axiom.core.CoreAttribute;
 import org.apache.axiom.ext.stax.DTDReader;
 import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
 import org.apache.axiom.om.DeferredParsingException;
@@ -31,7 +32,6 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.OMAttributeEx;
 import org.apache.axiom.om.impl.OMContainerEx;
 import org.apache.axiom.om.impl.OMElementEx;
 import org.apache.axiom.om.impl.builder.Builder;
@@ -231,9 +231,7 @@ public class StAXOMBuilder implements Bu
             OMAttribute attr = node.addAttribute(parser.getAttributeLocalName(i),
                               parser.getAttributeValue(i), namespace);
             attr.setAttributeType(parser.getAttributeType(i));
-            if (attr instanceof OMAttributeEx) {
-                ((OMAttributeEx)attr).setSpecified(parser.isAttributeSpecified(i));
-            }
+            ((CoreAttribute)attr).coreSetSpecified(parser.isAttributeSpecified(i));
         }
     }
 

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareAttribute.java?rev=1726378&r1=1726377&r2=1726378&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareAttribute.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareAttribute.java Sat Jan 23 11:08:16 2016
@@ -20,10 +20,9 @@ package org.apache.axiom.om.impl.dom;
 
 import org.apache.axiom.dom.DOMNSAwareAttribute;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.OMAttributeEx;
 import org.apache.axiom.om.impl.intf.AxiomAttribute;
 
-public final class NSAwareAttribute extends AttrImpl implements OMAttributeEx, AxiomAttribute, DOMNSAwareAttribute {
+public final class NSAwareAttribute extends AttrImpl implements AxiomAttribute, DOMNSAwareAttribute {
     public String toString() {
         OMNamespace namespace = getNamespace();
         String localName = getLocalName();