Skip to content

Add check for provider #1688

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

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Add check for provider #1688

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
12 changes: 10 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2041,6 +2041,12 @@ private abstract class AbstractImageProviderWrapper {
abstract ImageHandle getImageMetadata(int zoom);
abstract AbstractImageProviderWrapper createCopy(Image image);

protected void checkProvider(Object provider, Class<?> expectedClass) {
if (provider == null || !expectedClass.isAssignableFrom(provider.getClass())) {
SWT.error(SWT.ERROR_NULL_ARGUMENT);
}
}

@Override
public int hashCode() {
return getProvider().hashCode();
Expand All @@ -2061,7 +2067,8 @@ private class ImageFileNameProviderWrapper extends AbstractImageProviderWrapper
private final ImageFileNameProvider provider;

ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
this.provider = Objects.requireNonNull(provider);
checkProvider(provider, ImageFileNameProvider.class);
this.provider = provider;
}

@Override
Expand Down Expand Up @@ -2111,7 +2118,8 @@ private class ImageDataProviderWrapper extends AbstractImageProviderWrapper {
private final ImageDataProvider provider;

ImageDataProviderWrapper(ImageDataProvider provider) {
this.provider = Objects.requireNonNull(provider);
checkProvider(provider, ImageDataProvider.class);
this.provider = provider;
}

@Override
Expand Down
Loading