diff options
author | Matthias Becker | 2016-10-14 13:56:16 +0000 |
---|---|---|
committer | Matthias Becker | 2016-10-14 14:50:09 +0000 |
commit | 7cb266737ba4c58882c302d8fc03bc820e898b82 (patch) | |
tree | 7896f478e133e9a8d8c3f81784aeabc1f67c1352 /bundles/org.eclipse.team.ui/src/org/eclipse | |
parent | 325d702ca6f1f6c773f165211beaf693dc251740 (diff) | |
download | eclipse.platform.team-7cb266737ba4c58882c302d8fc03bc820e898b82.tar.gz eclipse.platform.team-7cb266737ba4c58882c302d8fc03bc820e898b82.tar.xz eclipse.platform.team-7cb266737ba4c58882c302d8fc03bc820e898b82.zip |
Bug 504629: Team icon problems
Only keep API constants fixed.
Change-Id: Ib15178005463134d5094b8e40ac6507d0e98ab46
Signed-off-by: Matthias Becker <ma.becker@sap.com>
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse')
3 files changed, 135 insertions, 155 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ITeamUIImages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ITeamUIImages.java index 3729c31c5..fc7495f62 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ITeamUIImages.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ITeamUIImages.java @@ -21,135 +21,135 @@ public interface ITeamUIImages { /** * Identifies an incoming change. */ - public final String IMG_DLG_SYNC_INCOMING = "elcl16/incom_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_INCOMING = "elcl16/incom_synch.png"; //$NON-NLS-1$ /** * Identifies an outgoing change. */ - public final String IMG_DLG_SYNC_OUTGOING = "elcl16/outgo_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_OUTGOING = "elcl16/outgo_synch.png"; //$NON-NLS-1$ /** * Identifies a conflicting change. */ - public final String IMG_DLG_SYNC_CONFLICTING = "elcl16/conflict_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_CONFLICTING = "elcl16/conflict_synch.png"; //$NON-NLS-1$ /** * Identifies a refresh action. */ - public final String IMG_REFRESH = "elcl16/refresh.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH = "elcl16/refresh.png"; //$NON-NLS-1$ /** * Identifies a refresh with repository action. */ - public final String IMG_REFRESH_REMOTE = "elcl16/refresh_remote.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH_REMOTE = "elcl16/refresh_remote.png"; //$NON-NLS-1$ /** * Identifies a link with action. */ - public final String IMG_LINK_WITH = "elcl16/synced.gif"; //$NON-NLS-1$ + public final String IMG_LINK_WITH = "elcl16/synced.png"; //$NON-NLS-1$ /** * Identifies an ignore white space action. */ - public final String IMG_IGNORE_WHITESPACE = "elcl16/ignorews_edit.gif"; //$NON-NLS-1$ + public final String IMG_IGNORE_WHITESPACE = "elcl16/ignorews_edit.png"; //$NON-NLS-1$ /** * Identifies a collapse all action. */ - public final String IMG_COLLAPSE_ALL = "elcl16/collapseall.gif"; //$NON-NLS-1$ + public final String IMG_COLLAPSE_ALL = "elcl16/collapseall.png"; //$NON-NLS-1$ /** * Identifies the incoming mode for synchronizing. */ - public final String IMG_SYNC_MODE_CATCHUP = "elcl16/catchup_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_CATCHUP = "elcl16/catchup_rls.png"; //$NON-NLS-1$ /** * Identifies the outgoing mode for synchronizing. */ - public final String IMG_SYNC_MODE_RELEASE = "elcl16/release_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_RELEASE = "elcl16/release_rls.png"; //$NON-NLS-1$ /** * Identifies the both mode for synchronizing. */ - public final String IMG_SYNC_MODE_FREE = "elcl16/catchuprelease_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_FREE = "elcl16/catchuprelease_rls.png"; //$NON-NLS-1$ /** * Identifies an incoming change. */ - public final String IMG_DLG_SYNC_INCOMING_DISABLED = "dlcl16/incom_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_INCOMING_DISABLED = "dlcl16/incom_synch.png"; //$NON-NLS-1$ /** * Identifies an outgoing change. */ - public final String IMG_DLG_SYNC_OUTGOING_DISABLED = "dlcl16/outgo_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_OUTGOING_DISABLED = "dlcl16/outgo_synch.png"; //$NON-NLS-1$ /** * Identifies a conflicting change. */ - public final String IMG_DLG_SYNC_CONFLICTING_DISABLED = "dlcl16/conflict_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_CONFLICTING_DISABLED = "dlcl16/conflict_synch.png"; //$NON-NLS-1$ /** * Identifies a refresh action. */ - public final String IMG_REFRESH_DISABLED = "dlcl16/refresh.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH_DISABLED = "dlcl16/refresh.png"; //$NON-NLS-1$ /** * Identifies a refresh with repository action. */ - public final String IMG_REFRESH_REMOTE_DISABLED = "dlcl16/refresh_remote.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH_REMOTE_DISABLED = "dlcl16/refresh_remote.png"; //$NON-NLS-1$ /** * Identifies a link with action. */ - public final String IMG_LINK_WITH_DISABLED = "dlcl16/synced.gif"; //$NON-NLS-1$ + public final String IMG_LINK_WITH_DISABLED = "dlcl16/synced.png"; //$NON-NLS-1$ /** * Identifies an ignore white space action. */ - public final String IMG_IGNORE_WHITESPACE_DISABLED = "dlcl16/ignorews_edit.gif"; //$NON-NLS-1$ + public final String IMG_IGNORE_WHITESPACE_DISABLED = "dlcl16/ignorews_edit.png"; //$NON-NLS-1$ /** * Identifies a collapse all action. */ - public final String IMG_COLLAPSE_ALL_DISABLED = "dlcl16/collapseall.gif"; //$NON-NLS-1$ + public final String IMG_COLLAPSE_ALL_DISABLED = "dlcl16/collapseall.png"; //$NON-NLS-1$ /** * Identifies the incoming mode for synchronizing. */ - public final String IMG_SYNC_MODE_CATCHUP_DISABLED = "dlcl16/catchup_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_CATCHUP_DISABLED = "dlcl16/catchup_rls.png"; //$NON-NLS-1$ /** * Identifies the outgoing mode for synchronizing. */ - public final String IMG_SYNC_MODE_RELEASE_DISABLED = "dlcl16/release_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_RELEASE_DISABLED = "dlcl16/release_rls.png"; //$NON-NLS-1$ /** * Identifies the both mode for synchronizing. */ - public final String IMG_SYNC_MODE_FREE_DISABLED = "dlcl16/catchuprelease_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_FREE_DISABLED = "dlcl16/catchuprelease_rls.png"; //$NON-NLS-1$ /** * Identifies an incoming change. */ - public final String IMG_DLG_SYNC_INCOMING_ENABLED = "elcl16/incom_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_INCOMING_ENABLED = "elcl16/incom_synch.png"; //$NON-NLS-1$ /** * Identifies an outgoing change. */ - public final String IMG_DLG_SYNC_OUTGOING_ENABLED = "elcl16/outgo_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_OUTGOING_ENABLED = "elcl16/outgo_synch.png"; //$NON-NLS-1$ /** * Identifies a conflicting change. */ - public final String IMG_DLG_SYNC_CONFLICTING_ENABLED = "elcl16/conflict_synch.gif"; //$NON-NLS-1$ + public final String IMG_DLG_SYNC_CONFLICTING_ENABLED = "elcl16/conflict_synch.png"; //$NON-NLS-1$ /** * Identifies a refresh action. */ - public final String IMG_REFRESH_ENABLED = "elcl16/refresh.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH_ENABLED = "elcl16/refresh.png"; //$NON-NLS-1$ /** * Identifies a refresh with repository action. */ - public final String IMG_REFRESH_REMOTE_ENABLED = "elcl16/refresh_remote.gif"; //$NON-NLS-1$ + public final String IMG_REFRESH_REMOTE_ENABLED = "elcl16/refresh_remote.png"; //$NON-NLS-1$ /** * Identifies a link with action. */ - public final String IMG_LINK_WITH_ENABLED = "elcl16/synced.gif"; //$NON-NLS-1$ + public final String IMG_LINK_WITH_ENABLED = "elcl16/synced.png"; //$NON-NLS-1$ /** * Identifies an ignore white space action. */ - public final String IMG_IGNORE_WHITESPACE_ENABLED = "elcl16/ignorews_edit.gif"; //$NON-NLS-1$ + public final String IMG_IGNORE_WHITESPACE_ENABLED = "elcl16/ignorews_edit.png"; //$NON-NLS-1$ /** * Identifies a collapse all action. */ - public final String IMG_COLLAPSE_ALL_ENABLED = "elcl16/collapseall.gif"; //$NON-NLS-1$ + public final String IMG_COLLAPSE_ALL_ENABLED = "elcl16/collapseall.png"; //$NON-NLS-1$ /** * Identifies the incoming mode for synchronizing. */ - public final String IMG_SYNC_MODE_CATCHUP_ENABLED = "elcl16/catchup_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_CATCHUP_ENABLED = "elcl16/catchup_rls.png"; //$NON-NLS-1$ /** * Identifies the outgoing mode for synchronizing. */ - public final String IMG_SYNC_MODE_RELEASE_ENABLED = "elcl16/release_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_RELEASE_ENABLED = "elcl16/release_rls.png"; //$NON-NLS-1$ /** * Identifies the both mode for synchronizing. */ - public final String IMG_SYNC_MODE_FREE_ENABLED = "elcl16/catchuprelease_rls.gif"; //$NON-NLS-1$ + public final String IMG_SYNC_MODE_FREE_ENABLED = "elcl16/catchuprelease_rls.png"; //$NON-NLS-1$ /** * Share projects banner. */ @@ -165,31 +165,31 @@ public interface ITeamUIImages { /** * Icon for authentication dialogs. */ - public final String IMG_KEY_LOCK = "wizban/keylock.gif"; //$NON-NLS-1$ + public final String IMG_KEY_LOCK = "wizban/keylock.png"; //$NON-NLS-1$ /** * Pinned icon */ - public final String IMG_PINNED = "elcl16/pin.gif"; //$NON-NLS-1$ + public final String IMG_PINNED = "elcl16/pin.png"; //$NON-NLS-1$ /** * Previous history */ - public final String IMG_PREVIOUS = "elcl16/prev_nav.gif"; //$NON-NLS-1$ + public final String IMG_PREVIOUS = "elcl16/prev_nav.png"; //$NON-NLS-1$ //objects - public final String IMG_SITE_ELEMENT = "elcl16/site_element.gif"; //$NON-NLS-1$ - public final String IMG_CHANGE_FILTER = "elcl16/change_filter.gif"; //$NON-NLS-1$ - public final String IMG_COMPRESSED_FOLDER = "obj/compressed_folder_obj.gif"; //$NON-NLS-1$ - public final String IMG_HIERARCHICAL = "elcl16/hierarchicalLayout.gif"; //$NON-NLS-1$ - public final String IMG_FLAT = "elcl16/flatLayout.gif"; //$NON-NLS-1$ - public final String IMG_SYNC_VIEW = "eview16/synch_synch.gif"; //$NON-NLS-1$ - public final String IMG_CHANGE_SET = "obj/changeset_obj.gif"; //$NON-NLS-1$ + public final String IMG_SITE_ELEMENT = "elcl16/site_element.png"; //$NON-NLS-1$ + public final String IMG_CHANGE_FILTER = "elcl16/change_filter.png"; //$NON-NLS-1$ + public final String IMG_COMPRESSED_FOLDER = "obj/compressed_folder_obj.png"; //$NON-NLS-1$ + public final String IMG_HIERARCHICAL = "elcl16/hierarchicalLayout.png"; //$NON-NLS-1$ + public final String IMG_FLAT = "elcl16/flatLayout.png"; //$NON-NLS-1$ + public final String IMG_SYNC_VIEW = "eview16/synch_synch.png"; //$NON-NLS-1$ + public final String IMG_CHANGE_SET = "obj/changeset_obj.png"; //$NON-NLS-1$ /** * Images used by the Local History Page */ - public final String IMG_COMPARE_VIEW = "eview16/compare_view.gif"; //$NON-NLS-1$ - public final String IMG_DATES_CATEGORY = "obj/dates.gif"; //$NON-NLS-1$ - public final String IMG_LOCALREVISION_TABLE = "obj/local_entry_tbl.gif"; //$NON-NLS-1$ + public final String IMG_COMPARE_VIEW = "eview16/compare_view.png"; //$NON-NLS-1$ + public final String IMG_DATES_CATEGORY = "obj/dates.png"; //$NON-NLS-1$ + public final String IMG_LOCALREVISION_TABLE = "obj/local_entry_tbl.png"; //$NON-NLS-1$ } 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 91d0ebf9c..f841c3285 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 @@ -48,57 +48,6 @@ import org.osgi.framework.*; */ public class TeamUIPlugin extends AbstractUIPlugin { - /*==================================================================== - * Constants defining overlays file names - *====================================================================*/ - - private final String IMG_DIRTY_OVR_FILE = "ovr/dirty_ov.png"; //$NON-NLS-1$ - private final String IMG_CHECKEDIN_OVR_FILE = "ovr/version_controlled.png"; //$NON-NLS-1$ - private final String IMG_CHECKEDOUT_OVR_FILE = "ovr/checkedout_ov.png"; //$NON-NLS-1$ - private final String IMG_CONFLICT_OVR_FILE = "ovr/confchg_ov.png"; //$NON-NLS-1$ - private final String IMG_ERROR_OVR_FILE = "ovr/error_co.png"; //$NON-NLS-1$ - private final String IMG_WARNING_OVR_FILE = "ovr/warning_co.png"; //$NON-NLS-1$ - private final String IMG_HOURGLASS_OVR_FILE = "ovr/waiting_ovr.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_INCOMING_FILE = "elcl16/incom_synch.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_OUTGOING_FILE = "elcl16/outgo_synch.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_CONFLICTING_FILE = "elcl16/conflict_synch.png"; //$NON-NLS-1$ - private final String IMG_REFRESH_FILE = "elcl16/refresh.png"; //$NON-NLS-1$ - private final String IMG_REFRESH_REMOTE_FILE = "elcl16/refresh_remote.png"; //$NON-NLS-1$ - private final String IMG_LINK_WITH_FILE = "elcl16/synced.png"; //$NON-NLS-1$ - private final String IMG_IGNORE_WHITESPACE_FILE = "elcl16/ignorews_edit.png"; //$NON-NLS-1$ - private final String IMG_COLLAPSE_ALL_FILE = "elcl16/collapseall.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_CATCHUP_FILE = "elcl16/catchup_rls.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_RELEASE_FILE = "elcl16/release_rls.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_FREE_FILE = "elcl16/catchuprelease_rls.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_INCOMING_DISABLED_FILE = "dlcl16/incom_synch.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_OUTGOING_DISABLED_FILE = "dlcl16/outgo_synch.png"; //$NON-NLS-1$ - private final String IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE = "dlcl16/conflict_synch.png"; //$NON-NLS-1$ - private final String IMG_REFRESH_DISABLED_FILE = "dlcl16/refresh.png"; //$NON-NLS-1$ - private final String IMG_REFRESH_REMOTE_DISABLED_FILE = "dlcl16/refresh_remote.png"; //$NON-NLS-1$ - private final String IMG_LINK_WITH_DISABLED_FILE = "dlcl16/synced.png"; //$NON-NLS-1$ - private final String IMG_IGNORE_WHITESPACE_DISABLED_FILE = "dlcl16/ignorews_edit.png"; //$NON-NLS-1$ - private final String IMG_COLLAPSE_ALL_DISABLED_FILE = "dlcl16/collapseall.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_CATCHUP_DISABLED_FILE = "dlcl16/catchup_rls.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_RELEASE_DISABLED_FILE = "dlcl16/release_rls.png"; //$NON-NLS-1$ - private final String IMG_SYNC_MODE_FREE_DISABLED_FILE = "dlcl16/catchuprelease_rls.png"; //$NON-NLS-1$ - private final String IMG_WIZBAN_SHARE_FILE = "wizban/share_wizban.png"; //$NON-NLS-1$ - private final String IMG_PROJECTSET_IMPORT_BANNER_FILE = "wizban/import_projectset_wizban.png"; //$NON-NLS-1$ - private final String IMG_PROJECTSET_EXPORT_BANNER_FILE = "wizban/export_projectset_wizban.png"; //$NON-NLS-1$ - private final String IMG_KEY_LOCK_FILE = "wizban/keylock.png"; //$NON-NLS-1$ - private final String IMG_PINNED_FILE = "elcl16/pin.png"; //$NON-NLS-1$ - private final String IMG_PREVIOUS_FILE = "elcl16/prev_nav.png"; //$NON-NLS-1$ - private final String IMG_SITE_ELEMENT_FILE = "elcl16/site_element.png"; //$NON-NLS-1$ - private final String IMG_CHANGE_FILTER_FILE = "elcl16/change_filter.png"; //$NON-NLS-1$ - private final String IMG_COMPRESSED_FOLDER_FILE = "obj/compressed_folder_obj.png"; //$NON-NLS-1$ - private final String IMG_HIERARCHICAL_FILE = "elcl16/hierarchicalLayout.png"; //$NON-NLS-1$ - private final String IMG_FLAT_FILE = "elcl16/flatLayout.png"; //$NON-NLS-1$ - private final String IMG_SYNC_VIEW_FILE = "eview16/synch_synch.png"; //$NON-NLS-1$ - private final String IMG_CHANGE_SET_FILE = "obj/changeset_obj.png"; //$NON-NLS-1$ - private final String IMG_COMPARE_VIEW_FILE = "eview16/compare_view.png"; //$NON-NLS-1$ - private final String IMG_DATES_CATEGORY_FILE = "obj/dates.png"; //$NON-NLS-1$ - private final String IMG_LOCALREVISION_TABLE_FILE = "obj/local_entry_tbl.png"; //$NON-NLS-1$ - - private static TeamUIPlugin instance; // image paths @@ -361,15 +310,19 @@ public class TeamUIPlugin extends AbstractUIPlugin { * @param id the identifier for the image * @param baseURL the base URL for the image */ - private static void createImageDescriptor(TeamUIPlugin plugin, String id, String fileName) { + private static void createImageDescriptor(TeamUIPlugin plugin, String id) { // Delegate to the plugin instance to avoid concurrent class loading problems - plugin.privateCreateImageDescriptor(id, fileName); + plugin.privateCreateImageDescriptor(id); } - private void privateCreateImageDescriptor(String id, String fileName) { - ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(fileName)); + private void privateCreateImageDescriptor(String id) { + ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(id)); imageDescriptors.put(id, desc); } - + private void privateCreateImageDescriptor(String id, String imageUrl) { + ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(imageUrl)); + imageDescriptors.put(id, desc); + } + /** * Returns the image descriptor for the given image ID. * Returns null if there is no such image. @@ -383,7 +336,7 @@ public class TeamUIPlugin extends AbstractUIPlugin { } private ImageDescriptor privateGetImageDescriptor(String id) { if(! imageDescriptors.containsKey(id)) { - createImageDescriptor(getPlugin(), id, id); + createImageDescriptor(getPlugin(), id); } return imageDescriptors.get(id); } @@ -399,6 +352,14 @@ public class TeamUIPlugin extends AbstractUIPlugin { URL fullPathString = FileLocator.find(Platform.getBundle(extension.getNamespaceIdentifier()), new Path(subdirectoryAndFilename), null); return ImageDescriptor.createFromURL(fullPathString); } + + public static final String FILE_DIRTY_OVR = "ovr/dirty_ov.png"; //$NON-NLS-1$ + public static final String FILE_CHECKEDIN_OVR = "ovr/version_controlled.png"; //$NON-NLS-1$ + public static final String FILE_CHECKEDOUT_OVR = "ovr/checkedout_ov.png"; //$NON-NLS-1$ + public static final String FILE_CONFLICT_OVR = "ovr/confchg_ov.png"; //$NON-NLS-1$ + public static final String FILE_ERROR_OVR = "ovr/error_co.png"; //$NON-NLS-1$ + public static final String FILE_WARNING_OVR = "ovr/warning_co.png"; //$NON-NLS-1$ + public static final String FILE_HOURGLASS_OVR = "ovr/waiting_ovr.png"; //$NON-NLS-1$ /* * Initializes the table of images used in this plugin. The plugin is * provided because this method is called before the plugin staic @@ -407,67 +368,60 @@ public class TeamUIPlugin extends AbstractUIPlugin { */ private void initializeImages(TeamUIPlugin plugin) { // Overlays - createImageDescriptor(plugin, ISharedImages.IMG_DIRTY_OVR, IMG_DIRTY_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_CONFLICT_OVR, IMG_CONFLICT_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDIN_OVR, IMG_CHECKEDIN_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDOUT_OVR, IMG_CHECKEDOUT_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR, IMG_ERROR_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR, IMG_WARNING_OVR_FILE); - createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR, IMG_HOURGLASS_OVR_FILE); + + privateCreateImageDescriptor(ISharedImages.IMG_DIRTY_OVR, FILE_DIRTY_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_CONFLICT_OVR, FILE_CONFLICT_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_CHECKEDIN_OVR, FILE_CHECKEDIN_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_CHECKEDOUT_OVR, FILE_CHECKEDOUT_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_ERROR_OVR, FILE_ERROR_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_WARNING_OVR, FILE_WARNING_OVR); + privateCreateImageDescriptor(ISharedImages.IMG_HOURGLASS_OVR, FILE_HOURGLASS_OVR); // Target Management Icons - createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT); // Sync View Icons - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING, IMG_DLG_SYNC_INCOMING_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING, IMG_DLG_SYNC_OUTGOING_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING, IMG_DLG_SYNC_CONFLICTING_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH, IMG_REFRESH_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE, IMG_REFRESH_REMOTE_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH, IMG_LINK_WITH_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER, IMG_CHANGE_FILTER_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE, IMG_IGNORE_WHITESPACE_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL, IMG_COLLAPSE_ALL_FILE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED, IMG_DLG_SYNC_INCOMING_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED, IMG_DLG_SYNC_OUTGOING_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED, IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED, IMG_REFRESH_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE_DISABLED, IMG_REFRESH_REMOTE_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH_DISABLED, IMG_LINK_WITH_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED, IMG_IGNORE_WHITESPACE_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_DISABLED, IMG_COLLAPSE_ALL_DISABLED_FILE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP, IMG_SYNC_MODE_CATCHUP_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE, IMG_SYNC_MODE_RELEASE_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE, IMG_SYNC_MODE_FREE_FILE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED, IMG_SYNC_MODE_CATCHUP_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED, IMG_SYNC_MODE_RELEASE_DISABLED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED, IMG_SYNC_MODE_FREE_DISABLED_FILE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_KEY_LOCK, IMG_KEY_LOCK_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_PINNED, IMG_PINNED_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_PREVIOUS, IMG_PREVIOUS_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE, IMG_WIZBAN_SHARE_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH); + createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER); + createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE); + createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL); + createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_ENABLED); + + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED); + + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE); + + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED); + + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_ENABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_ENABLED); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_ENABLED); // Wizard banners - createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER, IMG_PROJECTSET_IMPORT_BANNER_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER, IMG_PROJECTSET_EXPORT_BANNER_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER); + createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER); + createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE); // Live Sync View icons - createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER, IMG_COMPRESSED_FOLDER_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW, IMG_SYNC_VIEW_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_SET, IMG_CHANGE_SET_FILE); - - createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL, IMG_HIERARCHICAL_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_FLAT, IMG_FLAT_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER); + createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW); + createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL); // Local History Page - createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY, IMG_DATES_CATEGORY_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW, IMG_COMPARE_VIEW_FILE); - createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE, IMG_LOCALREVISION_TABLE_FILE); + createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY); + createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW); + createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE); } private URL getImageUrl(String relative) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java index bc8ca3eda..1a65ab370 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamImages.java @@ -35,7 +35,33 @@ public class TeamImages { * @return the image descriptor associated with the given ID */ public static ImageDescriptor getImageDescriptor(String id) { - return TeamUIPlugin.getImageDescriptor(id); + String key = null; + switch (id) { + case ISharedImages.IMG_DIRTY_OVR: + key = TeamUIPlugin.FILE_DIRTY_OVR; + break; + case ISharedImages.IMG_CHECKEDIN_OVR: + key = TeamUIPlugin.FILE_CHECKEDIN_OVR; + break; + case ISharedImages.IMG_CHECKEDOUT_OVR: + key = TeamUIPlugin.FILE_CHECKEDOUT_OVR; + break; + case ISharedImages.IMG_CONFLICT_OVR: + key = TeamUIPlugin.FILE_CONFLICT_OVR; + break; + case ISharedImages.IMG_ERROR_OVR: + key = TeamUIPlugin.FILE_ERROR_OVR; + break; + case ISharedImages.IMG_WARNING_OVR: + key = TeamUIPlugin.FILE_WARNING_OVR; + break; + case ISharedImages.IMG_HOURGLASS_OVR: + key = TeamUIPlugin.FILE_HOURGLASS_OVR; + break; + default: + key = id; + } + return TeamUIPlugin.getImageDescriptor(key); } /** * Convenience method to get an image descriptor for an extension. |