Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2018-01-27 21:49:50 +0000
committerAndrey Loskutov2018-01-27 21:49:50 +0000
commitb06731f79c30b48d85ca3021f21f61d7a4afd02a (patch)
treef00fc15c424b7a0ebff1608c93632e164266b699 /org.eclipse.ui.intro.quicklinks/src
parent1cf3f7943aa686086bffcd276b3bf25616ff8cdf (diff)
downloadeclipse.platform.ua-b06731f79c30b48d85ca3021f21f61d7a4afd02a.tar.gz
eclipse.platform.ua-b06731f79c30b48d85ca3021f21f61d7a4afd02a.tar.xz
eclipse.platform.ua-b06731f79c30b48d85ca3021f21f61d7a4afd02a.zip
Bug 530412 - IExtension.getNamespaceIdentifier() wrongly used whereI20180130-2000I20180129-2000I20180129-0605I20180129-0540I20180128-2000
IExtension.getContributor().getName() is required Change-Id: I42ede47742d336b681b6eaf39855dc2371c742a9 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.ui.intro.quicklinks/src')
-rw-r--r--org.eclipse.ui.intro.quicklinks/src/org/eclipse/ui/intro/quicklinks/QuicklinksViewer.java9
1 files changed, 7 insertions, 2 deletions
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 3588e455c..58404b514 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 @@ public class QuicklinksViewer implements IIntroContentProvider {
*
* @return
*/
+ @Override
public List<Quicklink> get() {
IExtension extensions[] = getExtensions(QL_EXT_PT);
@@ -170,7 +171,7 @@ public class QuicklinksViewer implements IIntroContentProvider {
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 @@ public class QuicklinksViewer implements IIntroContentProvider {
}
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 @@ public class QuicklinksViewer implements IIntroContentProvider {
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 @@ public class QuicklinksViewer implements IIntroContentProvider {
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 @@ public class QuicklinksViewer implements IIntroContentProvider {
}
}
+ @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 @@ public class QuicklinksViewer implements IIntroContentProvider {
forCommand("org.eclipse.ui.edit.text.openLocalFile", Importance.LOW)); //$NON-NLS-1$
}
+ @Override
public void dispose() {
}
}

Back to the top