Skip to content

Commit 5111687

Browse files
akurtakovakurtakov
committed
Remove ISharedImages.*HOVER
They are deprecated since 3.0 and marked for removal since 2024-03. Reduces needlessly created images by the workbench.
1 parent 9d9ee5e commit 5111687

3 files changed

Lines changed: 63 additions & 148 deletions

File tree

‎bundles/org.eclipse.ui.workbench/.settings/.api_filters‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,68 @@
102102
</message_arguments>
103103
</filter>
104104
</resource>
105+
<resource path="eclipseui/org/eclipse/ui/ISharedImages.java" type="org.eclipse.ui.ISharedImages">
106+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
107+
<message_arguments>
108+
<message_argument value="org.eclipse.ui.ISharedImages"/>
109+
<message_argument value="IMG_TOOL_BACK_HOVER"/>
110+
</message_arguments>
111+
</filter>
112+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
113+
<message_arguments>
114+
<message_argument value="org.eclipse.ui.ISharedImages"/>
115+
<message_argument value="IMG_TOOL_COPY_HOVER"/>
116+
</message_arguments>
117+
</filter>
118+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
119+
<message_arguments>
120+
<message_argument value="org.eclipse.ui.ISharedImages"/>
121+
<message_argument value="IMG_TOOL_CUT_HOVER"/>
122+
</message_arguments>
123+
</filter>
124+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
125+
<message_arguments>
126+
<message_argument value="org.eclipse.ui.ISharedImages"/>
127+
<message_argument value="IMG_TOOL_DELETE_HOVER"/>
128+
</message_arguments>
129+
</filter>
130+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
131+
<message_arguments>
132+
<message_argument value="org.eclipse.ui.ISharedImages"/>
133+
<message_argument value="IMG_TOOL_FORWARD_HOVER"/>
134+
</message_arguments>
135+
</filter>
136+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
137+
<message_arguments>
138+
<message_argument value="org.eclipse.ui.ISharedImages"/>
139+
<message_argument value="IMG_TOOL_NEW_WIZARD_HOVER"/>
140+
</message_arguments>
141+
</filter>
142+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
143+
<message_arguments>
144+
<message_argument value="org.eclipse.ui.ISharedImages"/>
145+
<message_argument value="IMG_TOOL_PASTE_HOVER"/>
146+
</message_arguments>
147+
</filter>
148+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
149+
<message_arguments>
150+
<message_argument value="org.eclipse.ui.ISharedImages"/>
151+
<message_argument value="IMG_TOOL_REDO_HOVER"/>
152+
</message_arguments>
153+
</filter>
154+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
155+
<message_arguments>
156+
<message_argument value="org.eclipse.ui.ISharedImages"/>
157+
<message_argument value="IMG_TOOL_UNDO_HOVER"/>
158+
</message_arguments>
159+
</filter>
160+
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
161+
<message_arguments>
162+
<message_argument value="org.eclipse.ui.ISharedImages"/>
163+
<message_argument value="IMG_TOOL_UP_HOVER"/>
164+
</message_arguments>
165+
</filter>
166+
</resource>
105167
<resource path="eclipseui/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java" type="org.eclipse.ui.dialogs.YesNoCancelListSelectionDialog">
106168
<filter id="576778288">
107169
<message_arguments>

