[440912] Can not change names in XML Schema Editor when schema does not have a target namespace
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF index b4e1520..16066a8 100644 --- a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xml.core; singleton:=true -Bundle-Version: 1.1.702.qualifier +Bundle-Version: 1.1.703.qualifier Bundle-Activator: org.eclipse.wst.xml.core.internal.XMLCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xml.core/src-search/org/eclipse/wst/xml/core/internal/search/XMLSearchPattern.java b/bundles/org.eclipse.wst.xml.core/src-search/org/eclipse/wst/xml/core/internal/search/XMLSearchPattern.java index 7bc2a6a..9fb75f0 100644 --- a/bundles/org.eclipse.wst.xml.core/src-search/org/eclipse/wst/xml/core/internal/search/XMLSearchPattern.java +++ b/bundles/org.eclipse.wst.xml.core/src-search/org/eclipse/wst/xml/core/internal/search/XMLSearchPattern.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -127,7 +127,8 @@ return true; } else { - if ((namespace.equals(searchNamespace) || "*".equals(searchNamespace)) && name.equals(searchName)) + if ((namespace.equals(searchNamespace) || "*".equals(searchNamespace) || ("".equals(namespace) && searchNamespace==null) + )&& name.equals(searchName)) return true; } }
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/buildnotes_org.eclipse.wst.xml_core.feature.patch.html b/features/org.eclipse.wst.xml_core.feature.patch/buildnotes_org.eclipse.wst.xml_core.feature.patch.html index 72da63b..1b4417e 100644 --- a/features/org.eclipse.wst.xml_core.feature.patch/buildnotes_org.eclipse.wst.xml_core.feature.patch.html +++ b/features/org.eclipse.wst.xml_core.feature.patch/buildnotes_org.eclipse.wst.xml_core.feature.patch.html
@@ -8,6 +8,7 @@ <h1>WTP 3.4.2 Patches</h1> <p>Bug <a href='https://bugs.eclipse.org/400379'>400379</a>. Add ws-securitypolicy.xsd and ws-securitypolicy-1.2.xsd to the standard schemas plugin</p> +<p>Bug <a href='https://bugs.eclipse.org/440912'>440912</a>. Can not change names in XML Schema Editor when schema does not have a target namespace</p> </body> </head>
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/feature.properties b/features/org.eclipse.wst.xml_core.feature.patch/feature.properties index 31164e2..2e7c804 100644 --- a/features/org.eclipse.wst.xml_core.feature.patch/feature.properties +++ b/features/org.eclipse.wst.xml_core.feature.patch/feature.properties
@@ -28,6 +28,7 @@ The bugs and fixes are described in the following bugzilla entries:\n\ \n\ Bug https://bugs.eclipse.org/400379 Add ws-securitypolicy.xsd and ws-securitypolicy-1.2.xsd to the standard schemas plugin \n\ +Bug https://bugs.eclipse.org/440912 Can not change names in XML Schema Editor when schema does not have a target namespace \n\ \n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\