Author: veithen
Date: Sat Mar 14 10:41:03 2009
New Revision: 753633
URL: http://svn.apache.org/viewvc?rev=753633&view=rev
Log:
Axiom tests: refactored XMLStreamReaderWithQName to use StreamReaderDelegate.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/builder/XMLStreamReaderWithQName.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/builder/XMLStreamReaderWithQName.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/builder/XMLStreamReaderWithQName.java?rev=753633&r1=753632&r2=753633&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/builder/XMLStreamReaderWithQName.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/builder/XMLStreamReaderWithQName.java
Sat Mar 14 10:41:03 2009
@@ -21,97 +21,28 @@
import org.apache.axiom.soap.SOAPConstants;
-import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.util.StreamReaderDelegate;
/**
* Used by StAXSOAPModelBuilderTest to simulate
*
*/
-public class XMLStreamReaderWithQName implements
javax.xml.stream.XMLStreamReader {
+public class XMLStreamReaderWithQName extends StreamReaderDelegate {
- private XMLStreamReader delegate;
private QName soapBodyFirstChildElementQName;
private boolean readBody = false;
- public XMLStreamReaderWithQName(XMLStreamReader delegate,
+ public XMLStreamReaderWithQName(XMLStreamReader reader,
QName soapBodyFirstChildElementQName) {
- super();
- this.delegate = delegate;
+ super(reader);
this.soapBodyFirstChildElementQName = soapBodyFirstChildElementQName;
}
- public void close() throws XMLStreamException {
- delegate.close();
- }
-
-
- public int getAttributeCount() {
- return delegate.getAttributeCount();
- }
-
-
- public String getAttributeLocalName(int arg0) {
- return delegate.getAttributeLocalName(arg0);
- }
-
-
- public QName getAttributeName(int arg0) {
- return delegate.getAttributeName(arg0);
- }
-
-
- public String getAttributeNamespace(int arg0) {
- return delegate.getAttributeNamespace(arg0);
- }
-
-
- public String getAttributePrefix(int arg0) {
- return delegate.getAttributePrefix(arg0);
- }
-
-
- public String getAttributeType(int arg0) {
- return delegate.getAttributeType(arg0);
- }
-
-
- public String getAttributeValue(int arg0) {
- return delegate.getAttributeValue(arg0);
- }
-
-
- public String getAttributeValue(String arg0, String arg1) {
- return delegate.getAttributeValue(arg0, arg1);
- }
-
-
- public String getCharacterEncodingScheme() {
- return delegate.getCharacterEncodingScheme();
- }
-
-
- public String getElementText() throws XMLStreamException {
- return delegate.getElementText();
- }
-
-
- public String getEncoding() {
- return delegate.getEncoding();
- }
-
-
- public int getEventType() {
- return delegate.getEventType();
- }
-
-
public String getLocalName() {
- String localName = delegate.getLocalName();
+ String localName = super.getLocalName();
if (localName.equals("Body")) {
this.readBody = true;
}
@@ -123,162 +54,11 @@
return readBody;
}
- public Location getLocation() {
- return delegate.getLocation();
- }
-
-
- public QName getName() {
- return delegate.getName();
- }
-
-
- public NamespaceContext getNamespaceContext() {
- return delegate.getNamespaceContext();
- }
-
-
- public int getNamespaceCount() {
- return delegate.getNamespaceCount();
- }
-
-
- public String getNamespacePrefix(int arg0) {
- return delegate.getNamespacePrefix(arg0);
- }
-
-
- public String getNamespaceURI() {
- return delegate.getNamespaceURI();
- }
-
-
- public String getNamespaceURI(int arg0) {
- return delegate.getNamespaceURI(arg0);
- }
-
-
- public String getNamespaceURI(String arg0) {
- return delegate.getNamespaceURI(arg0);
- }
-
-
- public String getPIData() {
- return delegate.getPIData();
- }
-
-
- public String getPITarget() {
- return delegate.getPITarget();
- }
-
-
- public String getPrefix() {
- return delegate.getPrefix();
- }
-
-
public Object getProperty(String arg0) throws IllegalArgumentException {
// Return the qname
if (arg0.equals(SOAPConstants.SOAPBODY_FIRST_CHILD_ELEMENT_QNAME)) {
return this.soapBodyFirstChildElementQName;
}
- return delegate.getProperty(arg0);
+ return super.getProperty(arg0);
}
-
-
- public String getText() {
- return delegate.getText();
- }
-
-
- public char[] getTextCharacters() {
- return delegate.getTextCharacters();
- }
-
-
- public int getTextCharacters(int arg0, char[] arg1, int arg2, int arg3)
throws XMLStreamException {
- return delegate.getTextCharacters(arg0, arg1, arg2, arg3);
- }
-
-
- public int getTextLength() {
- return delegate.getTextLength();
- }
-
-
- public int getTextStart() {
- return delegate.getTextStart();
- }
-
-
- public String getVersion() {
- return delegate.getVersion();
- }
-
-
- public boolean hasName() {
- return delegate.hasName();
- }
-
-
- public boolean hasNext() throws XMLStreamException {
- return delegate.hasNext();
- }
-
-
- public boolean hasText() {
- return delegate.hasText();
- }
-
-
- public boolean isAttributeSpecified(int arg0) {
- return delegate.isAttributeSpecified(arg0);
- }
-
-
- public boolean isCharacters() {
- return delegate.isCharacters();
- }
-
-
- public boolean isEndElement() {
- return delegate.isEndElement();
- }
-
-
- public boolean isStandalone() {
- return delegate.isStandalone();
- }
-
-
- public boolean isStartElement() {
- return delegate.isStartElement();
- }
-
-
- public boolean isWhiteSpace() {
- return delegate.isWhiteSpace();
- }
-
-
- public int next() throws XMLStreamException {
- return delegate.next();
- }
-
-
- public int nextTag() throws XMLStreamException {
- return delegate.nextTag();
- }
-
-
- public void require(int arg0, String arg1, String arg2) throws
XMLStreamException {
- delegate.require(arg0, arg1, arg2);
- }
-
-
- public boolean standaloneSet() {
- return delegate.standaloneSet();
- }
-
}
