improved handling for getImageData()

ptief · HeikoKlare · commit 67d53d4646ae · 2024-01-27T09:38:40.000+01:00
Signed-off-by: Patrick Tief &lt;Patrick.Tief@vector.com&gt;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/ExternalProgramImageDescriptor.java
@@ -64,8 +64,11 @@ public Image getImage() {
 
 	@Override
 	public ImageData getImageData(int zoom) {
-		if (program != null && program.getImageData() != null) {
-			return program.getImageData(zoom);
+		if (program != null) {
+			ImageData imageData = program.getImageData(zoom);
+			if (imageData != null) {
+				return imageData;
+			}
 		}
 		return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FILE).getImageData(zoom);
 	}

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,11 @@ public Image getImage() {`
`64`	`64`
`65`	`65`	`@Override`
`66`	`66`	`public ImageData getImageData(int zoom) {`
`67`		`- if (program != null && program.getImageData() != null) {`
`68`		`- return program.getImageData(zoom);`
	`67`	`+ if (program != null) {`
	`68`	`+ ImageData imageData = program.getImageData(zoom);`
	`69`	`+ if (imageData != null) {`
	`70`	`+ return imageData;`
	`71`	`+ }`
`69`	`72`	`}`
`70`	`73`	`return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FILE).getImageData(zoom);`
`71`	`74`	`}`