From 3859418a6dca915a7b16dfacb7f1bcf3a4fbe692 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 14 Oct 2008 23:55:22 +0000 Subject: Remove direct access to private packages git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704742 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca') diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java index 16e9cf43f3..82a7aa1200 100644 --- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java +++ b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java @@ -19,8 +19,6 @@ package org.apache.tuscany.sca.interfacedef.wsdl.impl; -import static org.apache.tuscany.sca.xsd.impl.XSDefinitionImpl.getXmlSchemaObject; - import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -38,7 +36,6 @@ import javax.xml.namespace.QName; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject; import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaCollection; import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaType; @@ -207,8 +204,7 @@ public class WSDLDefinitionImpl implements WSDLDefinition { if (schemaCollection == null && xsd.getSchemaCollection() != null) { schemaCollection = xsd.getSchemaCollection(); } - XmlSchema schema = xsd.getSchema(); - XmlSchemaElement element = getXmlSchemaObject(schema, name, XmlSchemaElement.class); + XmlSchemaElement element = xsd.getXmlSchemaElement(name); if (element != null) { return element; } @@ -228,8 +224,7 @@ public class WSDLDefinitionImpl implements WSDLDefinition { if (xsd.getSchemaCollection() != null) { schemaCollection = xsd.getSchemaCollection(); } - XmlSchema schema = xsd.getSchema(); - XmlSchemaType type = getXmlSchemaObject(schema, name, XmlSchemaType.class); + XmlSchemaType type = xsd.getXmlSchemaType(name); if (type != null) { return type; } -- cgit v1.2.3