diff options
| author | Brian Vosburgh | 2012-11-28 13:35:46 +0000 |
|---|---|---|
| committer | Paul Webster | 2012-11-28 13:37:08 +0000 |
| commit | f765b927f87c38fbef5f914b6f9353f525289494 (patch) | |
| tree | 59d39fc4a13759da7c0c85e138d8ecd49dff47cf | |
| parent | 4ab1382763e62540ac34155840a234686f681671 (diff) | |
| download | eclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.tar.gz eclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.tar.xz eclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.zip | |
Bug 395126 - AbstractUIPlugin.imageDescriptorFromPlugin(...) does notv20121128-133708R3_8_2M20130206-1000M20130204-1000M20130131-0800M20130125-1000M20130124-1500M20130123-1500M20130123-1000M20130116-1030M20130116-1000M20130109-1000M20130102-1000M20121226-1000M20121219-1000M20121212-1600M20121212-1000M20121205-1000M20121128-1000
correctly handle URIs of form "platform:/plugin/<plug-in ID>/$nl$"
| -rw-r--r-- | bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java index d705ead82c8..08a881b9ada 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java @@ -18,6 +18,7 @@ import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.Platform; @@ -686,6 +687,10 @@ public abstract class AbstractUIPlugin extends Plugin { } catch (MalformedURLException e) { return null; } + URL platformURL = FileLocator.find(fullPathString); + if (platformURL != null) { + fullPathString = platformURL; + } } return ImageDescriptor.createFromURL(fullPathString); |