Use new GC Api

Author: akoch-yatta

org.eclipse.draw2d/src/org/eclipse/draw2d/Graphics.java

@@ -139,6 +139,18 @@ public final void drawFocus(Rectangle r) {
 	 */
 	public abstract void drawImage(Image srcImage, int x, int y);
 
+	/**
+	 * Draws the given Image at the location (x,y) with the provided size (width,
+	 * height).
+	 *
+	 * @param srcImage the Image
+	 * @param x        the x coordinate of the destination
+	 * @param y        the y coordinate of the destination
+	 * @param width    the width of the destination
+	 * @param height   the height of the destination
+	 */
+	public abstract void drawImage(Image srcImage, int x, int y, int width, int height);
+
 	/**
 	 * Draws a rectangular section of the given Image to the specified rectangular
 	 * reagion on the canvas. The section of the image bounded by the rectangle
@@ -168,6 +180,16 @@ public final void drawImage(Image image, Point p) {
 		drawImage(image, p.x, p.y);
 	}
 
+	/**
+	 * @see #drawImage(Image, int, int, int, int)
+	 *
+	 * @param srcImage the Image
+	 * @param dest     the destination bounds
+	 */
+	public final void drawImage(Image srcImage, Rectangle dest) {
+		drawImage(srcImage, dest.x, dest.y, dest.width, dest.height);
+	}
+
 	/**
 	 * @see #drawImage(Image, int, int, int, int, int, int, int, int)
 	 */

org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java

@@ -83,6 +83,11 @@ public void drawImage(Image srcImage, int x, int y) {
 		super.drawImage(printerImage(srcImage), x, y);
 	}
 
+	@Override
+	public void drawImage(Image srcImage, int x, int y, int width, int height) {
+		super.drawImage(printerImage(srcImage), x, y, width, height);
+	}
+
 	/**
 	 * @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int)
 	 */

org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java

@@ -419,6 +419,15 @@ public void drawImage(Image srcImage, int x, int y) {
 		gc.drawImage(srcImage, x + translateX, y + translateY);
 	}
 
+	/**
+	 * @see Graphics#drawImage(Image, int, int, int, int)
+	 */
+	@Override
+	public void drawImage(Image srcImage, int x, int y, int width, int height) {
+		checkGC();
+		gc.drawImage(srcImage, x + translateX, y + translateY, width, height);
+	}
+
 	/**
 	 * @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int)
 	 */

org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java

@@ -259,6 +259,13 @@ public void drawImage(Image srcImage, int x, int y) {
 				(int) (Math.floor((size.height * zoom + fractionalY))));
 	}
 
+	@Override
+	public void drawImage(Image srcImage, int x, int y, int width, int height) {
+		graphics.drawImage(srcImage, (int) (Math.floor((x * zoom + fractionalX))),
+				(int) (Math.floor((y * zoom + fractionalY))), (int) (Math.floor((width * zoom + fractionalX))),
+				(int) (Math.floor((height * zoom + fractionalY))));
+	}
+
 	/** @see Graphics#drawImage(Image, int, int, int, int, int, int, int, int) */
 	@Override
 	public void drawImage(Image srcImage, int sx, int sy, int sw, int sh, int tx, int ty, int tw, int th) {
@@ -994,7 +1001,7 @@ private TextLayout zoomTextLayout(TextLayout layout) {
 
 		if (zoomWidth < -1 || zoomWidth == 0) {
 			return null;
-		} 
+		}
 
 		TextLayout zoomed = new TextLayout(Display.getCurrent());
 		zoomed.setText(layout.getText());