[jbossws-commits] JBossWS SVN: r14507 - spi/trunk/src/main/java/org/jboss/wsf/spi/util.
Author: alessio.soldano(a)jboss.com
Date: 2011-06-10 06:44:08 -0400 (Fri, 10 Jun 2011)
New Revision: 14507
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java
Log:
Enriching StAXUtils
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java 2011-06-10 04:39:26 UTC
(rev 14506)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java 2011-06-10 10:44:08 UTC
(rev 14507)
@@ -135,11 +135,7 @@
public static QName elementAsQName(XMLStreamReader reader) throws XMLStreamException
{
String text = elementAsString(reader);
- String localPart = text.substring(text.indexOf(':') + 1, text.length());
- int i = text.indexOf(':');
- String prefix = i < 0 ? null : text.substring(0, i);
- String namespaceURI = prefix == null ? reader.getNamespaceURI() :
reader.getNamespaceURI(prefix);
- return prefix == null ? new QName(namespaceURI, localPart) : new
QName(namespaceURI, localPart, prefix);
+ return stringToQName(reader, text, reader.getNamespaceURI());
}
public static boolean elementAsBoolean(XMLStreamReader reader) throws
XMLStreamException
@@ -153,4 +149,42 @@
String text = elementAsString(reader);
return Integer.parseInt(text);
}
+
+ public static QName attributeAsQName(XMLStreamReader reader, String namespace, String
localName) throws XMLStreamException
+ {
+ String text = reader.getAttributeValue(namespace, localName);
+ return stringToQName(reader, text, reader.getNamespaceURI());
+ }
+
+ public static QName attributeAsQName(XMLStreamReader reader, String namespace, String
localName, String targetNS) throws XMLStreamException
+ {
+ String text = reader.getAttributeValue(namespace, localName);
+ return stringToQName(reader, text, targetNS);
+ }
+
+ private static QName stringToQName(XMLStreamReader reader, String text, String
defaultNS)
+ {
+ String localPart = text.substring(text.indexOf(':') + 1, text.length());
+ int i = text.indexOf(':');
+ String prefix = i < 0 ? null : text.substring(0, i);
+ String namespaceURI = prefix == null ? defaultNS : reader.getNamespaceURI(prefix);
+ return prefix == null ? new QName(namespaceURI, localPart) : new
QName(namespaceURI, localPart, prefix);
+ }
+
+ public static int nextElement(XMLStreamReader reader)
+ {
+ try
+ {
+ int x = reader.next();
+ while (x != XMLStreamReader.START_ELEMENT && x !=
XMLStreamReader.END_ELEMENT && reader.hasNext())
+ {
+ x = reader.next();
+ }
+ return x;
+ }
+ catch (XMLStreamException e)
+ {
+ throw new RuntimeException("Couldn't parse stream.", e);
+ }
+ }
}