Bug 530412 - IExtension.getNamespaceIdentifier() wrongly used where
IExtension.getContributor().getName() is required
Change-Id: I42ede47742d336b681b6eaf39855dc2371c742a9
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
index c8fd3e5..13321a1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
@@ -689,7 +689,7 @@
IExtension[] extensions = extensionPoint.getExtensions();
for (int i=0;i<extensions.length;++i) {
try {
- totalIds.add(extensions[i].getNamespaceIdentifier());
+ totalIds.add(extensions[i].getContributor().getName());
}
catch (InvalidRegistryObjectException e) {
// ignore this extension and move on
diff --git a/org.eclipse.ui.intro.quicklinks/src/org/eclipse/ui/intro/quicklinks/QuicklinksViewer.java b/org.eclipse.ui.intro.quicklinks/src/org/eclipse/ui/intro/quicklinks/QuicklinksViewer.java
index 3588e45..58404b5 100644
--- a/org.eclipse.ui.intro.quicklinks/src/org/eclipse/ui/intro/quicklinks/QuicklinksViewer.java
+++ b/org.eclipse.ui.intro.quicklinks/src/org/eclipse/ui/intro/quicklinks/QuicklinksViewer.java
@@ -163,6 +163,7 @@
*
* @return
*/
+ @Override
public List<Quicklink> get() {
IExtension extensions[] = getExtensions(QL_EXT_PT);
@@ -170,7 +171,7 @@
Bundle productBundle = Platform.getProduct().getDefiningBundle();
if(productBundle != null) {
for (IExtension ext : extensions) {
- if (productBundle.getSymbolicName().equals(ext.getNamespaceIdentifier())) {
+ if (productBundle.getSymbolicName().equals(ext.getContributor().getName())) {
for (IConfigurationElement ce : ext.getConfigurationElements()) {
processDefinition(ce);
}
@@ -179,7 +180,7 @@
}
for (IExtension ext : extensions) {
- if (productBundle == null || !productBundle.getSymbolicName().equals(ext.getNamespaceIdentifier())) {
+ if (productBundle == null || !productBundle.getSymbolicName().equals(ext.getContributor().getName())) {
for (IConfigurationElement ce : ext.getConfigurationElements()) {
processDefinition(ce);
}
@@ -308,6 +309,7 @@
private ICommandImageService images;
private Supplier<List<Quicklink>> model;
+ @Override
public void init(IIntroContentProviderSite site) {
this.site = site;
// IIntroContentProviderSite should provide services.
@@ -337,6 +339,7 @@
return null;
}
+ @Override
public void createContent(String id, PrintWriter out) {
// Content is already embedded within a <div id="...">
getQuicklinks().forEach(ql -> {
@@ -459,6 +462,7 @@
}
}
+ @Override
public void createContent(String id, Composite parent, FormToolkit toolkit) {
Section section = toolkit.createSection(parent, Section.EXPANDED);
TableViewer tableViewer = new TableViewer(toolkit.createTable(section, SWT.FULL_SELECTION));
@@ -558,6 +562,7 @@
forCommand("org.eclipse.ui.edit.text.openLocalFile", Importance.LOW)); //$NON-NLS-1$
}
+ @Override
public void dispose() {
}
}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
index c0ae8c4..20dc4bb 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
@@ -404,7 +404,7 @@
if (previewImage==null) {
String path = element.getAttribute("previewImage"); //$NON-NLS-1$
if (path!=null) {
- String bid = element.getDeclaringExtension().getNamespaceIdentifier();
+ String bid = element.getDeclaringExtension().getContributor().getName();
Bundle bundle = Platform.getBundle(bid);
if (bundle!=null) {
ImageDescriptor desc = ImageUtil.createImageDescriptor(bundle, path);
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
index f3344e1..dd436ec 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
@@ -95,7 +95,7 @@
String fileName = element.getAttribute("content"); //$NON-NLS-1$
if (fileName==null)
return;
- String bundleId = element.getDeclaringExtension().getNamespaceIdentifier();
+ String bundleId = element.getDeclaringExtension().getContributor().getName();
Bundle bundle = Platform.getBundle(bundleId);
if (bundle==null)
return;
