commit f765b927f87c38fbef5f914b6f9353f525289494
author Brian Vosburgh <brian.vosburgh@oracle.com> Wed Nov 28 08:35:46 2012 -0500
committer Paul Webster <pwebster@ca.ibm.com> Wed Nov 28 08:37:08 2012 -0500
tree 59d39fc4a13759da7c0c85e138d8ecd49dff47cf
parent 4ab1382763e62540ac34155840a234686f681671

Bug 395126 - AbstractUIPlugin.imageDescriptorFromPlugin(...) does not
correctly handle URIs of form "platform:/plugin/<plug-in ID>/$nl$"

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java

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 d705ead..08a881b 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.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 @@
             } catch (MalformedURLException e) {
                 return null;
             }
+			URL platformURL = FileLocator.find(fullPathString);
+			if (platformURL != null) {
+				fullPathString = platformURL;
+			}
         }
 
         return ImageDescriptor.createFromURL(fullPathString);