Author: jkaputin
Date: Tue Oct 10 08:50:34 2006
New Revision: 454791
URL: http://svn.apache.org/viewvc?view=rev&rev=454791
Log:
Add method getQName() to XMLElement and resequenced
the methods in DOMXMLElement to match XMLElement
and BaseXMLElement.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java?view=diff&rev=454791&r1=454790&r2=454791
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java
(original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java Tue
Oct 10 08:50:34 2006
@@ -85,9 +85,15 @@
public String getLocalName();
/**
- * Return the qualified name from the declared namespace
+ * Return the qualified name of this element.
+ *
+ * @return QName this element's qualified name.
+ */
+ public QName getQName();
+ /**
+ * Return the qualified name from the specified prefixed value.
*
- * @param prefixedValue
+ * @param prefixedValue of the form [namespace prefix]:[local name]
* @return the QName corresponding to the prefix
* @throws WSDLException
*/
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java?view=diff&rev=454791&r1=454790&r2=454791
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java
Tue Oct 10 08:50:34 2006
@@ -101,6 +101,21 @@
/*
* (non-Javadoc)
+ * @see org.apache.woden.XMLElement#getQName()
+ */
+ public final QName getQName() {
+
+ if(fSource != null) {
+ return doGetQName();
+ } else {
+ return null;
+ }
+ }
+
+ protected abstract QName doGetQName();
+
+ /*
+ * (non-Javadoc)
* @see org.apache.woden.XMLElement#getQName(java.lang.String)
*/
public final QName getQName(String prefixedValue) throws WSDLException {
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java?view=diff&rev=454791&r1=454790&r2=454791
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java
Tue Oct 10 08:50:34 2006
@@ -87,6 +87,25 @@
return getAttribute(el, attrName);
}
+ protected URI doGetNamespaceURI() {
+
+ Element el = (Element)fSource;
+ String nsStr = el.getNamespaceURI();
+ return URI.create(nsStr);
+ }
+
+ protected String doGetLocalName() {
+
+ Element el = (Element)fSource;
+ return el.getLocalName();
+ }
+
+ protected QName doGetQName() {
+
+ Element el = (Element)fSource;
+ return new QName(el.getNamespaceURI(), el.getLocalName());
+ }
+
protected QName doGetQName(String prefixedValue) throws WSDLException {
Element el = (Element)fSource;
@@ -118,19 +137,6 @@
throw wsdlExc;
}
- }
-
- protected URI doGetNamespaceURI() {
-
- Element el = (Element)fSource;
- String nsStr = el.getNamespaceURI();
- return URI.create(nsStr);
- }
-
- protected String doGetLocalName() {
-
- Element el = (Element)fSource;
- return el.getLocalName();
}
protected XMLElement doGetFirstChildElement() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
