diff options
author | Lakshminarayana Nekkanti | 2019-07-10 13:42:34 +0000 |
---|---|---|
committer | Sarika Sinha | 2019-07-25 05:44:45 +0000 |
commit | df5d045bdf1f0057d5b80909e0bc1d0c51b28ccd (patch) | |
tree | 9df9f0234c6e4c706e1502fea5a2304fae0c2a5e | |
parent | 0bc30667ae33f52913c51adcd66a178a26bb52d6 (diff) | |
download | eclipse.platform.debug-df5d045bdf1f0057d5b80909e0bc1d0c51b28ccd.tar.gz eclipse.platform.debug-df5d045bdf1f0057d5b80909e0bc1d0c51b28ccd.tar.xz eclipse.platform.debug-df5d045bdf1f0057d5b80909e0bc1d0c51b28ccd.zip |
Bug 549140 - org.eclipse.ui.console.consoleFactories extension pointY20190808-0900Y20190805-0900Y20190801-0900Y20190730-0135Y20190730-0055Y20190729-0900Y20190725-0900I20190811-1800I20190810-1800I20190809-1800I20190808-1800I20190807-1800I20190806-1800I20190805-1800I20190804-1800I20190803-1800I20190802-1800I20190801-1800I20190801-0600I20190731-1800I20190730-1800I20190729-1800I20190728-1800I20190727-1800I20190726-1800I20190725-1800
should handle platform icons
Change-Id: I3c51bceb0ba1ecc045b978b5f49f4cccd8cc96b5
Signed-off-by: Lakshminarayana Nekkanti <narayana.nekkanti@gmail.com>
-rw-r--r-- | org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java | 14 |
1 files changed, 3 insertions, 11 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 3ad0dc451..d771b217d 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 @@ -13,23 +13,18 @@ *******************************************************************************/ package org.eclipse.ui.internal.console; -import java.net.URL; - import org.eclipse.core.expressions.EvaluationContext; import org.eclipse.core.expressions.EvaluationResult; 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; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.ui.IPluginContribution; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsoleFactory; -import org.osgi.framework.Bundle; /** * @since 3.1 @@ -108,11 +103,8 @@ public class ConsoleFactoryExtension implements IPluginContribution { if (fImageDescriptor == null) { String path = fConfig.getAttribute("icon"); //$NON-NLS-1$ if (path != null) { - Bundle bundle = Platform.getBundle(getPluginId()); - URL url = FileLocator.find(bundle, new Path(path), null); - if (url != null) { - fImageDescriptor = ImageDescriptor.createFromURL(url); - } + fImageDescriptor = ResourceLocator.imageDescriptorFromBundle(fConfig.getNamespaceIdentifier(), path) + .orElse(null); } } return fImageDescriptor; |