diff options
| author | Bogdan Gheorghe | 2012-10-12 19:42:46 +0000 |
|---|---|---|
| committer | Bogdan Gheorghe | 2012-10-12 19:42:46 +0000 |
| commit | 7b95a1f0037348e0ff6fca90ca396db3cf6968a0 (patch) | |
| tree | 81cd1a0da26803ee6b4752fbee10a3c62552963a | |
| parent | 832c044aa40d6a87878fe23f8c85621f76a8646c (diff) | |
| download | eclipse.platform.ui-7b95a1f0037348e0ff6fca90ca396db3cf6968a0.tar.gz eclipse.platform.ui-7b95a1f0037348e0ff6fca90ca396db3cf6968a0.tar.xz eclipse.platform.ui-7b95a1f0037348e0ff6fca90ca396db3cf6968a0.zip | |
Bug 391826 - HandledContributionItem fails to cache icons in updateIcons
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java index 257f38df1c8..c0f314d7c92 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java @@ -564,8 +564,11 @@ public class HandledContributionItem extends ContributionItem { Item item = (Item) widget; String iconURI = model.getIconURI() != null ? model.getIconURI() : ""; //$NON-NLS-1$ String disabledURI = getDisabledIconURI(model); + Object disabledData = item.getData(DISABLED_URI); + if (disabledData == null) + disabledData = ""; //$NON-NLS-1$ if (!iconURI.equals(item.getData(ICON_URI)) - || !disabledURI.equals(item.getData(DISABLED_URI))) { + || !disabledURI.equals(disabledData)) { LocalResourceManager resourceManager = new LocalResourceManager( JFaceResources.getResources()); Image iconImage = getImage(iconURI, resourceManager); |