Remove obsolete explicit hover image specification

HeikoKlare · HeikoKlare · commit a45ca188cf2f · 2025-04-26T18:13:40.000+02:00
In all cases, in which a hover image descriptor is set for an action,
the same image descriptor is used for the original image as well as for
the hover image. This leads to unnecessary execution of hover/hot image
handling, and in some cases even different resources with the same
content are used as original and hover image, leading to unnecessary
resource retrievals and handle acquisitions.
This change removes all unnecessary hover image descriptor
specifications and de-duplicates an image resource.
diff --git a/debug/org.eclipse.ui.console/icons/full/clcl16/clear_co.svg b/debug/org.eclipse.ui.console/icons/full/clcl16/clear_co.svg
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java
@@ -25,7 +25,6 @@
 import org.eclipse.ui.internal.console.ConsoleMessages;
 import org.eclipse.ui.internal.console.ConsolePluginImages;
 import org.eclipse.ui.internal.console.IConsoleHelpContextIds;
-import org.eclipse.ui.internal.console.IInternalConsoleConstants;
 
 /**
  * Clears the output in a text console.
@@ -48,8 +47,7 @@ public class ClearOutputAction extends Action {
 	private ClearOutputAction() {
 		super(ConsoleMessages.ClearOutputAction_title);
 		setToolTipText(ConsoleMessages.ClearOutputAction_toolTipText);
-		setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_LCL_CLEAR));
-		setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLEAR));
+		setImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_LCL_CLEAR));
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CLEAR_CONSOLE_ACTION);
 	}
 
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java
@@ -43,7 +43,6 @@ public class ConsolePluginImages {
 	}
 
 	// Use IPath and toOSString to build the names to ensure they have the slashes correct
-	private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
 	private final static String ELCL= "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
 	private final static String VIEW= "cview16/"; // views //$NON-NLS-1$
 
@@ -54,10 +53,9 @@ private static void declareImages() {
 		// Actions
 
 		//local toolbars
-		declareRegistryImage(IConsoleConstants.IMG_LCL_CLEAR, LOCALTOOL + "clear_co.svg"); //$NON-NLS-1$
+		declareRegistryImage(IConsoleConstants.IMG_LCL_CLEAR, ELCL + "clear_co.svg"); //$NON-NLS-1$
 
 		// enabled local toolbars
-		declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLEAR, ELCL + "clear_co.svg"); //$NON-NLS-1$
 		declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_PIN, ELCL + "pin.svg"); //$NON-NLS-1$
 		declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_LOCK, ELCL + "lock_co.svg"); //$NON-NLS-1$
 		declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_WRAP, ELCL + "wordwrap.svg"); //$NON-NLS-1$
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java
@@ -18,7 +18,6 @@ public interface IInternalConsoleConstants {
 
 	// enabled local tool images
 	String IMG_ELCL_PIN = "IMG_ELCL_PIN"; //$NON-NLS-1$
-	String IMG_ELCL_CLEAR= "IMG_ELCL_CLEAR"; //$NON-NLS-1$
 	String IMG_ELCL_LOCK = "IMG_ELCL_LOCK"; //$NON-NLS-1$
 	String IMG_ELCL_WRAP = "IMG_ELCL_WRAP"; //$NON-NLS-1$
 	String IMG_ELCL_CLOSE = "IMG_ELCL_CLOSE"; //$NON-NLS-1$
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/CompareResultsAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/CompareResultsAction.java
@@ -39,7 +39,6 @@ public CompareResultsAction(FailureTraceUIBlock view) {
 		setToolTipText(Messages.CompareResultsAction_tooltip);
 
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/compare.png")); //$NON-NLS-1$
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/compare.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/compare.png")); //$NON-NLS-1$
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IUnitTestHelpContextIds.ENABLEFILTER_ACTION);
 		fView = view;
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/EnableStackFilterAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/EnableStackFilterAction.java
@@ -37,7 +37,6 @@ public EnableStackFilterAction(FailureTraceUIBlock view) {
 		setToolTipText(Messages.EnableStackFilterAction_action_tooltip);
 
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/cfilter.png")); //$NON-NLS-1$
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/cfilter.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/cfilter.png")); //$NON-NLS-1$
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IUnitTestHelpContextIds.ENABLEFILTER_ACTION);
 
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/Images.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/Images.java
@@ -71,7 +71,6 @@ private static void setImageDescriptors(IAction action, String type, String relP
 			action.setDisabledImageDescriptor(id);
 
 		ImageDescriptor descriptor = createImageDescriptor("e" + type, relPath, true); //$NON-NLS-1$
-		action.setHoverImageDescriptor(descriptor);
 		action.setImageDescriptor(descriptor);
 	}
 
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ScrollLockAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ScrollLockAction.java
@@ -34,7 +34,6 @@ public ScrollLockAction(TestRunnerViewPart viewer) {
 		fRunnerViewPart = viewer;
 		setToolTipText(Messages.ScrollLockAction_action_tooltip);
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/lock.png")); //$NON-NLS-1$
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/lock.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/lock.png")); //$NON-NLS-1$
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IUnitTestHelpContextIds.OUTPUT_SCROLL_LOCK_ACTION);
 		setChecked(false);
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowNextFailureAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowNextFailureAction.java
@@ -30,7 +30,6 @@ public class ShowNextFailureAction extends Action {
 	public ShowNextFailureAction(TestRunnerViewPart part) {
 		super(Messages.ShowNextFailureAction_label);
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/select_next.png")); //$NON-NLS-1$
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/select_next.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/select_next.png")); //$NON-NLS-1$
 		setToolTipText(Messages.ShowNextFailureAction_tooltip);
 		fPart = part;
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowPreviousFailureAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowPreviousFailureAction.java
@@ -30,7 +30,6 @@ public class ShowPreviousFailureAction extends Action {
 	public ShowPreviousFailureAction(TestRunnerViewPart part) {
 		super(Messages.ShowPreviousFailureAction_label);
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/select_prev.png")); //$NON-NLS-1$
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/select_prev.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/select_prev.png")); //$NON-NLS-1$
 		setToolTipText(Messages.ShowPreviousFailureAction_tooltip);
 		fPart = part;
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowStackTraceInConsoleViewAction.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/ui/ShowStackTraceInConsoleViewAction.java
@@ -32,7 +32,6 @@ public ShowStackTraceInConsoleViewAction() {
 		setDescription(Messages.ShowStackTraceInConsoleViewAction_description);
 		setToolTipText(Messages.ShowStackTraceInConsoleViewAction_tooltip);
 
-		setHoverImageDescriptor(Images.getImageDescriptor("elcl16/open_console.png")); //$NON-NLS-1$
 		setImageDescriptor(Images.getImageDescriptor("elcl16/open_console.png")); //$NON-NLS-1$
 		setDisabledImageDescriptor(Images.getImageDescriptor("dlcl16/open_console.png")); //$NON-NLS-1$
 
diff --git a/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
@@ -169,7 +169,6 @@ private static void initAction(IAction a, ResourceBundle bundle, String prefix)
 			id= getImageDescriptor(ePath);
 			if (id != null) {
 				a.setImageDescriptor(id);
-				a.setHoverImageDescriptor(id);
 			}
 		}
 	}
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -287,7 +287,6 @@ public static void initAction(IAction a, ResourceBundle bundle, String prefix) {
 			id= CompareUIPlugin.getImageDescriptor(ePath);
 			if (id != null) {
 				a.setImageDescriptor(id);
-				a.setHoverImageDescriptor(id);
 			}
 		}
 	}
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
@@ -380,7 +380,6 @@ public void run() {
 		groupByDateMode.setChecked(groupingOn);
 		groupByDateMode.setToolTipText(TeamUIMessages.LocalHistoryPage_GroupRevisionsByDateTip);
 		groupByDateMode.setDisabledImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_DATES_CATEGORY));
-		groupByDateMode.setHoverImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_DATES_CATEGORY));
 
 		//Collapse All
 		collapseAll =  new Action(TeamUIMessages.LocalHistoryPage_CollapseAllAction, TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COLLAPSE_ALL)) {
@@ -391,7 +390,6 @@ public void run() {
 		};
 		collapseAll.setToolTipText(TeamUIMessages.LocalHistoryPage_CollapseAllTip);
 		collapseAll.setDisabledImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COLLAPSE_ALL));
-		collapseAll.setHoverImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COLLAPSE_ALL));
 
 		IHistoryPageSite historyPageSite = getHistoryPageSite();
 		if (!historyPageSite.isModal()) {
@@ -407,7 +405,6 @@ public void run() {
 				};
 				compareModeAction.setToolTipText(TeamUIMessages.LocalHistoryPage_CompareModeTip);
 				compareModeAction.setDisabledImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COMPARE_VIEW));
-				compareModeAction.setHoverImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COMPARE_VIEW));
 				compareModeAction.setChecked(compareMode == ON);
 
 				getContentsAction = getContextMenuAction(TeamUIMessages.LocalHistoryPage_GetContents, true /* needs progress */, monitor -> {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ private static void setImageDescriptors(IAction action, String type, String relP`
`71`	`71`	`action.setDisabledImageDescriptor(id);`
`72`	`72`
`73`	`73`	`ImageDescriptor descriptor = createImageDescriptor("e" + type, relPath, true); //$NON-NLS-1$`
`74`		`- action.setHoverImageDescriptor(descriptor);`
`75`	`74`	`action.setImageDescriptor(descriptor);`
`76`	`75`	`}`
`77`	`76`