From d32b6ea3ad024730acd4d7d47735e773558f5e30 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Sat, 27 Jan 2018 22:52:50 +0100 Subject: Bug 530412 - IExtension.getNamespaceIdentifier() wrongly used where IExtension.getContributor().getName() is required Change-Id: Ib3cb9d21c221dbbd53721135c70a17e1de6d4cc8 Signed-off-by: Andrey Loskutov --- .../src/org/eclipse/team/internal/ui/TeamUIPlugin.java | 2 +- .../src/org/eclipse/team/internal/ui/registry/RegistryReader.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index 1fbe3bc66..6d70df919 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -346,7 +346,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @return the image */ public static ImageDescriptor getImageDescriptorFromExtension(IExtension extension, String subdirectoryAndFilename) { - URL fullPathString = FileLocator.find(Platform.getBundle(extension.getNamespaceIdentifier()), new Path(subdirectoryAndFilename), null); + URL fullPathString = FileLocator.find(Platform.getBundle(extension.getContributor().getName()), new Path(subdirectoryAndFilename), null); return ImageDescriptor.createFromURL(fullPathString); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java index cb9875057..0539c40fb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/RegistryReader.java @@ -98,7 +98,7 @@ public abstract class RegistryReader { protected void logError(IConfigurationElement element, String text) { IExtension extension = element.getDeclaringExtension(); StringBuilder buf = new StringBuilder(); - buf.append("Plugin " + extension.getNamespaceIdentifier() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-2$//$NON-NLS-1$ + buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-2$//$NON-NLS-1$ buf.append("\n" + text); //$NON-NLS-1$ TeamUIPlugin.log(IStatus.ERROR, buf.toString(), null); } @@ -134,8 +134,8 @@ public abstract class RegistryReader { Sorter sorter = new Sorter() { @Override public boolean compare(Object extension1, Object extension2) { - String s1 = ((IExtension) extension1).getNamespaceIdentifier(); - String s2 = ((IExtension) extension2).getNamespaceIdentifier(); + String s1 = ((IExtension) extension1).getContributor().getName(); + String s2 = ((IExtension) extension2).getContributor().getName(); //Return true if elementTwo is 'greater than' elementOne return s2.compareToIgnoreCase(s1) > 0; } -- cgit v1.2.3