diff options
Diffstat (limited to 'org.eclipse.ui.console')
3 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java index 9eae5de20..530974986 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java @@ -18,6 +18,7 @@ import org.eclipse.core.expressions.Expression; import org.eclipse.core.expressions.ExpressionConverter; import org.eclipse.core.expressions.ExpressionTagNames; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; @@ -53,7 +54,7 @@ public class ConsoleFactoryExtension implements IPluginContribution { * @see org.eclipse.ui.IPluginContribution#getPluginId() */ public String getPluginId() { - return fConfig.getNamespace(); + return fConfig.getContributor().getName(); } public boolean isEnabled() { @@ -98,7 +99,7 @@ public class ConsoleFactoryExtension implements IPluginContribution { String path = fConfig.getAttributeAsIs("icon"); //$NON-NLS-1$ if (path != null) { Bundle bundle = Platform.getBundle(getPluginId()); - URL url = Platform.find(bundle, new Path(path)); + URL url = FileLocator.find(bundle, new Path(path), null); if (url != null) { fImageDescriptor = ImageDescriptor.createFromURL(url); } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java index e9fff1230..b5920cc0a 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java @@ -41,7 +41,7 @@ public class ConsolePageParticipantExtension implements IPluginContribution { * @see org.eclipse.ui.IPluginContribution#getPluginId() */ public String getPluginId() { - return fConfig.getNamespace(); + return fConfig.getContributor().getName(); } public boolean isEnabledFor(IConsole console) throws CoreException { diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java index 85b029cca..2cf220039 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java @@ -126,7 +126,7 @@ public class PatternMatchListenerExtension implements IPluginContribution { * @see org.eclipse.ui.IPluginContribution#getPluginId() */ public String getPluginId() { - return fConfig.getNamespace(); + return fConfig.getContributor().getName(); } public String getQuickPattern() { |