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 11:51:14 UTC
svn commit: r1361506 - in /webservices/axiom/branches/AXIOM-201: ./
modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Author: veithen
Date: Sat Jul 14 09:51:13 2012
New Revision: 1361506
URL: http://svn.apache.org/viewvc?rev=1361506&view=rev
Log:
Merged latest changes from trunk.
Modified:
webservices/axiom/branches/AXIOM-201/ (props changed)
webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Propchange: webservices/axiom/branches/AXIOM-201/
------------------------------------------------------------------------------
Merged /webservices/commons/trunk/modules/axiom:r1361483-1361503
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1361506&r1=1361505&r2=1361506&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Sat Jul 14 09:51:13 2012
@@ -225,7 +225,7 @@ class SwitchingWrapper extends AbstractX
return null;
} else {
String prefix = ns.getPrefix();
- return prefix == null || prefix.length() == 0 ? null : prefix;
+ return prefix.length() == 0 ? null : prefix;
}
} else {
throw new IllegalStateException();
@@ -242,8 +242,7 @@ class SwitchingWrapper extends AbstractX
return parser.getNamespaceURI();
} else {
if ((currentEvent == START_ELEMENT)
- || (currentEvent == END_ELEMENT)
- || (currentEvent == NAMESPACE)) {
+ || (currentEvent == END_ELEMENT)) {
OMNamespace ns = ((OMElement) lastNode).getNamespace();
if (ns == null) {
return null;
@@ -298,7 +297,7 @@ class SwitchingWrapper extends AbstractX
} else {
if ((currentEvent == START_ELEMENT)
|| (currentEvent == END_ELEMENT)) {
- return getQName((OMElement) lastNode);
+ return ((OMElement)lastNode).getQName();
} else {
throw new IllegalStateException();
}
@@ -519,8 +518,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();
}
@@ -550,11 +548,10 @@ 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;
+ returnString = prefix.length() == 0 ? null : prefix;
}
}
return returnString;
@@ -568,8 +565,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 {
@@ -587,7 +583,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;
@@ -608,7 +604,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 {
@@ -629,7 +625,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 {
@@ -650,7 +646,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) {
@@ -677,7 +673,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 {
@@ -698,7 +694,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) {
@@ -725,7 +721,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 {
@@ -745,7 +741,7 @@ class SwitchingWrapper extends AbstractX
if (parser != null) {
returnCount = parser.getAttributeCount();
} else {
- if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+ if (isStartElement()) {
loadAttributes();
returnCount = attributeCount;
} else {
@@ -771,7 +767,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) {
@@ -872,8 +868,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 =
@@ -1421,30 +1416,6 @@ class SwitchingWrapper extends AbstractX
* ####################################################################
*/
- /**
- * Helper method getQName.
- *
- * @param element
- * @return Returns QName.
- */
- private QName getQName(OMElement element) {
- QName returnName;
- OMNamespace ns = element.getNamespace();
- String localPart = element.getLocalName();
- if (ns != null) {
- String prefix = ns.getPrefix();
- String uri = ns.getNamespaceURI();
- if ((prefix == null) || prefix.equals("")) {
- returnName = new QName(uri, localPart);
- } else {
- returnName = new QName(uri, localPart, prefix);
- }
- } else {
- returnName = new QName(localPart);
- }
- return returnName;
- }
-
private void setParser(XMLStreamReader parser) {
this.parser = parser;
dataHandlerReader =