[win32] Move of unified code from Wrapper to Image

This commit moves the code that is equal to all AbstractImageProviderWrapper
implementations back to Image.

Author: akoch-yatta

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

@@ -98,6 +98,11 @@ public final class Image extends Resource implements Drawable {
 	 */
 	private boolean isInitialized;
 
+	/**
+	 * this field is used to mark destroyed images
+	 */
+	private boolean isDestroyed;
+
 	/**
 	 * specifies the transparent pixel
 	 */
@@ -521,7 +526,7 @@ public Image (Device device, String filename) {
 		}
 		return null;
 	});
-	if (imageProvider.getImageData(100) == null) {
+	if (imageProvider.newImageData(100) == null) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
 				": [" + filename + "] returns null ImageData at 100% zoom.");
 	}
@@ -562,7 +567,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
-	if (imageProvider.getImageData(100) == null) {
+	if (imageProvider.newImageData(100) == null) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
 				": ImageFileNameProvider [" + imageFileNameProvider + "] returns null ImageData at 100% zoom.");
 	}
@@ -1003,7 +1008,7 @@ public static void drawScaled(GC gc, Image original, int width, int height, floa
 void destroy () {
 	device.deregisterResourceWithZoomSupport(this);
 	if (memGC != null) memGC.dispose();
-	this.imageProvider.destroy();
+	this.isDestroyed = true;
 	destroyHandle();
 	memGC = null;
 }
@@ -1229,7 +1234,10 @@ public ImageData getImageData() {
  */
 public ImageData getImageData (int zoom) {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	return imageProvider.getImageData(zoom);
+	if (zoomLevelToImageHandle.containsKey(zoom)) {
+		return zoomLevelToImageHandle.get(zoom).getImageData();
+	}
+	return this.imageProvider.newImageData(zoom);
 }
 
 
@@ -1766,7 +1774,7 @@ public void internal_dispose_GC (long hDC, GCData data) {
  */
 @Override
 public boolean isDisposed() {
-	return this.imageProvider.isDisposed();
+	return !isInitialized || isDestroyed;
 }
 
 /**
@@ -1850,17 +1858,9 @@ public static Image win32_new(Device device, int type, long handle, int nativeZo
 }
 
 private abstract class AbstractImageProviderWrapper {
-	private boolean isDestroyed;
 
 	protected abstract Rectangle getBounds(int zoom);
 
-	protected final ImageData getImageData(int zoom) {
-		if (zoomLevelToImageHandle.containsKey(zoom)) {
-			return zoomLevelToImageHandle.get(zoom).getImageData();
-		}
-		return newImageData(zoom);
-	}
-
 	abstract ImageData newImageData(int zoom);
 
 	abstract AbstractImageProviderWrapper createCopy(Image image);
@@ -1892,14 +1892,6 @@ protected final ImageHandle newImageHandle(ImageData data, int zoom) {
 			return init(data, zoom);
 		}
 	}
-
-	protected boolean isDisposed() {
-		return !isInitialized || isDestroyed;
-	}
-
-	protected void destroy() {
-		this.isDestroyed = true;
-	}
 }
 
 private class ExistingImageHandleProviderWrapper extends AbstractImageProviderWrapper {
@@ -1944,7 +1936,7 @@ private abstract class ImageFromImageDataProviderWrapper extends AbstractImagePr
 	void initImage() {
 		// As the init call configured some Image attributes (e.g. type)
 		// it must be called
-		getImageData(100);
+		newImageData(100);
 	}
 
 	@Override