Replace usages of new Image(device, width, height)

Replacing it with imageGcDrawer

Author: ShahzaibIbrahim

bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java

@@ -359,14 +359,11 @@ private void saveToFile(boolean prompt) {
 			if (saveImages) {
 				String suffix = String.format("%05d.png", i++);
 				String pngName = String.format("%s_%s", fileName, suffix);
-				Image image = new Image(saveAs.getDisplay(), 100, 100);
+				final ImageGcDrawer imageGcDrawer = (gc, width, height) -> {
+					draw(gc, object);
+				};
+				Image image = new Image(saveAs.getDisplay(), imageGcDrawer, 100, 100);
 				try {
-					GC gc = new GC(image);
-					try {
-						draw(gc, object);
-					} finally {
-						gc.dispose();
-					}
 					ImageLoader loader = new ImageLoader();
 					loader.data = new ImageData[] { image.getImageData() };
 					loader.save(pngName, SWT.IMAGE_PNG);

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java

@@ -1593,31 +1593,31 @@ void createCaretBitmaps() {
 		leftCaretBitmap.dispose();
 	}
 	int lineHeight = renderer.getLineHeight();
-	leftCaretBitmap = new Image(display, caretWidth, lineHeight);
-	GC gc = new GC (leftCaretBitmap);
-	gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
-	gc.fillRectangle(0, 0, caretWidth, lineHeight);
-	gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
-	gc.drawLine(0,0,0,lineHeight);
-	gc.drawLine(0,0,caretWidth-1,0);
-	gc.drawLine(0,1,1,1);
-	gc.dispose();
+	final ImageGcDrawer imageGcDrawer = (gc, width, height) -> {
+		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.fillRectangle(0, 0, width, height);
+		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
+		gc.drawLine(0,0,0,height);
+		gc.drawLine(0,0,width-1,0);
+		gc.drawLine(0,1,1,1);
+	};
+	leftCaretBitmap = new Image(display, imageGcDrawer, caretWidth, lineHeight);
 
 	if (rightCaretBitmap != null) {
 		if (defaultCaret != null && rightCaretBitmap.equals(defaultCaret.getImage())) {
 			defaultCaret.setImage(null);
 		}
 		rightCaretBitmap.dispose();
 	}
-	rightCaretBitmap = new Image(display, caretWidth, lineHeight);
-	gc = new GC (rightCaretBitmap);
-	gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
-	gc.fillRectangle(0, 0, caretWidth, lineHeight);
-	gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
-	gc.drawLine(caretWidth-1,0,caretWidth-1,lineHeight);
-	gc.drawLine(0,0,caretWidth-1,0);
-	gc.drawLine(caretWidth-1,1,1,1);
-	gc.dispose();
+	final ImageGcDrawer imageGcDrawer1 = (gc, width, height) -> {
+		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
+		gc.fillRectangle(0, 0, width, height);
+		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
+		gc.drawLine(width-1,0,width-1,height);
+		gc.drawLine(0,0,width-1,0);
+		gc.drawLine(width-1,1,1,1);
+	};
+	rightCaretBitmap = new Image(display, imageGcDrawer1, caretWidth, lineHeight);
 }
 /**
  * Moves the selected text to the clipboard.  The text will be put in the