Attachment 86796 Details for Bug 198390 – Updated model patch

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

[patch] Updated model patch

198390ModelPatch.txt (text/plain), 1.79 KB, created by Valentin Baciu

on 2008-01-14 00:07:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Valentin Baciu

Created: 2008-01-14 00:07:45 EST

Size: 1.79 KB

patch

obsolete

>Index: src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/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	14 Jan 2008 05:05:37 -0000
>@@ -1586,13 +1586,36 @@
>   protected String getNamespace(Element element)
>   {
>     String name = element.getTagName();
>-    int index = name.indexOf(":");
>-    if (index == -1)
>-      return null;
>-    else if (getEnclosingDefinition() != null)
>-      return getEnclosingDefinition().getNamespace(name.substring(0, index));
>+    int index = name.indexOf(":"); //$NON-NLS-1$
>+    String nsPrefix  = null;
>+    if (index != -1)
>+    {
>+      nsPrefix = name.substring(0, index);
>+    }
>     else
>-      return null;
>+    {
>+      nsPrefix = "xmlns"; //$NON-NLS-1$
>+    }
>+
>+    String namespaceURI = null;
>+
>+    // First try to locate the namespace URI in the definition's prefix to namespace map.
>+    // This will provide backward compatibility for existing clients.
>+    
>+    Definition enclosingDefinition = getEnclosingDefinition();
>+    if (enclosingDefinition != null)
>+    {
>+      namespaceURI = enclosingDefinition.getNamespace(nsPrefix);
>+    }
>+
>+    // We did not find it at the top level, try to find a locally defined namespace prefix.
>+
>+    if (namespaceURI == null)
>+    {
>+      namespaceURI = getNamespaceURIFromPrefix(element, nsPrefix);
>+    }
>+
>+    return namespaceURI;
>   }
> 
>   protected String getLocalName(Element element)

Actions: View | Diff

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