diff options
| author | kchan | 2008-01-17 04:50:30 +0000 |
|---|---|---|
| committer | kchan | 2008-01-17 04:50:30 +0000 |
| commit | 2732010ce2a546e51d3f201cf43e00b0b401a316 (patch) | |
| tree | ddfcf4537bd854b23ee0c094c4514ab6d944f7e5 /bundles/org.eclipse.wst.ws.explorer | |
| parent | 6c1cb99e61e50f6d0e50ba561e480b2e7d85a210 (diff) | |
| download | webtools.webservices-2732010ce2a546e51d3f201cf43e00b0b401a316.tar.gz webtools.webservices-2732010ce2a546e51d3f201cf43e00b0b401a316.tar.xz webtools.webservices-2732010ce2a546e51d3f201cf43e00b0b401a316.zip | |
[214955] Supports more than 1 schema in WSDL file.
Diffstat (limited to 'bundles/org.eclipse.wst.ws.explorer')
| -rw-r--r-- | bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java index 7530a4371..a27ea8080 100644 --- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java +++ b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java @@ -11,6 +11,7 @@ * -------- -------- ----------------------------------------------------------- * 20060717 146707 mahutch@ca.ibm.com - Mark Hutchinson * 20070124 167487 gilberta@ca.ibm.com - Gilbert Andrews + * 20080115 214955 gilberta@ca.ibm.com - Gilbert Andrews *******************************************************************************/ package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel; @@ -213,26 +214,22 @@ public class WSDLElement extends WSDLCommonElement schemaList_.addElement(xsdSchema); gatherSchemaDirective(xsdSchema, definitionURL); } - } + //We need to add the schema to a Resource in a Resource set for proper validation + org.eclipse.emf.common.util.URI uri = org.eclipse.emf.common.util.URI.createURI(definitionURL); + Resource resource = resourceSet.createResource(uri); + //Add the Schema to the resource + resource.getContents().add(xsdSchema); + } } else if (obj instanceof XSDSchemaExtensibilityElementImpl) { XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)obj; - xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement()); - if(!checkSchemaURI(definitionURL)){ + xsdSchema = schemaElement.getSchema(); + if(!schemaList_.contains(xsdSchema)){ schemaList_.addElement(xsdSchema); gatherSchemaDirective(xsdSchema, definitionURL); } } - - if (xsdSchema != null) - { - //We need to add the schema to a Resource in a Resource set for proper validation - org.eclipse.emf.common.util.URI uri = org.eclipse.emf.common.util.URI.createURI(definitionURL); - Resource resource = resourceSet.createResource(uri); - //Add the Schema to the resource - resource.getContents().add(xsdSchema); - } } } } |