aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2012-11-28 08:35:46 (EST)
committerPaul Webster2012-11-28 08:35:46 (EST)
commit08e95c418183c59911b16666475ab1400a1f6b01 (patch)
tree2447c241f36d8887b1c5506035481a3d4e41080a
parent1dbde3f7781553b30fa3c039b585103e1d6ad64a (diff)
downloadeclipse.platform.ui-08e95c418183c59911b16666475ab1400a1f6b01.zip
eclipse.platform.ui-08e95c418183c59911b16666475ab1400a1f6b01.tar.gz
eclipse.platform.ui-08e95c418183c59911b16666475ab1400a1f6b01.tar.bz2
Bug 395126 - AbstractUIPlugin.imageDescriptorFromPlugin(...) does notv20121128-133546M20121128-1200
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.java5
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 7f8566e..7a00553 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;
@@ -685,6 +686,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);