summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorBrian Vosburgh2012-11-28 08:35:46 (EST)
committer Paul Webster2012-11-28 08:37:08 (EST)
commitf765b927f87c38fbef5f914b6f9353f525289494 (patch)
tree59d39fc4a13759da7c0c85e138d8ecd49dff47cf
parent4ab1382763e62540ac34155840a234686f681671 (diff)
downloadeclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.zip
eclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.tar.gz
eclipse.platform.ui-f765b927f87c38fbef5f914b6f9353f525289494.tar.bz2
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 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.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);