From bfa5130b8760fe2c7f9f36aa1b0677ba2722c261 Mon Sep 17 00:00:00 2001 From: Shahzaib Ibrahim Date: Mon, 7 Jul 2025 14:17:39 +0200 Subject: [PATCH] Mark Deprecated getImageDataAtCurrentZoom for removal The deprecated method getImageDataAtCurrentZoom() in Image is marked for removal along with its tests. --- .../Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java | 2 +- .../Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java | 2 +- .../Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java | 2 +- .../swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java index 5b487bb8085..3906fe6f39f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java @@ -1353,7 +1353,7 @@ public ImageData getImageData() { * multiple monitors with different DPIs, hence deprecated. Use * {@link #getImageData(int)} instead. */ -@Deprecated +@Deprecated(since = "2025-09", forRemoval = true) public ImageData getImageDataAtCurrentZoom() { return getImageData(DPIUtil.getDeviceZoom()); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java index b3c64d0406e..d27bfab6249 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java @@ -1064,7 +1064,7 @@ public ImageData getImageData () { * multiple monitors with different DPIs, hence deprecated. Use * {@link #getImageData(int)} instead. */ -@Deprecated +@Deprecated(since = "2025-09", forRemoval = true) public ImageData getImageDataAtCurrentZoom () { if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index f3694e6c5ff..aa0fd06ff03 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -1243,7 +1243,7 @@ public ImageData getImageData (int zoom) { * multiple monitors with different DPIs, hence deprecated. Use * {@link #getImageData(int)} instead. */ -@Deprecated +@Deprecated(since = "2025-09", forRemoval = true) public ImageData getImageDataAtCurrentZoom() { return applyUsingAnyHandle(ImageHandle::getImageData); } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java index db06e1c97d6..196dd819b8a 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java @@ -634,7 +634,7 @@ public void test_getBoundsInPixels() { assertEquals("Image.getBoundsInPixels method doesn't return bounds in Pixel values for ImageGcDrawer.", DPIUtil.autoScaleUp(initialBounds), boundsInPixels); } -@SuppressWarnings("deprecation") +@SuppressWarnings("removal") @Test public void test_getImageDataCurrentZoom() { Rectangle bounds = new Rectangle(0, 0, 10, 20);