Skip to content

Merge FileImageDescriptor into URLImageDescriptor and clean it up #2899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge FileImageDescriptor into URLImageDescriptor and clean it up #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
313 changes: 0 additions & 313 deletions bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java
View file
Open in desktop

This file was deleted.

21 changes: 20 additions & 1 deletion bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.nio.file.Path;
import java.util.function.Supplier;

import org.eclipse.jface.util.Policy;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Device;
import org.eclipse.swt.graphics.Image;
Expand Down Expand Up @@ -76,6 +78,9 @@ protected ImageDescriptor() {
ImageDescriptor(boolean shouldBeCached) {
super(shouldBeCached);
}

private static final ImageDescriptor NULL_IMAGE = createFromImageDataProvider(z -> null);

/**
* Creates and returns a new image descriptor from a file.
*
Expand All @@ -84,7 +89,21 @@ protected ImageDescriptor() {
* @return a new image descriptor
*/
public static ImageDescriptor createFromFile(Class<?> location, String filename) {
return new FileImageDescriptor(location, filename);
URL url;
if (location == null) {
try {
url = Path.of(filename).toUri().toURL();
} catch (MalformedURLException e) {
Policy.logException(e);
url = null;
}
} else {
url = location.getResource(filename);
}
if (url == null) {
return NULL_IMAGE; // Defer failure to the time when the image is created
}
return new URLImageDescriptor(url);
}

/**
Expand Down
Loading
Loading