Remove explicit disabled icons from org.eclipse.ui.cheatsheets

Use on-the-fly-generated disabled version of SVG-rasterized icons
instead.

Author: HeikoKlare

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java

@@ -65,7 +65,6 @@ public class CheatSheetPlugin extends AbstractUIPlugin {
 	public static final IPath ICONS_PATH = IPath.fromOSString("$nl$/icons/"); //$NON-NLS-1$
 	public static final String T_OBJ = "obj16/"; //$NON-NLS-1$
 	public static final String T_ELCL = "elcl16/"; //$NON-NLS-1$
-	public static final String T_DLCL = "dlcl16/"; //$NON-NLS-1$
 	public static final String T_VIEW = "view16/"; //$NON-NLS-1$
 
 	/**

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java

@@ -106,7 +106,7 @@ public Image lookupImage(String kind, int state, boolean isBlocked) {
 	 */
 	private ImageSet createImages(String kind) {
 		ImageSet images = new ImageSet();
-		ImageDescriptor desc = getPredefinedImageDescriptor(kind, true);
+		ImageDescriptor desc = getPredefinedImageDescriptor(kind);
 		if (desc == null) {
 			desc = TaskEditorManager.getInstance().getImageDescriptor(kind);
 		}
@@ -134,7 +134,7 @@ private ImageSet createImages(String kind) {
 		return images;
 	}
 
-	private ImageDescriptor getPredefinedImageDescriptor(String kind, boolean isEnabled) {
+	private ImageDescriptor getPredefinedImageDescriptor(String kind) {
 		String filename;
 		if (ICompositeCheatsheetTags.CHEATSHEET_TASK_KIND.equals(kind)) {
 			filename = "cheatsheet_task.svg"; //$NON-NLS-1$
@@ -147,13 +147,7 @@ private ImageDescriptor getPredefinedImageDescriptor(String kind, boolean isEnab
 		} else {
 			return null;
 		}
-		String iconPath =  "$nl$/icons/"; //$NON-NLS-1$
-		if (isEnabled) {
-			iconPath += CheatSheetPlugin.T_OBJ;
-		} else {
-			iconPath += CheatSheetPlugin.T_DLCL;
-		}
-		iconPath += filename;
+		String iconPath = "$nl$/icons/" + CheatSheetPlugin.T_OBJ + filename; //$NON-NLS-1$
 		return createImageDescriptor(iconPath);
 	}
 
@@ -165,18 +159,7 @@ private void createImageWithOverlay(int state, String imagePath, ImageSet images
 	}
 
 	private void createDisabledImage(String kind, int state, ImageSet images, Image baseImage) {
-		// The four images for task_set, task_sequence, task_choice and cheatsheet_task can be found
-		// in icons/dlcl16.
-		// TODO extend the extension point to allow disabled images to be specified.
-		//if
-
-		ImageDescriptor desc = getPredefinedImageDescriptor(kind, false);
-		Image disabledImage;
-		if (desc != null) {
-			disabledImage = desc.createImage();
-		} else {
-			disabledImage = createGrayedImage(baseImage);
-		}
+		Image disabledImage = createGrayedImage(baseImage);
 		images.put(state, disabledImage);
 	}
 

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetExpandRestoreAction.java

@@ -28,17 +28,13 @@ public class CheatSheetExpandRestoreAction extends Action {
 	private boolean collapsed = false;
 
 	private final ImageDescriptor collapseImage;
-	private final ImageDescriptor disabledImage;
 
 	public CheatSheetExpandRestoreAction(String title, boolean initValue, CheatSheetViewer viewer) {
 		super(title);
 		this.viewer = viewer;
 
 		IPath path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_ELCL).append("collapse_expand_all.svg");//$NON-NLS-1$
 		collapseImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
-		path = CheatSheetPlugin.ICONS_PATH.append(CheatSheetPlugin.T_DLCL).append("collapse_expand_all.png");//$NON-NLS-1$
-		disabledImage = CheatSheetPlugin.createImageDescriptor(CheatSheetPlugin.getPlugin().getBundle(), path);
-		setDisabledImageDescriptor(disabledImage);
 		setImageDescriptor(collapseImage);
 		setCollapsed(initValue);
 	}