diff --git a/bundles/org.eclipse.ui.workbench/.settings/.api_filters b/bundles/org.eclipse.ui.workbench/.settings/.api_filters index 4614ab0685b..51a1f09e62b 100644 --- a/bundles/org.eclipse.ui.workbench/.settings/.api_filters +++ b/bundles/org.eclipse.ui.workbench/.settings/.api_filters @@ -1,5 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java index 0601c3b7a6e..d5aa09b49dd 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java @@ -449,218 +449,6 @@ public interface ISharedImages { */ String IMG_TOOL_UP_DISABLED = "IMG_TOOL_UP_DISABLED"; //$NON-NLS-1$ - // The following set of constants represent the image pairs that are used - // to construct cursors for drag and drop operations within the workbench - // Each cursor is represented by two images; the 'source' and the 'mask' - // These need to be combined using the following code snippet: - // source = getImageDescriptor(sourceId); - // mask = getImageDescriptor(maskId); - // cursor = new Cursor(display, source.getImageData(), mask.getImageData(), 16, - // 16); - - /** - * Cursor 'source' for the left arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_LEFT}. The replacement - * icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_LEFT_SOURCE = "IMG_OBJS_DND_LEFT_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the left arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_LEFT}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_LEFT_MASK = "IMG_OBJS_DND_LEFT_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the right arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_RIGHT}. The replacement - * icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_RIGHT_SOURCE = "IMG_OBJS_DND_RIGHT_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the right arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_RIGHT}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_RIGHT_MASK = "IMG_OBJS_DND_RIGHT_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the up arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_TOP}. The replacement - * icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_TOP_SOURCE = "IMG_OBJS_DND_TOP_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the up arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_TOP}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_TOP_MASK = "IMG_OBJS_DND_TOP_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the down arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_BOTTOM}. The replacement - * icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_BOTTOM_SOURCE = "IMG_OBJS_DND_BOTTOM_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the down arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_BOTTOM}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_BOTTOM_MASK = "IMG_OBJS_DND_BOTTOM_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the 'no drop' arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_INVALID}. The - * replacement icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_INVALID_SOURCE = "IMG_OBJS_DND_INVALID_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the 'no drop' arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_INVALID}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_INVALID_MASK = "IMG_OBJS_DND_INVALID_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the 'in stack' arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_STACK}. The replacement - * icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_STACK_SOURCE = "IMG_OBJS_DND_STACK_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the 'in stack' arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_STACK}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_STACK_MASK = "IMG_OBJS_DND_STACK_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the 'off-screen' (detached window) arrow cursor. For - * cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_OFFSCREEN}. The - * replacement icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_OFFSCREEN_SOURCE = "IMG_OBJS_DND_OFFSCREEN_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the 'off-screen' (detached window) arrow cursor. For cursor - * construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_OFFSCREEN}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_OFFSCREEN_MASK = "IMG_OBJS_DND_OFFSCREEN_MASK"; //$NON-NLS-1$ - - /** - * Cursor 'source' for the 'fast-view' arrow cursor. For cursor construction - * see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated Dropped in favor of {@link #IMG_OBJS_DND_TOFASTVIEW}. The - * replacement icon does not require a mask. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_TOFASTVIEW_SOURCE = "IMG_OBJS_DND_TOFASTVIEW_SOURCE"; //$NON-NLS-1$ - /** - * Cursor 'mask' for the 'fast-view' arrow cursor. For cursor construction see: - * - * @see Cursor#Cursor(Device, ImageData, ImageData, int, int) - * @since 3.5 - * @deprecated No longer needed with {@link #IMG_OBJS_DND_TOFASTVIEW}. - * @noreference Marked for deletion since newer versions are available; see - * https://github.com/eclipse-platform/eclipse.platform.ui/pull/2084 - */ - @Deprecated(forRemoval = true, since = "2024-09") - String IMG_OBJS_DND_TOFASTVIEW_MASK = "IMG_OBJS_DND_TOFASTVIEW_MASK"; //$NON-NLS-1$ - - // The following set of constants represent the images that are used to - // construct cursors for drag and drop operations within the workbench. - // The hotspot of those cursors is the center of the image, which needs to be - // calculated dynamically w.r.t. the current device zoom: - // descriptor = getImageDescriptor(id); - // cursor = new Cursor(display, descriptor.getImageData(100), 16, 16); - // cursor = new Cursor(display, descriptor.getImageData(200), 32, 32); - /** * Identifies the lef arrow cursor. For cursor construction see: * diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java index 5faae144ca0..8c64c27f996 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java @@ -115,7 +115,6 @@ private static final void declareImage(String key, String disabledKey, String pa * Declares all the workbench's images, including both "shared" ones and * internal ones. */ - @SuppressWarnings("removal") private static final void declareImages() { declareImage(ISharedImages.IMG_DEF_MISSING, ImageDescriptor.getMissingImageDescriptor(), true); @@ -263,22 +262,6 @@ private static final void declareImages() { declareImage(ISharedImages.IMG_OBJS_WARN_TSK, PATH_OBJECT + "warn_tsk.svg", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_OBJS_INFO_TSK, PATH_OBJECT + "info_tsk.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_LEFT_SOURCE, PATH_POINTER + "left_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_LEFT_MASK, PATH_POINTER + "left_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_RIGHT_SOURCE, PATH_POINTER + "right_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_RIGHT_MASK, PATH_POINTER + "right_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_TOP_SOURCE, PATH_POINTER + "top_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_TOP_MASK, PATH_POINTER + "top_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_BOTTOM_SOURCE, PATH_POINTER + "bottom_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_BOTTOM_MASK, PATH_POINTER + "bottom_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_INVALID_SOURCE, PATH_POINTER + "invalid_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_INVALID_MASK, PATH_POINTER + "invalid_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_STACK_SOURCE, PATH_POINTER + "stack_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_STACK_MASK, PATH_POINTER + "stack_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_OFFSCREEN_SOURCE, PATH_POINTER + "offscreen_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_OFFSCREEN_MASK, PATH_POINTER + "offscreen_mask.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_TOFASTVIEW_SOURCE, PATH_POINTER + "tofastview_source.svg", true); //$NON-NLS-1$ - declareImage(ISharedImages.IMG_OBJS_DND_TOFASTVIEW_MASK, PATH_POINTER + "tofastview_mask.svg", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_OBJS_DND_LEFT, PATH_POINTER + "left.svg", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_OBJS_DND_RIGHT, PATH_POINTER + "right.svg", true); //$NON-NLS-1$ declareImage(ISharedImages.IMG_OBJS_DND_TOP, PATH_POINTER + "top.svg", true); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui/icons/full/pointer/bottom_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/bottom_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/bottom_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/bottom_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/bottom_source.svg deleted file mode 100644 index 7fa3e85371a..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/bottom_source.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/invalid_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/invalid_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/invalid_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/invalid_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/invalid_source.svg deleted file mode 100644 index 1c6b3fd3fab..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/invalid_source.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/left_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/left_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/left_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/left_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/left_source.svg deleted file mode 100644 index a6c6caafe29..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/left_source.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/offscreen_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/offscreen_mask.svg deleted file mode 100644 index c0976813a3b..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/offscreen_mask.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/offscreen_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/offscreen_source.svg deleted file mode 100644 index 3eb5ccef4c6..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/offscreen_source.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/right_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/right_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/right_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/right_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/right_source.svg deleted file mode 100644 index dc510a0a578..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/right_source.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/stack_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/stack_mask.svg deleted file mode 100644 index 661ef84c9d7..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/stack_mask.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/stack_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/stack_source.svg deleted file mode 100644 index 754f41befec..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/stack_source.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/tofastview_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/tofastview_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/tofastview_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/tofastview_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/tofastview_source.svg deleted file mode 100644 index b86ffe9c672..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/tofastview_source.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/top_mask.svg b/bundles/org.eclipse.ui/icons/full/pointer/top_mask.svg deleted file mode 100644 index 59da2b7af1c..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/top_mask.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.eclipse.ui/icons/full/pointer/top_source.svg b/bundles/org.eclipse.ui/icons/full/pointer/top_source.svg deleted file mode 100644 index 355037d3a1d..00000000000 --- a/bundles/org.eclipse.ui/icons/full/pointer/top_source.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - -