Avoid implementations of ImageDescriptor.getImageData()

ImageDescriptor.getImageData() is deprecated and sub-classes are advised
to stop re-implementing it and instead implement getImageData(int).
The still existing implementations just replicate the default
implementation and therefore can just be removed.

Additionally implementation of
ImageDescriptor.getMissingImageDescriptor() is simplified and
ImageDescriptor implementations are cleaned-up.

Author: HannesWell

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface;singleton:=true
-Bundle-Version: 3.36.100.qualifier
+Bundle-Version: 3.37.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/CompositeImageDescriptor.java

@@ -347,15 +347,6 @@ final protected void drawImage(ImageDataProvider srcProvider, int ox, int oy) {
 		}
 	}
 
-	/**
-	 * @deprecated Use {@link #getImageData(int)} instead.
-	 */
-	@Deprecated
-	@Override
-	public ImageData getImageData() {
-		return getImageData(100);
-	}
-
 	@Override
 	public ImageData getImageData(int zoom) {
 		if (!supportsZoomLevel(zoom)) {

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java

@@ -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
@@ -434,12 +434,15 @@ public ImageData getImageData() {
 		return getImageData(100);
 	}
 
+	private static final ImageDescriptor MISSING_IMAGE = createFromImageDataProvider(
+			z -> z == 100 ? DEFAULT_IMAGE_DATA : null);
+
 	/**
 	 * Returns the shared image descriptor for a missing image.
 	 *
 	 * @return the missing image descriptor
 	 */
 	public static ImageDescriptor getMissingImageDescriptor() {
-		return MissingImageDescriptor.getInstance();
+		return MISSING_IMAGE;
 	}
 }

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/MissingImageDescriptor.java

@@ -130,12 +130,6 @@ public boolean equals(Object o) {
 		return ((URLImageDescriptor) o).url.equals(this.url);
 	}
 
-	@Deprecated
-	@Override
-	public ImageData getImageData() {
-		return getImageData(getURL(url), 100, 100);
-	}
-
 	@Override
 	public ImageData getImageData(int zoom) {
 		return getImageData(url, zoom);

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java

@@ -108,7 +108,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public ImageData getImageData() {
+		public ImageData getImageData(int zoom) {
 			return null;
 		}
 
@@ -177,7 +177,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public ImageData getImageData() {
+		public ImageData getImageData(int zoom) {
 			return null;
 		}
 
@@ -273,7 +273,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public ImageData getImageData() {
+		public ImageData getImageData(int zoom) {
 			return null;
 		}
 

bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java

@@ -14,7 +14,6 @@
 package org.eclipse.ui.internal.misc;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.program.Program;
 import org.eclipse.ui.ISharedImages;
@@ -26,7 +25,7 @@
  */
 public class ExternalProgramImageDescriptor extends ImageDescriptor {
 
-	public Program program;
+	private Program program;
 
 	/**
 	 * Creates a new ImageDescriptor. The image is loaded from a file with the given
@@ -41,11 +40,9 @@ public ExternalProgramImageDescriptor(Program program) {
 	 */
 	@Override
 	public boolean equals(Object o) {
-		if (!(o instanceof ExternalProgramImageDescriptor)) {
+		if (!(o instanceof ExternalProgramImageDescriptor other)) {
 			return false;
 		}
-		ExternalProgramImageDescriptor other = (ExternalProgramImageDescriptor) o;
-
 		// See if there is a name - compare it if so and compare the programs if not
 		String otherName = other.program.getName();
 		if (otherName == null) {
@@ -54,14 +51,6 @@ public boolean equals(Object o) {
 		return otherName.equals(program.getName());
 	}
 
-	/**
-	 * Returns an SWT Image that is described by the information in this descriptor.
-	 * Each call returns a new Image.
-	 */
-	public Image getImage() {
-		return createImage();
-	}
-
 	@Override
 	public ImageData getImageData(int zoom) {
 		if (program != null) {