‎bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java‎

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -341,18 +341,6 @@ public interface ISharedImages {
341341
*/
342342
String IMG_TOOL_BACK_DISABLED = "IMG_TOOL_BACK_DISABLED"; //$NON-NLS-1$
343343

344-
/**
345-
* Identifies the back image in the hover (colored) state.
346-
*
347-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_BACK</code>.
348-
* Enabled images are now in color. The workbench itself no longer
349-
* uses the hover image variants.
350-
* @noreference Marked for deletion see
351-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
352-
*/
353-
@Deprecated(forRemoval = true, since = "2024-03")
354-
String IMG_TOOL_BACK_HOVER = "IMG_TOOL_BACK_HOVER"; //$NON-NLS-1$
355-
356344
/**
357345
* Identifies the copy image in the enabled state.
358346
*/
@@ -363,18 +351,6 @@ public interface ISharedImages {
363351
*/
364352
String IMG_TOOL_COPY_DISABLED = "IMG_TOOL_COPY_DISABLED"; //$NON-NLS-1$
365353

366-
/**
367-
* Identifies the copy image in the hover (colored) state.
368-
*
369-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_COPY</code>.
370-
* Enabled images are now in color. The workbench itself no longer
371-
* uses the hover image variants.
372-
* @noreference Marked for deletion see
373-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
374-
*/
375-
@Deprecated(forRemoval = true, since = "2024-03")
376-
String IMG_TOOL_COPY_HOVER = "IMG_TOOL_COPY_HOVER"; //$NON-NLS-1$
377-
378354
/**
379355
* Identifies the cut image in the enabled state.
380356
*/
@@ -385,18 +361,6 @@ public interface ISharedImages {
385361
*/
386362
String IMG_TOOL_CUT_DISABLED = "IMG_TOOL_CUT_DISABLED"; //$NON-NLS-1$
387363

388-
/**
389-
* Identifies the cut image in the hover (colored) state.
390-
*
391-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_CUT</code>.
392-
* Enabled images are now in color. The workbench itself no longer
393-
* uses the hover image variants.
394-
* @noreference Marked for deletion see
395-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
396-
*/
397-
@Deprecated(forRemoval = true, since = "2024-03")
398-
String IMG_TOOL_CUT_HOVER = "IMG_TOOL_CUT_HOVER"; //$NON-NLS-1$
399-
400364
/**
401365
* Identifies the delete image in the enabled state.
402366
*
@@ -411,18 +375,6 @@ public interface ISharedImages {
411375
*/
412376
String IMG_TOOL_DELETE_DISABLED = "IMG_TOOL_DELETE_DISABLED"; //$NON-NLS-1$
413377

414-
/**
415-
* Identifies the delete image in the hover (colored) state.
416-
*
417-
* @deprecated in 3.0. This image is now the same as
418-
* <code>IMG_TOOL_DELETE</code>. Enabled images are now in color.
419-
* The workbench itself no longer uses the hover image variants.
420-
* @noreference Marked for deletion see
421-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
422-
*/
423-
@Deprecated(forRemoval = true, since = "2024-03")
424-
String IMG_TOOL_DELETE_HOVER = "IMG_TOOL_DELETE_HOVER"; //$NON-NLS-1$
425-
426378
/**
427379
* Identifies the forward image in the enabled state.
428380
*/
@@ -433,18 +385,6 @@ public interface ISharedImages {
433385
*/
434386
String IMG_TOOL_FORWARD_DISABLED = "IMG_TOOL_FORWARD_DISABLED"; //$NON-NLS-1$
435387

436-
/**
437-
* Identifies the forward image in the hover (colored) state.
438-
*
439-
* @deprecated in 3.0. This image is now the same as
440-
* <code>IMG_TOOL_FORWARD</code>. Enabled images are now in color.
441-
* The workbench itself no longer uses the hover image variants.
442-
* @noreference Marked for deletion see
443-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
444-
*/
445-
@Deprecated(forRemoval = true, since = "2024-03")
446-
String IMG_TOOL_FORWARD_HOVER = "IMG_TOOL_FORWARD_HOVER"; //$NON-NLS-1$
447-
448388
/**
449389
* Identifies the new wizard image in the enabled state.
450390
*/
@@ -455,19 +395,6 @@ public interface ISharedImages {
455395
*/
456396
String IMG_TOOL_NEW_WIZARD_DISABLED = "IMG_TOOL_NEW_WIZARD_DISABLED"; //$NON-NLS-1$
457397

458-
/**
459-
* Identifies the new wizard image in the hover (colored) state.
460-
*
461-
* @deprecated in 3.0. This image is now the same as
462-
* <code>IMG_TOOL_NEW_WIZARD</code>. Enabled images are now in
463-
* color. The workbench itself no longer uses the hover image
464-
* variants.
465-
* @noreference Marked for deletion see
466-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
467-
*/
468-
@Deprecated(forRemoval = true, since = "2024-03")
469-
String IMG_TOOL_NEW_WIZARD_HOVER = "IMG_TOOL_NEW_WIZARD_HOVER"; //$NON-NLS-1$
470-
471398
/**
472399
* Identifies the paste image in the enabled state.
473400
*/
@@ -478,18 +405,6 @@ public interface ISharedImages {
478405
*/
479406
String IMG_TOOL_PASTE_DISABLED = "IMG_TOOL_PASTE_DISABLED"; //$NON-NLS-1$
480407

481-
/**
482-
* Identifies the paste image in the hover (colored) state.
483-
*
484-
* @deprecated in 3.0. This image is now the same as
485-
* <code>IMG_TOOL_PASTE</code>. Enabled images are now in color. The
486-
* workbench itself no longer uses the hover image variants.
487-
* @noreference Marked for deletion see
488-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
489-
*/
490-
@Deprecated(forRemoval = true, since = "2024-03")
491-
String IMG_TOOL_PASTE_HOVER = "IMG_TOOL_PASTE_HOVER"; //$NON-NLS-1$
492-
493408
/**
494409
* Identifies the redo image in the enabled state.
495410
*/
@@ -500,19 +415,6 @@ public interface ISharedImages {
500415
*/
501416
String IMG_TOOL_REDO_DISABLED = "IMG_TOOL_REDO_DISABLED"; //$NON-NLS-1$
502417

503-
/**
504-
* Identifies the redo image in the hover (colored) state.
505-
*
506-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_REDO</code>.
507-
* Enabled images are now in color. The workbench itself no longer
508-
* uses the hover image variants.
509-
*
510-
* @noreference Marked for deletion see
511-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
512-
*/
513-
@Deprecated(forRemoval = true, since = "2024-03")
514-
String IMG_TOOL_REDO_HOVER = "IMG_TOOL_REDO_HOVER"; //$NON-NLS-1$
515-
516418
/**
517419
* Identifies the undo image in the enabled state.
518420
*/
@@ -523,19 +425,6 @@ public interface ISharedImages {
523425
*/
524426
String IMG_TOOL_UNDO_DISABLED = "IMG_TOOL_UNDO_DISABLED"; //$NON-NLS-1$
525427

526-
/**
527-
* Identifies the undo image in the hover (colored) state.
528-
*
529-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_UNDO</code>.
530-
* Enabled images are now in color. The workbench itself no longer
531-
* uses the hover image variants.
532-
*
533-
* @noreference Marked for deletion see
534-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
535-
*/
536-
@Deprecated(forRemoval = true, since = "2024-03")
537-
String IMG_TOOL_UNDO_HOVER = "IMG_TOOL_UNDO_HOVER"; //$NON-NLS-1$
538-
539428
/**
540429
* Identifies the up image in the enabled state.
541430
*/
@@ -546,18 +435,6 @@ public interface ISharedImages {
546435
*/
547436
String IMG_TOOL_UP_DISABLED = "IMG_TOOL_UP_DISABLED"; //$NON-NLS-1$
548437

549-
/**
550-
* Identifies the up image in the hover (colored) state.
551-
*
552-
* @deprecated in 3.0. This image is now the same as <code>IMG_TOOL_UP</code>.
553-
* Enabled images are now in color. The workbench itself no longer
554-
* uses the hover image variants.
555-
* @noreference Marked for deletion see
556-
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=559593
557-
*/
558-
@Deprecated(forRemoval = true, since = "2024-03")
559-
String IMG_TOOL_UP_HOVER = "IMG_TOOL_UP_HOVER"; //$NON-NLS-1$
560-
561438
// The following set of constants represent the image pairs that are used
562439
// to construct cursors for drag and drop operations within the workbench
563440
// Each cursor is represented by two images; the 'source' and the 'mask'

‎bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2024 IBM Corporation and others.
2+
* Copyright (c) 2000, 2026 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -296,30 +296,6 @@ private static final void declareImages() {
296296
declareImage(IWorkbenchGraphicConstants.IMG_PREF_IMPORT, PATH_PREF + "import_wiz.svg", false); //$NON-NLS-1$
297297
declareImage(IWorkbenchGraphicConstants.IMG_PREF_EXPORT, PATH_PREF + "export_wiz.svg", false); //$NON-NLS-1$
298298

299-
declareHoverImages();
300-
301-
302-
}
303-
304-
/**
305-
* Declares all the workbench's deprecated hover images, including both "shared"
306-
* ones and internal ones.
307-
*
308-
* @deprecated As of 3.0, since the workbench itself no longer uses the hover
309-
* image variants
310-
*/
311-
@Deprecated
312-
private static final void declareHoverImages() {
313-
declareImage(ISharedImages.IMG_TOOL_UNDO_HOVER, PATH_ETOOL + "undo_edit.svg", true); //$NON-NLS-1$
314-
declareImage(ISharedImages.IMG_TOOL_REDO_HOVER, PATH_ETOOL + "redo_edit.svg", true); //$NON-NLS-1$
315-
declareImage(ISharedImages.IMG_TOOL_CUT_HOVER, PATH_ETOOL + "cut_edit.svg", true); //$NON-NLS-1$
316-
declareImage(ISharedImages.IMG_TOOL_COPY_HOVER, PATH_ETOOL + "copy_edit.svg", true); //$NON-NLS-1$
317-
declareImage(ISharedImages.IMG_TOOL_PASTE_HOVER, PATH_ETOOL + "paste_edit.svg", true); //$NON-NLS-1$
318-
declareImage(ISharedImages.IMG_TOOL_FORWARD_HOVER, PATH_ELOCALTOOL + "forward_nav.svg", true); //$NON-NLS-1$
319-
declareImage(ISharedImages.IMG_TOOL_DELETE_HOVER, PATH_ETOOL + "delete_edit.svg", true); //$NON-NLS-1$
320-
declareImage(ISharedImages.IMG_TOOL_NEW_WIZARD_HOVER, PATH_ETOOL + "new_wiz.svg", true); //$NON-NLS-1$
321-
declareImage(ISharedImages.IMG_TOOL_BACK_HOVER, PATH_ELOCALTOOL + "backward_nav.svg", true); //$NON-NLS-1$
322-
declareImage(ISharedImages.IMG_TOOL_UP_HOVER, PATH_ELOCALTOOL + "up_nav.svg", true); //$NON-NLS-1$
323299
}
324300

325301
/**

0 commit comments

Comments
 (0)