Attachment 75557 Details for Bug 198390 – Tentative model patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Tentative model patch

198390Patch.txt (text/plain), 1.57 KB, created by Valentin Baciu

on 2007-08-07 13:08:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Valentin Baciu

Created: 2007-08-07 13:08:51 EDT

Size: 1.57 KB

patch

obsolete

>Index: src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java,v
>retrieving revision 1.10
>diff -u -r1.10 WSDLElementImpl.java
>--- src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java	20 Jul 2007 16:14:14 -0000	1.10
>+++ src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java	7 Aug 2007 17:09:48 -0000
>@@ -1589,10 +1589,29 @@
>     int index = name.indexOf(":");
>     if (index == -1)
>       return null;
>-    else if (getEnclosingDefinition() != null)
>-      return getEnclosingDefinition().getNamespace(name.substring(0, index));
>-    else
>-      return null;
>+
>+    Definition enclosingDefinition = getEnclosingDefinition();
>+    
>+    String namespaceURI = null;
>+
>+    if (enclosingDefinition != null)
>+    {
>+      String prefix = name.substring(0, index);
>+      
>+      // First try to locate the namespace URI in the definition's prefix to namespace map.
>+      // This will provide backward compatibility for existing clients.
>+      
>+      namespaceURI = enclosingDefinition.getNamespace(prefix);
>+      
>+      if (namespaceURI == null)
>+      {
>+        // We did not find it at the tope level, try to find a locally defined namespace prefix.
>+
>+        namespaceURI = getNamespaceURIFromPrefix(element, prefix);
>+      }
>+    }
>+
>+    return namespaceURI;
>   }
> 
>   protected String getLocalName(Element element)

Actions: View | Diff

Attachments on bug 198390: 75547 | 75557 | 86796 | 86797