ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1609925 - in /webservices/axiom/trunk/modules: axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/ axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/
Date Sat, 12 Jul 2014 14:24:27 GMT
Author: veithen
Date: Sat Jul 12 14:24:26 2014
New Revision: 1609925

URL: http://svn.apache.org/r1609925
Log:
Fixed some AspectJ compiler warnings.

Modified:
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
    webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
    webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj?rev=1609925&r1=1609924&r2=1609925&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
(original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
Sat Jul 12 14:24:26 2014
@@ -63,15 +63,15 @@ public aspect OMContainerSupport {
         coreSetState(DISCARDED);
     }
 
-    public XMLStreamReader OMContainer.getXMLStreamReader() {
+    public XMLStreamReader IContainer.getXMLStreamReader() {
         return getXMLStreamReader(true);
     }
     
-    public XMLStreamReader OMContainer.getXMLStreamReaderWithoutCaching() {
+    public XMLStreamReader IContainer.getXMLStreamReaderWithoutCaching() {
         return getXMLStreamReader(false);
     }
 
-    public XMLStreamReader OMContainer.getXMLStreamReader(boolean cache) {
+    public XMLStreamReader IContainer.getXMLStreamReader(boolean cache) {
         return getXMLStreamReader(cache, defaultReaderConfiguration);
     }
     
@@ -266,7 +266,7 @@ public aspect OMContainerSupport {
         return new OMDescendantsIterator(this, includeSelf);
     }
 
-    public OMElement OMContainer.getFirstChildWithName(QName elementQName) throws OMException
{
+    public OMElement IContainer.getFirstChildWithName(QName elementQName) throws OMException
{
         OMChildrenQNameIterator omChildrenQNameIterator =
                 new OMChildrenQNameIterator(getFirstOMChild(),
                                             elementQName);
@@ -283,7 +283,7 @@ public aspect OMContainerSupport {
         return new SAXSource(new XMLReaderImpl(this, cache), new InputSource());
     }
 
-    public SAXResult OMContainer.getSAXResult() {
+    public SAXResult IContainer.getSAXResult() {
         SAXResultContentHandler handler = new SAXResultContentHandler(this);
         SAXResult result = new SAXResult();
         result.setHandler(handler);

Modified: webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj?rev=1609925&r1=1609924&r2=1609925&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
(original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
Sat Jul 12 14:24:26 2014
@@ -50,11 +50,11 @@ import org.apache.axiom.util.stax.XMLStr
 public aspect OMElementSupport {
     declare parents: (InformationItem+ && OMElement+) implements IElement;
     
-    public final int OMElement.getType() {
+    public final int IElement.getType() {
         return OMNode.ELEMENT_NODE;
     }
     
-    public NamespaceContext OMElement.getNamespaceContext(boolean detached) {
+    public NamespaceContext IElement.getNamespaceContext(boolean detached) {
         if (detached) {
             Map namespaces = new HashMap();
             for (Iterator it = getNamespacesInScope(); it.hasNext(); ) {
@@ -67,7 +67,7 @@ public aspect OMElementSupport {
         }
     }
     
-    public String OMElement.getText() {
+    public String IElement.getText() {
         String childText = null;
         StringBuffer buffer = null;
         OMNode child = getFirstOMChild();
@@ -107,12 +107,12 @@ public aspect OMElementSupport {
     }
     
     // Note: must not be final because it is (incorrectly) overridden in the SOAPFaultCode
implementation for SOAP 1.2
-    public QName OMElement.getTextAsQName() {
+    public QName IElement.getTextAsQName() {
         String childText = getText().trim();
         return childText.length() == 0 ? null : resolveQName(childText);
     }
 
-    public Reader OMElement.getTextAsStream(boolean cache) {
+    public Reader IElement.getTextAsStream(boolean cache) {
         // If the element is not an OMSourcedElement and has not more than one child, then
the most
         // efficient way to get the Reader is to build a StringReader
         if (!(this instanceof OMSourcedElement) && (!cache || isComplete())) {
@@ -135,7 +135,7 @@ public aspect OMElementSupport {
         }
     }
     
-    public void OMElement.writeTextTo(Writer out, boolean cache) throws IOException {
+    public void IElement.writeTextTo(Writer out, boolean cache) throws IOException {
         try {
             XMLStreamReader reader = getXMLStreamReader(cache);
             int depth = 0;
@@ -159,7 +159,7 @@ public aspect OMElementSupport {
         }
     }
     
-    public final void OMElement.setText(String text) {
+    public final void IElement.setText(String text) {
         // Remove all existing children
         OMNode child;
         while ((child = getFirstOMChild()) != null) {
@@ -171,7 +171,7 @@ public aspect OMElementSupport {
         }
     }
 
-    public final void OMElement.setText(QName qname) {
+    public final void IElement.setText(QName qname) {
         // Remove all existing children
         OMNode child;
         while ((child = getFirstOMChild()) != null) {

Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1609925&r1=1609924&r2=1609925&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sat Jul 12 14:24:26 2014
@@ -47,7 +47,6 @@ import org.apache.axiom.om.util.StAXUtil
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -57,7 +56,6 @@ import javax.xml.transform.sax.SAXResult
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Iterator;
@@ -398,11 +396,6 @@ public class OMSourcedElementImpl extend
         return super.getNamespacesInScope();
     }
 
-    public NamespaceContext getNamespaceContext(boolean detached) {
-        forceExpand();
-        return super.getNamespaceContext(detached);
-    }
-
     public Iterator getAllAttributes() {
         forceExpand();
         return super.getAllAttributes();
@@ -486,14 +479,6 @@ public class OMSourcedElementImpl extend
         return super.getText();
     }
 
-    public Reader getTextAsStream(boolean cache) {
-        return super.getTextAsStream(cache);
-    }
-
-    public void writeTextTo(Writer out, boolean cache) throws IOException {
-        super.writeTextTo(out, cache);
-    }
-
     private void ensureLocalNameSet() {
         if (localName == null) {
             if (dataSource instanceof QNameAwareOMDataSource) {



Mime
View raw message