From 85ea5b2905c9dfcb01b490b0d54dbd70bb475ee2 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 16 Oct 2009 16:04:27 +0000 Subject: TUSCANY-3303 slight change so that import delete looks through all the imports before actually trying to delete any that need to be removed git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@825973 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'branches/sca-java-1.x/modules/binding-ws-wsdlgen/src/main/java/org') diff --git a/branches/sca-java-1.x/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-java-1.x/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 34b7ed7bef..bfa882ebf7 100644 --- a/branches/sca-java-1.x/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-java-1.x/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -687,6 +687,7 @@ public class Interface2WSDLGenerator { // look for any imports of the no namespace schema Document refSchema = xsDef.getDocument(); NodeList imports = refSchema.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","import"); + List importsToDelete = new ArrayList(); for (int j = 0; j < imports.getLength(); j++){ Element _import = (Element)imports.item(j); @@ -695,13 +696,18 @@ public class Interface2WSDLGenerator { if (_import.getAttributes().getLength() == 0){ if (xsDef.getNamespace().equals(defaultNamespace)){ // remove the import - _import.getParentNode().removeChild(_import); + //_import.getParentNode().removeChild(_import); + importsToDelete.add(_import); } else { // update the import to refer to the default namespace _import.setAttribute("namespace", defaultNamespace); } } } + + for (Node _import : importsToDelete){ + _import.getParentNode().removeChild(_import); + } // look for any type attributes that refer to the // node being merged -- cgit v1.2.3