Author: sagara
Date: Tue Sep 8 18:54:17 2009
New Revision: 812631
URL: http://svn.apache.org/viewvc?rev=812631&view=rev
Log:
changes from branch-65
Modified:
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/util/dom/DOMUtils.java
Modified:
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/util/dom/DOMUtils.java
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/util/dom/DOMUtils.java?rev=812631&r1=812630&r2=812631&view=diff
==============================================================================
---
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/util/dom/DOMUtils.java
(original)
+++
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/util/dom/DOMUtils.java
Tue Sep 8 18:54:17 2009
@@ -16,11 +16,17 @@
*/
package org.apache.woden.internal.util.dom;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.List;
import java.util.ListIterator;
import java.util.Vector;
+import javax.xml.namespace.QName;
+
import org.apache.woden.WSDLException;
+import org.apache.woden.wsdl20.xml.WSDLElement;
import org.w3c.dom.Attr;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Element;
@@ -278,7 +284,6 @@
throw wsdlExc;
}
- /*
public static void printAttribute(String name,
String value,
PrintWriter pw)
@@ -288,7 +293,6 @@
pw.print(' ' + name + "=\"" + cleanString(value) + '\"');
}
}
- */
/**
* Prints attributes with qualified names.
@@ -327,10 +331,11 @@
pw);
}
}
+ */
public static void printQualifiedAttribute(String name,
QName value,
- Definition def,
+ WSDLElement elem,
PrintWriter pw)
throws WSDLException
{
@@ -339,28 +344,46 @@
printAttribute(name,
getQualifiedValue(value.getNamespaceURI(),
value.getLocalPart(),
- def),
+ elem),
pw);
}
}
- public static String getQualifiedValue(String namespaceURI,
+ public static String getQualifiedValue(URI namespaceURI,
String localPart,
- Definition def)
+ WSDLElement elem)
throws WSDLException
{
String prefix = null;
- if (namespaceURI != null && !namespaceURI.equals(""))
+ if (namespaceURI != null && !namespaceURI.toString().equals(""))
{
- prefix = getPrefix(namespaceURI, def);
+ prefix = elem.getNamespacePrefix(namespaceURI);
}
+
+ String qv = ((prefix != null && !prefix.equals("")) ? prefix + ":" : "") +
localPart;
+
+ return qv;
+ }
- return ((prefix != null && !prefix.equals(""))
- ? prefix + ":"
- : "") + localPart;
+ public static String getQualifiedValue(String namespaceURI,
+ String localPart,
+ WSDLElement elem)
+ throws WSDLException
+ {
+ URI nsUri = null;
+ if(namespaceURI != null) {
+ try {
+ nsUri = new URI(namespaceURI);
+ } catch (URISyntaxException e) {
+ // TODO handle this correctly
+ throw new RuntimeException(e);
+ }
+ }
+ return getQualifiedValue(nsUri,localPart,elem);
}
+ /*
public static String getPrefix(String namespaceURI,
Definition def)
throws WSDLException
@@ -378,6 +401,7 @@
return prefix;
}
+ */
public static String cleanString(String orig)
{
@@ -446,7 +470,6 @@
return strBuf.toString();
}
- */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
