From 3bea8b8fa2136cd0e821113ba46edd474675339a Mon Sep 17 00:00:00 2001 From: Shahzaib Ibrahim Date: Fri, 2 May 2025 16:43:08 +0200 Subject: [PATCH 1/2] Replacing usages of Image(Display, Rectangle) Replacing usages of Image(Display, Rectangle) in favor of Image(Display, int ,int) since the prior one is getting deprecated. --- .../src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java | 4 +++- .../jface/tests/internal/databinding/swt/Screenshots.java | 2 +- .../org/eclipse/jface/tests/widgets/AbstractFactoryTest.java | 3 +-- .../eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.e4.ui.workbench3/src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java b/bundles/org.eclipse.e4.ui.workbench3/src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java index e7a0888913c..9184403f2de 100644 --- a/bundles/org.eclipse.e4.ui.workbench3/src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java +++ b/bundles/org.eclipse.e4.ui.workbench3/src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java @@ -42,6 +42,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; +import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -285,7 +286,8 @@ public void run() { // Take a screenshot: GC gc = new GC(display); - final Image image = new Image(display, display.getBounds()); + Rectangle bounds = display.getBounds(); + final Image image = new Image(display, bounds.width, bounds.height); gc.copyArea(image, 0, 0); gc.dispose(); diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java index 81a7805e1b8..d08947505a9 100644 --- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java +++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java @@ -89,7 +89,7 @@ public static String takeScreenshot(Class testClass, String name, PrintStream GC gc = new GC(display); Rectangle displayBounds= display.getBounds(); out.println("Display @ " + displayBounds); - final Image image = new Image(display, displayBounds); + final Image image = new Image(display, displayBounds.width, displayBounds.height); gc.copyArea(image, 0, 0); gc.dispose(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java index 09da9cceb74..6217a391e87 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java @@ -14,7 +14,6 @@ package org.eclipse.jface.tests.widgets; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Shell; import org.junit.After; import org.junit.AfterClass; @@ -27,7 +26,7 @@ public class AbstractFactoryTest { @BeforeClass public static void classSetup() { - image = new Image(null, new Rectangle(1, 1, 1, 1)); + image = new Image(null, 1, 1); } @Before diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java index 8bc8393b0e9..baecc53cbf8 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/ScreenshotTest.java @@ -117,7 +117,7 @@ public static String takeScreenshot(Class testClass, String name, PrintStream GC gc = new GC(display); Rectangle displayBounds= display.getBounds(); out.println("Display @ " + displayBounds); - final Image image = new Image(display, displayBounds); + final Image image= new Image(display, displayBounds.width, displayBounds.height); gc.copyArea(image, 0, 0); gc.dispose(); From 6b9497e631c8bf9c3b6f83546186fa6a92e7df6a Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 2 May 2025 14:49:43 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF index 74fb453870d..122b6492366 100644 --- a/bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.workbench3;singleton:=true -Bundle-Version: 0.17.400.qualifier +Bundle-Version: 0.17.500.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin