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 2012/07/14 09:47:48 UTC
svn commit: r1361486 -
/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Author: veithen
Date: Sat Jul 14 07:47:48 2012
New Revision: 1361486
URL: http://svn.apache.org/viewvc?rev=1361486&view=rev
Log:
An XMLStreamReader never returns events of type ATTRIBUTE or NAMESPACE. I think that these events/constants were foreseen for XPath support in StAX (which has never been specified/implemented).
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1361486&r1=1361485&r2=1361486&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Sat Jul 14 07:47:48 2012
@@ -242,8 +242,7 @@ class SwitchingWrapper extends AbstractX
returnStr = parser.getNamespaceURI();
} else {
if ((currentEvent == START_ELEMENT)
- || (currentEvent == END_ELEMENT)
- || (currentEvent == NAMESPACE)) {
+ || (currentEvent == END_ELEMENT)) {
OMNamespace ns = ((OMElement) lastNode).getNamespace();
if (ns == null) {
returnStr = null;
@@ -520,8 +519,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getNamespaceURI(i);
} else {
- if (isStartElement() || isEndElement()
- || (currentEvent == NAMESPACE)) {
+ if (isStartElement() || isEndElement()) {
loadNamespaces();
returnString = namespaces[i].getNamespaceURI();
}
@@ -551,8 +549,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getNamespacePrefix(i);
} else {
- if (isStartElement() || isEndElement()
- || (currentEvent == NAMESPACE)) {
+ if (isStartElement() || isEndElement()) {
loadNamespaces();
String prefix = namespaces[i].getPrefix();
returnString = prefix == null || prefix.length() == 0 ? null : prefix;
@@ -569,8 +566,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null && currentEvent != END_DOCUMENT) {
return parser.getNamespaceCount();
} else {
- if (isStartElement() || isEndElement()
- || (currentEvent == NAMESPACE)) {
+ if (isStartElement() || isEndElement()) {
loadNamespaces();
return namespaceCount;
} else {
@@ -588,7 +584,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
return parser.isAttributeSpecified(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
// The Axiom object model doesn't store this information,
// but returning true is a reasonable default.
return true;
@@ -609,7 +605,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributeValue(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnString = attributes[i].getAttributeValue();
} else {
@@ -630,7 +626,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributeType(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnString = attributes[i].getAttributeType();
} else {
@@ -651,7 +647,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributePrefix(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
OMAttribute attrib = attributes[i];
if (attrib != null) {
@@ -678,7 +674,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributeLocalName(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnString = attributes[i].getLocalName();
} else {
@@ -699,7 +695,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributeNamespace(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
OMAttribute attrib = attributes[i];
if (attrib != null) {
@@ -726,7 +722,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnQName = parser.getAttributeName(i);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnQName = attributes[i].getQName();
} else {
@@ -746,7 +742,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnCount = parser.getAttributeCount();
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnCount = attributeCount;
} else {
@@ -772,7 +768,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getAttributeValue(s, s1);
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
QName qname = new QName(s, s1);
OMAttribute attrib = ((OMElement) lastNode).getAttribute(qname);
if (attrib != null) {
@@ -873,8 +869,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnString = parser.getNamespaceURI(prefix);
} else {
- if (isStartElement() || isEndElement()
- || (currentEvent == NAMESPACE)) {
+ if (isStartElement() || isEndElement()) {
if (lastNode instanceof OMElement) {
OMNamespace namespaceURI =