Skip to content

Commit de45bf4

Browse files
HeikoKlareakurtakov
HeikoKlare
authored and
akurtakov
committed
Remove shared cursor images that have been deprecated for removal
The images were deprecated for removal two years ago and can now be removed.
1 parent 552e38b commit de45bf4

19 files changed

Lines changed: 98 additions & 712 deletions

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,103 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<component id="org.eclipse.ui.workbench" version="2">
3+
<resource path="eclipseui/org/eclipse/ui/ISharedImages.java" type="org.eclipse.ui.ISharedImages">
4+
<filter id="405864542">
5+
<message_arguments>
6+
<message_argument value="org.eclipse.ui.ISharedImages"/>
7+
<message_argument value="IMG_OBJS_DND_BOTTOM_MASK"/>
8+
</message_arguments>
9+
</filter>
10+
<filter id="405864542">
11+
<message_arguments>
12+
<message_argument value="org.eclipse.ui.ISharedImages"/>
13+
<message_argument value="IMG_OBJS_DND_BOTTOM_SOURCE"/>
14+
</message_arguments>
15+
</filter>
16+
<filter id="405864542">
17+
<message_arguments>
18+
<message_argument value="org.eclipse.ui.ISharedImages"/>
19+
<message_argument value="IMG_OBJS_DND_INVALID_MASK"/>
20+
</message_arguments>
21+
</filter>
22+
<filter id="405864542">
23+
<message_arguments>
24+
<message_argument value="org.eclipse.ui.ISharedImages"/>
25+
<message_argument value="IMG_OBJS_DND_INVALID_SOURCE"/>
26+
</message_arguments>
27+
</filter>
28+
<filter id="405864542">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.ui.ISharedImages"/>
31+
<message_argument value="IMG_OBJS_DND_LEFT_MASK"/>
32+
</message_arguments>
33+
</filter>
34+
<filter id="405864542">
35+
<message_arguments>
36+
<message_argument value="org.eclipse.ui.ISharedImages"/>
37+
<message_argument value="IMG_OBJS_DND_LEFT_SOURCE"/>
38+
</message_arguments>
39+
</filter>
40+
<filter id="405864542">
41+
<message_arguments>
42+
<message_argument value="org.eclipse.ui.ISharedImages"/>
43+
<message_argument value="IMG_OBJS_DND_OFFSCREEN_MASK"/>
44+
</message_arguments>
45+
</filter>
46+
<filter id="405864542">
47+
<message_arguments>
48+
<message_argument value="org.eclipse.ui.ISharedImages"/>
49+
<message_argument value="IMG_OBJS_DND_OFFSCREEN_SOURCE"/>
50+
</message_arguments>
51+
</filter>
52+
<filter id="405864542">
53+
<message_arguments>
54+
<message_argument value="org.eclipse.ui.ISharedImages"/>
55+
<message_argument value="IMG_OBJS_DND_RIGHT_MASK"/>
56+
</message_arguments>
57+
</filter>
58+
<filter id="405864542">
59+
<message_arguments>
60+
<message_argument value="org.eclipse.ui.ISharedImages"/>
61+
<message_argument value="IMG_OBJS_DND_RIGHT_SOURCE"/>
62+
</message_arguments>
63+
</filter>
64+
<filter id="405864542">
65+
<message_arguments>
66+
<message_argument value="org.eclipse.ui.ISharedImages"/>
67+
<message_argument value="IMG_OBJS_DND_STACK_MASK"/>
68+
</message_arguments>
69+
</filter>
70+
<filter id="405864542">
71+
<message_arguments>
72+
<message_argument value="org.eclipse.ui.ISharedImages"/>
73+
<message_argument value="IMG_OBJS_DND_STACK_SOURCE"/>
74+
</message_arguments>
75+
</filter>
76+
<filter id="405864542">
77+
<message_arguments>
78+
<message_argument value="org.eclipse.ui.ISharedImages"/>
79+
<message_argument value="IMG_OBJS_DND_TOFASTVIEW_MASK"/>
80+
</message_arguments>
81+
</filter>
82+
<filter id="405864542">
83+
<message_arguments>
84+
<message_argument value="org.eclipse.ui.ISharedImages"/>
85+
<message_argument value="IMG_OBJS_DND_TOFASTVIEW_SOURCE"/>
86+
</message_arguments>
87+
</filter>
88+
<filter id="405864542">
89+
<message_arguments>
90+
<message_argument value="org.eclipse.ui.ISharedImages"/>
91+
<message_argument value="IMG_OBJS_DND_TOP_MASK"/>
92+
</message_arguments>
93+
</filter>
94+
<filter id="405864542">
95+
<message_arguments>
96+
<message_argument value="org.eclipse.ui.ISharedImages"/>
97+
<message_argument value="IMG_OBJS_DND_TOP_SOURCE"/>
98+
</message_arguments>
99+
</filter>
100+
</resource>
3101
<resource path="eclipseui/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java" type="org.eclipse.ui.dialogs.YesNoCancelListSelectionDialog">
4102
<filter id="576778288">
5103
<message_arguments>

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

