Deprecate Image(Rectangle) constructor and replace usages

Deprecate Image constructor that accepts Rectangle in favor of
Image(display, width, height).

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -338,7 +338,11 @@ public Image(Device device, Image srcImage, int flag) {
  * </ul>
  *
  * @see #dispose()
+ *
+ * @deprecated use {@link Image#Image(Device, int, int)} instead
+ * @since 3.130
  */
+@Deprecated
 public Image(Device device, Rectangle bounds) {
 	super(device);
 	if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet215.java

@@ -38,7 +38,8 @@ public static void main(String[] args) {
 
 		/* Take the screen shot */
 		GC gc = new GC(display);
-		final Image image = new Image(display, display.getBounds());
+		Rectangle rect = display.getBounds();
+		final Image image = new Image(display, rect.width, rect.height);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();
 

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet292.java

@@ -55,7 +55,8 @@ public static void main(String[] args) {
 		button.addListener (SWT.Selection, e -> {
 			Image image = label.getImage ();
 			if (image != null) image.dispose ();
-			image = new Image (display, group.getBounds ());
+			Rectangle rect = group.getBounds();
+			image = new Image (display, rect.width, rect.height);
 			GC gc = new GC (image);
 			boolean success = group.print (gc);
 			gc.dispose ();

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java

@@ -124,35 +124,35 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 	Image image;
 	IllegalArgumentException e;
 	Rectangle bounds1 = null;
-	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds1));
+	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds1.width, bounds1.height));
 	assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e);
 
 	Rectangle bounds2 = new Rectangle(0, 0, -1, 10);
-	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds2));
+	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds2.width, bounds2.height));
 	assertSWTProblem("Incorrect exception thrown for width < 0", SWT.ERROR_INVALID_ARGUMENT, e);
 
 	Rectangle bounds3 = new Rectangle(0, 0, 0, 10);
-	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds3));
+	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds3.width, bounds3.height));
 	assertSWTProblem("Incorrect exception thrown for width == 0", SWT.ERROR_INVALID_ARGUMENT, e);
 
 	Rectangle bounds4 = new Rectangle(0, 0, 10, -1);
-	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds4));
+	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds4.width, bounds4.height));
 	assertSWTProblem("Incorrect exception thrown for height < 0", SWT.ERROR_INVALID_ARGUMENT, e);
 
 	Rectangle bounds5 = new Rectangle(0, 0, 10, 0);
-	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds5));
+	e = assertThrows(IllegalArgumentException.class, () -> new Image(display, bounds5.width, bounds5.height));
 	assertSWTProblem("Incorrect exception thrown for height == 0", SWT.ERROR_INVALID_ARGUMENT, e);
 
 	// valid images
 	Rectangle bounds = new Rectangle(-1, -10, 10, 10);
-	image = new Image(display, bounds);
+	image = new Image(display, bounds.width, bounds.height);
 	image.dispose();
 
 	bounds = new Rectangle(0, 0, 10, 10);
-	image = new Image(null, bounds);
+	image = new Image(null, bounds.width, bounds.height);
 	image.dispose();
 
-	image = new Image(display, bounds);
+	image = new Image(display, bounds.width, bounds.height);
 	image.dispose();
 }
 
@@ -522,7 +522,7 @@ public void test_getBounds() {
 	image.dispose();
 	assertEquals(bounds, bounds1);
 
-	image = new Image(display, bounds);
+	image = new Image(display, bounds.width, bounds.height);
 	bounds1 = image.getBounds();
 	image.dispose();
 	assertEquals(bounds, bounds1);
@@ -694,7 +694,7 @@ void getImageData_int(int zoom) {
 	assertEquals(":a: Size of ImageData returned from Image.getImageData(int) method doesn't return matches with bounds in Pixel values.", scaleBounds(bounds, zoom, 100), boundsAtZoom);
 
 	// creates second bitmap image and compare size of imageData
-	image = new Image(display, bounds);
+	image = new Image(display, bounds.width, bounds.height);
 	imageDataAtZoom = image.getImageData(zoom);
 	boundsAtZoom = new Rectangle(0, 0, imageDataAtZoom.width, imageDataAtZoom.height);
 	bounds = image.getBounds();

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java

@@ -1009,7 +1009,8 @@ public void test_bug568740_multilineTextStyle() {
 private Image draw(TextLayout layout, int antialias) {
 	GC gc = null;
 	try {
-		Image image = new Image(display, layout.getBounds());
+		Rectangle rect = layout.getBounds();
+		Image image = new Image(display, rect.width, rect.height);
 		gc = new GC(image);
 		gc.setBackground(display.getSystemColor(SWT.COLOR_WHITE));
 		gc.fillRectangle(image.getBounds());

tests/org.eclipse.swt.tests/ManualTests/org/eclipse/swt/tests/manual/Bug529534_CTabFolder_topRight_wrapped.java

@@ -96,7 +96,7 @@ public static void main(String[] args) {
 
 	private static Image image(Display display, int shapeColor) {
 		Rectangle bounds = new Rectangle(0, 0, 16, 16);
-		Image image = new Image(display, bounds);
+		Image image = new Image(display, bounds.width, bounds.height);
 		GC gc = new GC(image);
 		gc.setBackground(display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
 		gc.fillRectangle(bounds);