diff options
author | Alexander Fedorov | 2019-04-13 16:09:36 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-04-18 07:16:22 +0000 |
commit | 47b1fa3fbb58588f218c6138e4bcd9ecbcc5d036 (patch) | |
tree | 73daec54233e9a607f3a21b0a5a0c38d368dc375 | |
parent | 2a44308b041da309149d120f95b8cf55879aa8e1 (diff) | |
download | eclipse.platform.team-I20190502-1800.tar.gz eclipse.platform.team-I20190502-1800.tar.xz eclipse.platform.team-I20190502-1800.zip |
Bug 546399 - [Platform] Team UI: support platform:/plugin URI for imagesI20190519-1800I20190518-1800I20190517-1800I20190516-1800I20190516-1405I20190516-1335I20190516-1250I20190516-1200I20190516-1055I20190515-1800I20190515-0205I20190513-1800I20190512-1800I20190511-1800I20190510-1800I20190509-1800I20190508-1800I20190508-0450I20190508-0150I20190507-1800I20190507-0155I20190506-1800I20190505-1800I20190504-1800I20190503-1800I20190502-1800I20190501-1800I20190501-0525I20190430-1800I20190429-1800I20190429-0240I20190428-1800I20190427-1800I20190426-1800I20190425-1800I20190425-0030I20190424-1800I20190423-1800I20190422-1800I20190421-1800I20190420-1800I20190419-1800I20190418-1800
Change-Id: I7bc428b6b55c62d0a096ebd5f968b0dda85ebac5
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index c5f61691e..86990a54b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -14,6 +14,7 @@ package org.eclipse.team.internal.ui; import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; @@ -335,8 +336,20 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @return the image */ public static ImageDescriptor getImageDescriptorFromExtension(IExtension extension, String subdirectoryAndFilename) { - URL fullPathString = FileLocator.find(Platform.getBundle(extension.getContributor().getName()), new Path(subdirectoryAndFilename), null); - return ImageDescriptor.createFromURL(fullPathString); + URL iconURL = FileLocator.find(Platform.getBundle(extension.getContributor().getName()), new Path(subdirectoryAndFilename), null); + if (iconURL != null) { + return ImageDescriptor.createFromURL(iconURL); + } + // try to search as a URL in case it is absolute path + try { + iconURL = FileLocator.find(new URL(subdirectoryAndFilename)); + if (iconURL != null) { + return ImageDescriptor.createFromURL(iconURL); + } + } catch (MalformedURLException e) { + //ignore + } + return null; } public static final String FILE_DIRTY_OVR = "ovr/dirty_ov.png"; //$NON-NLS-1$ |