Lines changed: 0 additions & 212 deletions
Original file line numberDiff line numberDiff line change
@@ -449,218 +449,6 @@ public interface ISharedImages {
449449
*/
450450
String IMG_TOOL_UP_DISABLED = "IMG_TOOL_UP_DISABLED"; //$NON-NLS-1$
451451

452-
// The following set of constants represent the image pairs that are used
453-
// to construct cursors for drag and drop operations within the workbench
454-
// Each cursor is represented by two images; the 'source' and the 'mask'
455-
// These need to be combined using the following code snippet:
456-
// source = getImageDescriptor(sourceId);
457-
// mask = getImageDescriptor(maskId);
458-
// cursor = new Cursor(display, source.getImageData(), mask.getImageData(), 16,
459-
// 16);
460-
461-
/**
462-
* Cursor 'source' for the left arrow cursor. For cursor construction see:
463-
*
464-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
465-
* @since 3.5
466-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_LEFT}. The replacement
467-
* icon does <b>not</b> require a mask.
468-
* @noreference Marked for deletion since newer versions are available; see
469-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
470-
*/
471-
@Deprecated(forRemoval = true, since = "2024-09")
472-
String IMG_OBJS_DND_LEFT_SOURCE = "IMG_OBJS_DND_LEFT_SOURCE"; //$NON-NLS-1$
473-
/**
474-
* Cursor 'mask' for the left arrow cursor. For cursor construction see:
475-
*
476-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
477-
* @since 3.5
478-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_LEFT}.
479-
* @noreference Marked for deletion since newer versions are available; see
480-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
481-
*/
482-
@Deprecated(forRemoval = true, since = "2024-09")
483-
String IMG_OBJS_DND_LEFT_MASK = "IMG_OBJS_DND_LEFT_MASK"; //$NON-NLS-1$
484-
485-
/**
486-
* Cursor 'source' for the right arrow cursor. For cursor construction see:
487-
*
488-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
489-
* @since 3.5
490-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_RIGHT}. The replacement
491-
* icon does <b>not</b> require a mask.
492-
* @noreference Marked for deletion since newer versions are available; see
493-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
494-
*/
495-
@Deprecated(forRemoval = true, since = "2024-09")
496-
String IMG_OBJS_DND_RIGHT_SOURCE = "IMG_OBJS_DND_RIGHT_SOURCE"; //$NON-NLS-1$
497-
/**
498-
* Cursor 'mask' for the right arrow cursor. For cursor construction see:
499-
*
500-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
501-
* @since 3.5
502-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_RIGHT}.
503-
* @noreference Marked for deletion since newer versions are available; see
504-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
505-
*/
506-
@Deprecated(forRemoval = true, since = "2024-09")
507-
String IMG_OBJS_DND_RIGHT_MASK = "IMG_OBJS_DND_RIGHT_MASK"; //$NON-NLS-1$
508-
509-
/**
510-
* Cursor 'source' for the up arrow cursor. For cursor construction see:
511-
*
512-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
513-
* @since 3.5
514-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_TOP}. The replacement
515-
* icon does <b>not</b> require a mask.
516-
* @noreference Marked for deletion since newer versions are available; see
517-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
518-
*/
519-
@Deprecated(forRemoval = true, since = "2024-09")
520-
String IMG_OBJS_DND_TOP_SOURCE = "IMG_OBJS_DND_TOP_SOURCE"; //$NON-NLS-1$
521-
/**
522-
* Cursor 'mask' for the up arrow cursor. For cursor construction see:
523-
*
524-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
525-
* @since 3.5
526-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_TOP}.
527-
* @noreference Marked for deletion since newer versions are available; see
528-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
529-
*/
530-
@Deprecated(forRemoval = true, since = "2024-09")
531-
String IMG_OBJS_DND_TOP_MASK = "IMG_OBJS_DND_TOP_MASK"; //$NON-NLS-1$
532-
533-
/**
534-
* Cursor 'source' for the down arrow cursor. For cursor construction see:
535-
*
536-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
537-
* @since 3.5
538-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_BOTTOM}. The replacement
539-
* icon does <b>not</b> require a mask.
540-
* @noreference Marked for deletion since newer versions are available; see
541-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
542-
*/
543-
@Deprecated(forRemoval = true, since = "2024-09")
544-
String IMG_OBJS_DND_BOTTOM_SOURCE = "IMG_OBJS_DND_BOTTOM_SOURCE"; //$NON-NLS-1$
545-
/**
546-
* Cursor 'mask' for the down arrow cursor. For cursor construction see:
547-
*
548-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
549-
* @since 3.5
550-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_BOTTOM}.
551-
* @noreference Marked for deletion since newer versions are available; see
552-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
553-
*/
554-
@Deprecated(forRemoval = true, since = "2024-09")
555-
String IMG_OBJS_DND_BOTTOM_MASK = "IMG_OBJS_DND_BOTTOM_MASK"; //$NON-NLS-1$
556-
557-
/**
558-
* Cursor 'source' for the 'no drop' arrow cursor. For cursor construction see:
559-
*
560-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
561-
* @since 3.5
562-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_INVALID}. The
563-
* replacement icon does <b>not</b> require a mask.
564-
* @noreference Marked for deletion since newer versions are available; see
565-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
566-
*/
567-
@Deprecated(forRemoval = true, since = "2024-09")
568-
String IMG_OBJS_DND_INVALID_SOURCE = "IMG_OBJS_DND_INVALID_SOURCE"; //$NON-NLS-1$
569-
/**
570-
* Cursor 'mask' for the 'no drop' arrow cursor. For cursor construction see:
571-
*
572-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
573-
* @since 3.5
574-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_INVALID}.
575-
* @noreference Marked for deletion since newer versions are available; see
576-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
577-
*/
578-
@Deprecated(forRemoval = true, since = "2024-09")
579-
String IMG_OBJS_DND_INVALID_MASK = "IMG_OBJS_DND_INVALID_MASK"; //$NON-NLS-1$
580-
581-
/**
582-
* Cursor 'source' for the 'in stack' arrow cursor. For cursor construction see:
583-
*
584-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
585-
* @since 3.5
586-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_STACK}. The replacement
587-
* icon does <b>not</b> require a mask.
588-
* @noreference Marked for deletion since newer versions are available; see
589-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
590-
*/
591-
@Deprecated(forRemoval = true, since = "2024-09")
592-
String IMG_OBJS_DND_STACK_SOURCE = "IMG_OBJS_DND_STACK_SOURCE"; //$NON-NLS-1$
593-
/**
594-
* Cursor 'mask' for the 'in stack' arrow cursor. For cursor construction see:
595-
*
596-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
597-
* @since 3.5
598-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_STACK}.
599-
* @noreference Marked for deletion since newer versions are available; see
600-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
601-
*/
602-
@Deprecated(forRemoval = true, since = "2024-09")
603-
String IMG_OBJS_DND_STACK_MASK = "IMG_OBJS_DND_STACK_MASK"; //$NON-NLS-1$
604-
605-
/**
606-
* Cursor 'source' for the 'off-screen' (detached window) arrow cursor. For
607-
* cursor construction see:
608-
*
609-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
610-
* @since 3.5
611-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_OFFSCREEN}. The
612-
* replacement icon does <b>not</b> require a mask.
613-
* @noreference Marked for deletion since newer versions are available; see
614-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
615-
*/
616-
@Deprecated(forRemoval = true, since = "2024-09")
617-
String IMG_OBJS_DND_OFFSCREEN_SOURCE = "IMG_OBJS_DND_OFFSCREEN_SOURCE"; //$NON-NLS-1$
618-
/**
619-
* Cursor 'mask' for the 'off-screen' (detached window) arrow cursor. For cursor
620-
* construction see:
621-
*
622-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
623-
* @since 3.5
624-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_OFFSCREEN}.
625-
* @noreference Marked for deletion since newer versions are available; see
626-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
627-
*/
628-
@Deprecated(forRemoval = true, since = "2024-09")
629-
String IMG_OBJS_DND_OFFSCREEN_MASK = "IMG_OBJS_DND_OFFSCREEN_MASK"; //$NON-NLS-1$
630-
631-
/**
632-
* Cursor 'source' for the 'fast-view' arrow cursor. For cursor construction
633-
* see:
634-
*
635-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
636-
* @since 3.5
637-
* @deprecated Dropped in favor of {@link #IMG_OBJS_DND_TOFASTVIEW}. The
638-
* replacement icon does <b>not</b> require a mask.
639-
* @noreference Marked for deletion since newer versions are available; see
640-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
641-
*/
642-
@Deprecated(forRemoval = true, since = "2024-09")
643-
String IMG_OBJS_DND_TOFASTVIEW_SOURCE = "IMG_OBJS_DND_TOFASTVIEW_SOURCE"; //$NON-NLS-1$
644-
/**
645-
* Cursor 'mask' for the 'fast-view' arrow cursor. For cursor construction see:
646-
*
647-
* @see Cursor#Cursor(Device, ImageData, ImageData, int, int)
648-
* @since 3.5
649-
* @deprecated No longer needed with {@link #IMG_OBJS_DND_TOFASTVIEW}.
650-
* @noreference Marked for deletion since newer versions are available; see
651-
* https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084
652-
*/
653-
@Deprecated(forRemoval = true, since = "2024-09")
654-
String IMG_OBJS_DND_TOFASTVIEW_MASK = "IMG_OBJS_DND_TOFASTVIEW_MASK"; //$NON-NLS-1$
655-
656-
// The following set of constants represent the images that are used to
657-
// construct cursors for drag and drop operations within the workbench.
658-
// The hotspot of those cursors is the center of the image, which needs to be
659-
// calculated dynamically w.r.t. the current device zoom:
660-
// descriptor = getImageDescriptor(id);
661-
// cursor = new Cursor(display, descriptor.getImageData(100), 16, 16);
662-
// cursor = new Cursor(display, descriptor.getImageData(200), 32, 32);
663-
664452
/**
665453
* Identifies the lef arrow cursor. For cursor construction see:
666454
*

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ private static final void declareImage(String key, String disabledKey, String pa
115115
* Declares all the workbench's images, including both "shared" ones and
116116
* internal ones.
117117
*/
118-
@SuppressWarnings("removal")
119118
private static final void declareImages() {
120119
declareImage(ISharedImages.IMG_DEF_MISSING, ImageDescriptor.getMissingImageDescriptor(), true);
121120

@@ -263,22 +262,6 @@ private static final void declareImages() {
263262
declareImage(ISharedImages.IMG_OBJS_WARN_TSK, PATH_OBJECT + "warn_tsk.svg", true); //$NON-NLS-1$
264263
declareImage(ISharedImages.IMG_OBJS_INFO_TSK, PATH_OBJECT + "info_tsk.svg", true); //$NON-NLS-1$
265264

266-
declareImage(ISharedImages.IMG_OBJS_DND_LEFT_SOURCE, PATH_POINTER + "left_source.svg", true); //$NON-NLS-1$
267-
declareImage(ISharedImages.IMG_OBJS_DND_LEFT_MASK, PATH_POINTER + "left_mask.svg", true); //$NON-NLS-1$
268-
declareImage(ISharedImages.IMG_OBJS_DND_RIGHT_SOURCE, PATH_POINTER + "right_source.svg", true); //$NON-NLS-1$
269-
declareImage(ISharedImages.IMG_OBJS_DND_RIGHT_MASK, PATH_POINTER + "right_mask.svg", true); //$NON-NLS-1$
270-
declareImage(ISharedImages.IMG_OBJS_DND_TOP_SOURCE, PATH_POINTER + "top_source.svg", true); //$NON-NLS-1$
271-
declareImage(ISharedImages.IMG_OBJS_DND_TOP_MASK, PATH_POINTER + "top_mask.svg", true); //$NON-NLS-1$
272-
declareImage(ISharedImages.IMG_OBJS_DND_BOTTOM_SOURCE, PATH_POINTER + "bottom_source.svg", true); //$NON-NLS-1$
273-
declareImage(ISharedImages.IMG_OBJS_DND_BOTTOM_MASK, PATH_POINTER + "bottom_mask.svg", true); //$NON-NLS-1$
274-
declareImage(ISharedImages.IMG_OBJS_DND_INVALID_SOURCE, PATH_POINTER + "invalid_source.svg", true); //$NON-NLS-1$
275-
declareImage(ISharedImages.IMG_OBJS_DND_INVALID_MASK, PATH_POINTER + "invalid_mask.svg", true); //$NON-NLS-1$
276-
declareImage(ISharedImages.IMG_OBJS_DND_STACK_SOURCE, PATH_POINTER + "stack_source.svg", true); //$NON-NLS-1$
277-
declareImage(ISharedImages.IMG_OBJS_DND_STACK_MASK, PATH_POINTER + "stack_mask.svg", true); //$NON-NLS-1$
278-
declareImage(ISharedImages.IMG_OBJS_DND_OFFSCREEN_SOURCE, PATH_POINTER + "offscreen_source.svg", true); //$NON-NLS-1$
279-
declareImage(ISharedImages.IMG_OBJS_DND_OFFSCREEN_MASK, PATH_POINTER + "offscreen_mask.svg", true); //$NON-NLS-1$
280-
declareImage(ISharedImages.IMG_OBJS_DND_TOFASTVIEW_SOURCE, PATH_POINTER + "tofastview_source.svg", true); //$NON-NLS-1$
281-
declareImage(ISharedImages.IMG_OBJS_DND_TOFASTVIEW_MASK, PATH_POINTER + "tofastview_mask.svg", true); //$NON-NLS-1$
282265
declareImage(ISharedImages.IMG_OBJS_DND_LEFT, PATH_POINTER + "left.svg", true); //$NON-NLS-1$
283266
declareImage(ISharedImages.IMG_OBJS_DND_RIGHT, PATH_POINTER + "right.svg", true); //$NON-NLS-1$
284267
declareImage(ISharedImages.IMG_OBJS_DND_TOP, PATH_POINTER + "top.svg", true); //$NON-NLS-1$

‎bundles/org.eclipse.ui/icons/full/pointer/bottom_mask.svg‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)