Add SVG images for Draw2D and Zest icons

This moves the SVG check from GEF to Draw2D so that it can be re-used,
also for Zest. Both bundles have been adapted to also use SVG icons if
supported by the active version of SWT.

Author: ptziegler

icons/.project

@@ -22,4 +22,5 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=ree
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.draw2d
+Require-Capability: eclipse.swt;filter:="(image.format=svg)";resolution:=optional
 

icons/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2024 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -24,8 +24,8 @@
 public final class CheckBox extends Toggle {
 	private Label label = null;
 
-	static final Image UNCHECKED = FileImageDataProvider.createImage(CheckBox.class, "images/checkboxenabledoff.png"); //$NON-NLS-1$
-	static final Image CHECKED = FileImageDataProvider.createImage(CheckBox.class, "images/checkboxenabledon.png"); //$NON-NLS-1$
+	static final Image UNCHECKED = FileImageDataProvider.createImage(CheckBox.class, "images/checkboxenabledoff.svg"); //$NON-NLS-1$
+	static final Image CHECKED = FileImageDataProvider.createImage(CheckBox.class, "images/checkboxenabledon.svg"); //$NON-NLS-1$
 
 	/**
 	 * Constructs a CheckBox with no text.

icons/build.sh

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Patrick Ziegler and others.
+ * Copyright (c) 2024, 2025 Patrick Ziegler and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -43,7 +43,7 @@ public FileImageDataProvider(Class<?> clazz, String path) {
 
 	@Override
 	public ImageData getImageData(int zoom) {
-		if (zoom == 100) {
+		if (zoom == 100 || "svg".equals(fileExtension)) { //$NON-NLS-1$
 			return createImageData(basePath + '.' + fileExtension);
 		}
 		if (zoom == 200) {
@@ -67,6 +67,6 @@ private ImageData createImageData(String name) {
 	 * at an appropriate time.
 	 */
 	public static Image createImage(Class<?> clazz, String name) {
-		return new Image(null, new FileImageDataProvider(clazz, name));
+		return new Image(null, new FileImageDataProvider(clazz, ImageUtils.getEffectiveFileName(name)));
 	}
 }

org.eclipse.draw2d/META-INF/MANIFEST.MF

@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Patrick Ziegler and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Patrick Ziegler - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.draw2d.internal;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.graphics.ImageLoader;
+
+/**
+ * This utility class is used to handle the migration from GIF/PNG to SVG-based
+ * images. If {@link #getEffectiveFileName(String)} called with a {@code .svg}
+ * file, the file extension is automatically changed to {@code .png} if SVGs are
+ * not yet supported by the active SWT instance. This allows Draw2D to be
+ * executed in both the latest and older Eclipse releases.
+ */
+public final class ImageUtils {
+	private static Boolean isSvgSupported;
+
+	private ImageUtils() {
+		throw new IllegalStateException("Must never be instantiated"); //$NON-NLS-1$
+	}
+
+	/**
+	 * If {@code fileName} ends with {@code .svg}, the extension is changed to
+	 * {@code .png} if not yet supported by SWT.
+	 */
+	public static String getEffectiveFileName(String fileName) {
+		// If the SWT version doesn't yet support SVGs, fall back to PNG
+		if (!isSvgSupported() && fileName.endsWith(".svg")) { //$NON-NLS-1$
+			return fileName.replaceFirst("\\.svg$", ".png"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return fileName;
+	}
+
+	/**
+	 * Convenience method to check whether SVGs are supported by the current
+	 * application. This method returns {@code true}, if there is at least one
+	 * active bundle that satisfies the (optional) {@code (image.format=svg)}
+	 * capability.
+	 */
+	public static boolean isSvgSupported() {
+		if (isSvgSupported != null) {
+			return isSvgSupported;
+		}
+		String svg = """
+				<?xml version="1.0" encoding="UTF-8"?>
+				<svg width="1" height="1" version="1.1" viewBox="0 0 0 0" xmlns="http://www.w3.org/2000/svg"></svg>
+				"""; //$NON-NLS-1$
+		try (InputStream is = new ByteArrayInputStream(svg.getBytes(StandardCharsets.UTF_8))) {
+			new ImageLoader().load(is);
+			isSvgSupported = true;
+		} catch (IOException ignore) {
+			// Should never happen
+			isSvgSupported = false;
+		} catch (SWTException e) {
+			// SVGs unsupported
+			isSvgSupported = false;
+		}
+		return isSvgSupported;
+	}
+}

org.eclipse.draw2d/src/org/eclipse/draw2d/CheckBox.java

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef; singleton:=true
-Bundle-Version: 3.22.100.qualifier
+Bundle-Version: 3.23.0.qualifier
 Bundle-Activator: org.eclipse.gef.internal.InternalGEFPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
@@ -31,7 +31,7 @@ Export-Package: org.eclipse.gef,
  org.eclipse.gef.ui.rulers,
  org.eclipse.gef.ui.views.palette,
  org.eclipse.gef.util
-Require-Bundle: org.eclipse.draw2d;visibility:=reexport;bundle-version="[3.13.0,4.0.0)",
+Require-Bundle: org.eclipse.draw2d;visibility:=reexport;bundle-version="[3.20.100,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.views;resolution:=optional;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.133.0,4.0.0)",