[jbosstools-commits] JBoss Tools SVN: r31217 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
Author: bfitzpat
Date: 2011-05-11 13:40:26 -0400 (Wed, 11 May 2011)
New Revision: 31217
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
Log:
OPEN - issue JBIDE-8927: WS Tester issues with JUnit tests after fixing JBDS-1602
https://issues.jboss.org/browse/JBIDE-8927
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
---
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11
17:39:47 UTC (rev 31216)
+++
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11
17:40:26 UTC (rev 31217)
@@ -671,7 +671,9 @@
buf.append(createXMLForJDOMElement2( jdomSchemaElement2, child ));
}
}
- } else {
+ } else if (part.getTypeName() != null &&
isTypeBaseXSDOrSimple(part.getTypeName().getNamespaceURI(),
part.getTypeName().getLocalPart())) {
+ buf.append('<' + part.getName() + ">?</" + part.getName() +
'>'); //$NON-NLS-1$
+ } else {
buf.append(createXMLForJDOMElement2( jdomSchemaElement, jdomElement ));
}
@@ -1075,6 +1077,14 @@
if (elemType != null && isTypeBaseXSDOrSimple(tns, elemType)) {
isSimpleType = true;
}
+
+ boolean hasEnums = false;
+ if (element.getName().equals("simpleType")) { //$NON-NLS-1$
+ String enums = getEnumerations(element);
+ if (enums != null && enums.trim().length() > 0) {
+ hasEnums = true;
+ }
+ }
boolean includeTNSInRoot = false;
if (rootIsQualified_ && !isQualified) {
@@ -1083,6 +1093,9 @@
tnsprefix = "tns"; //$NON-NLS-1$
} else if (isQualified) {
rootIsQualified_ = false;
+ if (tnsprefix == null) {
+ tnsprefix = "tns"; //$NON-NLS-1$
+ }
}
boolean isSequence = element.getName().equals("sequence"); //$NON-NLS-1$
@@ -1116,7 +1129,7 @@
}
- if (hasKids || isSimpleType)
+ if (hasKids || isSimpleType || hasEnums )
buf.append(">"); //$NON-NLS-1$
else
buf.append("/>");//$NON-NLS-1$
@@ -1144,9 +1157,9 @@
}
}
- if (!isSequence && ( hasKids || isSimpleType )) {
+ if (!isSequence && ( hasKids || isSimpleType || hasEnums )) {
// add ? for value
- if (!hasKids || isSimpleType)
+ if (!hasKids || isSimpleType || hasEnums )
buf.append('?');
// close tag
@@ -1162,6 +1175,22 @@
return buf.toString();
}
+ private static String getEnumerations ( org.jdom.Element element ) {
+ StringBuffer buf = new StringBuffer();
+ List<?> kids = element.getChildren();
+ for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) {
+ Element kid = (Element) kidIter.next();
+ if (kid.getChildren() != null && kid.getChildren().size() > 0) {
+ buf.append(getEnumerations(kid));
+ }
+ if (kid.getName().equals("enumeration")) { //$NON-NLS-1$
+ String value = kid.getAttributeValue("value"); //$NON-NLS-1$
+ buf.append(value + '|');
+ }
+ }
+ return buf.toString();
+ }
+
private static HashMap<String, String> getDefinitionNamespaces ( Definition
wsdlDefinition) {
HashMap<String, String> namespaceMap = new HashMap<String, String>();
namespaceMap.put(SOAP_NS_URI, SOAP_PREFIX);