cleanup

Author: Michael5601

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SizeAwareImageDataProvider.java

@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Vector Informatik GmbH and others.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Michael Bangas (Vector Informatik GmbH) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.swt.graphics;
 
 import java.util.*;

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/SizeAwareImageFileNameProvider.java

@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Vector Informatik GmbH and others.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Michael Bangas (Vector Informatik GmbH) - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.swt.graphics;
 
 import java.util.*;

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

@@ -1134,7 +1134,7 @@ private void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHei
 		int destWidth, int destHeight, int imageZoom, int scaledImageZoom) {
 	Rectangle src;
 	Rectangle dest;
-	if(image.createdWithTargetSize()) {
+	if (image.createdWithTargetSize()) {
 		dest = new Rectangle(destX, destY, destWidth, destHeight);
 		src = dest;
 	} else {

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

@@ -566,11 +566,9 @@ public Image (Device device, String filename) {
 public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
-	if (!(imageFileNameProvider instanceof SizeAwareImageFileNameProvider)) {
-		if (imageFileNameProvider.getImagePath(100) == null) {
+	if (imageFileNameProvider.getImagePath(100) == null) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
 				": ImageFileNameProvider [" + imageFileNameProvider + "] returns null fileName at 100% zoom.");
-		}
 	}
 	init();
 	this.device.registerResourceWithZoomSupport(this);
@@ -608,11 +606,9 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 public Image(Device device, ImageDataProvider imageDataProvider) {
 	super(device);
 	this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
-	if (!(imageDataProvider instanceof SizeAwareImageDataProvider)) {
-		if (imageDataProvider.getImageData(100) == null) {
-			SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
-					": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
-		}
+	if (imageDataProvider.getImageData(100) == null) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
+				": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
 	}
 	init();
 	this.device.registerResourceWithZoomSupport(this);
@@ -1167,11 +1163,7 @@ public Color getBackground() {
  */
 public Rectangle getBounds() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	if(this.imageProvider.isSizeAware()) {
-		return new Rectangle(0, 0, 16, 16);
-	} else {
-		return getBounds(100);
-	}
+	return getBounds (100);
 }
 
 Rectangle getBounds(int zoom) {
@@ -1913,6 +1905,49 @@ public static Image win32_new(Device device, int type, long handle, int nativeZo
 	return new Image(device, type, handle, nativeZoom);
 }
 
+private <T> Optional<T> getElementAtTargetSize(BiFunction<Integer, Integer, Optional<T>> elementForZoomProvider,
+		int targetWidth, int targetHeight) {
+	Rectangle originalSize = getBounds(100);
+	int originalWidth = originalSize.width;
+	int originalHeight = originalSize.height;
+
+	Optional<T> dataAtOriginalZoom = elementForZoomProvider.apply(targetWidth, targetHeight);
+	if (dataAtOriginalZoom.isPresent()) {
+		T data = dataAtOriginalZoom.get();
+		if (data instanceof String fileName) {
+			ImageData imageData = ImageDataLoader.loadByTargetSize(fileName, targetWidth, targetHeight);
+			if (imageData.width == targetWidth && imageData.height == targetHeight) {
+				return dataAtOriginalZoom;
+			}
+		} else if (data instanceof ImageData)
+			return dataAtOriginalZoom;
+	}
+
+	if (targetWidth >= originalWidth && targetWidth <= originalWidth * 1.5) {
+		Optional<T> dataAt150Percent = elementForZoomProvider.apply((int) Math.round(originalWidth * 1.5),
+				(int) Math.round(originalHeight * 1.5));
+		if (dataAt150Percent.isPresent()) {
+			return dataAt150Percent;
+		}
+	}
+
+	if (targetWidth > originalWidth) {
+		Optional<T> dataAt200Percent = elementForZoomProvider.apply(originalWidth * 2, originalHeight * 2);
+		if (dataAt200Percent.isPresent()) {
+			return dataAt200Percent;
+		}
+	}
+
+	if (targetWidth != originalWidth) {
+		Optional<T> dataAt100Percent = elementForZoomProvider.apply(originalWidth, originalHeight);
+		if (dataAt100Percent.isPresent()) {
+			return dataAt100Percent;
+		}
+	}
+
+	return Optional.empty();
+}
+
 private abstract class AbstractImageProviderWrapper {
 
 	protected boolean sizeAware = false;
@@ -1933,7 +1968,9 @@ public Collection<Integer> getPreservedZoomLevels() {
 
 	abstract ImageData newImageData(int zoom);
 
-	abstract ImageData newImageData(int targetWidth, int targetHeight);
+	ImageData newImageData(int targetWidth, int targetHeight) {
+		throw new UnsupportedOperationException();
+	};
 
 	abstract AbstractImageProviderWrapper createCopy(Image image);
 
@@ -2011,8 +2048,6 @@ private abstract class ImageFromImageDataProviderWrapper extends AbstractImagePr
 
 	protected abstract ElementAtZoom<ImageData> loadImageData(int zoom);
 
-	protected abstract ImageData loadImageData(int targetWidth, int targetHeight);
-
 	void initImage() {
 		// As the init call configured some Image attributes (e.g. type)
 		// it must be called
@@ -2030,14 +2065,6 @@ ImageData newImageData(int zoom) {
 		return cachedImageData.computeIfAbsent(zoom, imageDataRetrieval);
 	}
 
-	@Override
-	ImageData newImageData(int targetWidth, int targetHeight) {
-		ImageData imageDataAtTargetSize = loadImageData(targetWidth, targetHeight);
-		ImageData imageData = DPIUtil.autoScaleImageData(device, imageDataAtTargetSize, targetWidth, targetHeight);
-		imageData = adaptImageDataIfDisabledOrGray(imageData);
-		return imageData;
-	}
-
 	@Override
 	protected ImageHandle newImageHandle(int zoom) {
 		ImageData cachedData = cachedImageData.remove(zoom);
@@ -2081,11 +2108,6 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 		return new ElementAtZoom<>(imageDataAtBaseZoom, baseZoom);
 	}
 
-	@Override
-	protected ImageData loadImageData(int targetWidth, int targetHeight) {
-		return null;
-	}
-
 	@Override
 	AbstractImageProviderWrapper createCopy(Image image) {
 		return image.new PlainImageDataProviderWrapper(this.imageDataAtBaseZoom);
@@ -2121,11 +2143,6 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 	AbstractImageProviderWrapper createCopy(Image image) {
 		return image.new MaskedImageDataProviderWrapper(this.srcAt100, this.maskAt100);
 	}
-
-	@Override
-	protected ImageData loadImageData(int targetWidth, int targetHeight) {
-		return null;
-	}
 }
 
 private class ImageDataLoaderStreamProviderWrapper extends ImageFromImageDataProviderWrapper {
@@ -2149,11 +2166,6 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 		return ImageDataLoader.load(new ByteArrayInputStream(inputStreamData), FileFormat.DEFAULT_ZOOM, zoom);
 	}
 
-	@Override
-	protected ImageData loadImageData(int targetWidth, int targetHeight) {
-		return ImageDataLoader.loadByTargetSize(new ByteArrayInputStream(inputStreamData), targetWidth, targetHeight);
-	}
-
 	@Override
 	protected Rectangle getBounds(int zoom) {
 		ImageData scaledImageData = getImageData(zoom);
@@ -2209,11 +2221,6 @@ ImageData newImageData(int zoom) {
 		return getScaledImageData(zoom);
 	}
 
-	@Override
-	ImageData newImageData(int targetWidth, int targetHeight) {
-		return null;
-	}
-
 	@Override
 	protected ImageHandle newImageHandle(int zoom) {
 		if (zoomLevelToImageHandle.isEmpty()) {
@@ -2363,12 +2370,11 @@ protected Rectangle getBounds(int zoom) {
 private class ImageFileNameProviderWrapper extends BaseImageProviderWrapper<ImageFileNameProvider> {
 	ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
 		super(provider, ImageFileNameProvider.class);
-		// Checks for the contract of the passed provider require
-		// checking for valid image data creation
 		if (provider instanceof SizeAwareImageFileNameProvider) {
 			this.sizeAware = true;
-			return;
 		}
+		// Checks for the contract of the passed provider require
+		// checking for valid image data creation
 		newImageData(DPIUtil.getDeviceZoom());
 	}
 
@@ -2402,8 +2408,11 @@ protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 	@Override
 	protected ImageData loadImageData(int targetWidth, int targetHeight) {
 		Optional<String> fileForTargetSize = validateAndGetImagePathAtTargetSize(provider, targetWidth, targetHeight);
-		ImageData imageDataAtZoom = ImageDataLoader.loadByTargetSize(fileForTargetSize.get(), targetWidth, targetWidth);
-		return imageDataAtZoom;
+		if(fileForTargetSize.isPresent()) {
+			ImageData imageDataAtZoom = ImageDataLoader.loadByTargetSize(fileForTargetSize.get(), targetWidth, targetWidth);
+			return imageDataAtZoom;
+		}
+		return null;
 	}
 
 	private Optional<String> validateAndGetImagePathAtTargetSize(ImageFileNameProvider provider, int targetWidth, int targetHeight) {
@@ -2428,42 +2437,6 @@ private Optional<String> validateAndGetImagePathAtTargetSize(ImageFileNameProvid
 		}
 	}
 
-	private Optional<String> getElementAtTargetSize(BiFunction<Integer, Integer, Optional<String>> elementForZoomProvider,
-			int targetWidth, int targetHeight) {
-
-		Rectangle originalSize = getBounds(100);
-		int originalWidth = originalSize.width;
-		int originalHeight = originalSize.height;
-
-		Optional<String> dataAtOriginalZoom = elementForZoomProvider.apply(targetWidth, targetHeight);
-		if (dataAtOriginalZoom != null) {
-			ImageData data = ImageDataLoader.loadByTargetSize(dataAtOriginalZoom.get(), targetWidth, targetWidth);
-			if (data.width == targetWidth && data.height == targetHeight) {
-				return dataAtOriginalZoom;
-			}
-		}
-
-		if (targetWidth >= originalWidth && targetWidth <= originalWidth * 1.5) {
-			Optional<String> dataAt150Percent = elementForZoomProvider.apply((int) Math.round(originalWidth * 1.5), (int) Math.round(originalHeight * 1.5));
-			if (dataAt150Percent != null) {
-				return dataAt150Percent;
-			}
-		}
-		if (targetWidth > originalWidth) {
-			Optional<String> dataAt200Percent = elementForZoomProvider.apply(originalWidth * 2, originalHeight * 2);
-			if (dataAt200Percent != null) {
-				return dataAt200Percent;
-			}
-		}
-		if (targetWidth != originalWidth) {
-			Optional<String> dataAt100Percent = elementForZoomProvider.apply(originalWidth, originalHeight);
-			if (dataAt100Percent != null) {
-				return dataAt100Percent;
-			}
-		}
-		return null;
-	}
-
 	@Override
 	public int hashCode() {
 		return Objects.hash(provider, styleFlag, transparentPixel);
@@ -2700,45 +2673,6 @@ private Optional<ImageData> validateAndGetImageDataAtTargetSize(int targetWidth,
 		return imageDataAtTargetSize;
 	}
 
-	private Optional<ImageData> getElementAtTargetSize(BiFunction<Integer, Integer, Optional<ImageData>> elementForZoomProvider, int targetWidth, int targetHeight) {
-		Rectangle originalSize = getBounds(100);
-		int originalWidth = originalSize.width;
-		int originalHeight = originalSize.height;
-
-		Optional<ImageData> dataAtOriginalZoom = elementForZoomProvider.apply(targetWidth, targetHeight);
-		if (dataAtOriginalZoom.isPresent()) {
-			ImageData imageData = dataAtOriginalZoom.get();
-			if (imageData.width == targetWidth && imageData.height == targetHeight) {
-				return dataAtOriginalZoom;
-			}
-		}
-
-		if (targetWidth >= originalWidth && targetWidth <= originalWidth * 1.5) {
-			Optional<ImageData> dataAt150Percent = elementForZoomProvider.apply((int) Math.round(originalWidth * 1.5),
-					(int) Math.round(originalHeight * 1.5));
-			if (dataAt150Percent.isPresent()) {
-				return dataAt150Percent;
-			}
-		}
-
-		if (targetWidth > originalWidth) {
-			Optional<ImageData> dataAt200Percent = elementForZoomProvider.apply(originalWidth * 2, originalHeight * 2);
-			if (dataAt200Percent.isPresent()) {
-				return dataAt200Percent;
-			}
-		}
-
-		if (targetWidth != originalWidth) {
-			Optional<ImageData> dataAt100Percent = elementForZoomProvider.apply(originalWidth, originalHeight);
-			if (dataAt100Percent.isPresent()) {
-				return dataAt100Percent;
-			}
-		}
-
-		return Optional.empty();
-	}
-
-
 	@Override
 	ImageDataProviderWrapper createCopy(Image image) {
 		return image.new ImageDataProviderWrapper(provider);

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

@@ -63,15 +63,14 @@ public String getImagePath(int zoom) {
 			}
 		};
 		Shell shell = new Shell(Display.getDefault(), SWT.SHELL_TRIM | SWT.DOUBLE_BUFFERED);
-		shell.setText("Snippet 386");
 		Image imageWithFileNameProvider = new Image(Display.getDefault(), validImageFileNameProvider);
 		shell.addListener(SWT.Paint, e -> {
 			Rectangle rect = imageWithFileNameProvider.getBounds();
 			int width = rect.width;
 			int height = rect.height;
 			GC gc = e.gc;
 			int x = 0, y = 0;
-			gc.drawImage(imageWithFileNameProvider, 0, 0, width, height, x, y, 200, 660);
+			gc.drawImage(imageWithFileNameProvider, 0, 0, width, height, x, y, 128, 128);
 		});
 		shell.setSize(600, 400);
 		shell.open();
@@ -111,7 +110,6 @@ public ImageData getImageData(int zoom) {
 
 		};
 		Shell shell = new Shell(Display.getDefault(), SWT.SHELL_TRIM | SWT.DOUBLE_BUFFERED);
-		shell.setText("Snippet 386");
 		Image imageWithDataProvider = new Image(Display.getDefault(), validImageDataProvider);
 		shell.addListener(SWT.Paint, e -> {
 			Rectangle rect = imageWithDataProvider.getBounds();

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

@@ -52,20 +52,6 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvid
 		assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e);
 	}
 
-	@Test
-	public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageFileNameProvider_TargetSize() {
-		ImageFileNameProvider validImageFileNameProvider = (zoom) -> getPath("collapseall.svg");
-
-		Image image = new Image(Display.getDefault(), validImageFileNameProvider);
-		image.dispose();
-
-		ImageFileNameProvider corruptImageFileNameProvider = (zoom) -> getPath("corrupt.svg");
-
-		SWTException e = assertThrows(SWTException.class,
-				() -> new Image(Display.getDefault(), corruptImageFileNameProvider));
-		assertSWTProblem("Incorrect exception thrown for provider with corrupt images", SWT.ERROR_INVALID_IMAGE, e);
-	}
-
 	@Test
 	public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider() {
 		ImageDataProvider validImageDataProvider = zoom -> {