Skip to content

Commit 0af320b

Browse files
committed
fix: Resolve the Images in the icon folder correctly
1 parent 8a47697 commit 0af320b

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

plugins/de.ovgu.featureide.fm.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ Export-Package: de.ovgu.featureide.fm.ui,
7979
Bundle-ClassPath: .,
8080
lib/org.abego.treelayout.core-1.0.3.jar
8181
Automatic-Module-Name: de.ovgu.featureide.fm.ui
82+
Import-Package: org.eclipse.core.runtime

plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/FMUIPlugin.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import static de.ovgu.featureide.fm.core.localization.StringTable.SELECT_THE_FEATURE_MODEL_FOR_THE_CURRENT_PROJECT;
2525

26+
import java.net.URL;
2627
import java.util.Arrays;
2728
import java.util.Optional;
2829

@@ -31,7 +32,10 @@
3132
import org.eclipse.core.resources.IResource;
3233
import org.eclipse.core.resources.IResourceChangeListener;
3334
import org.eclipse.core.resources.ResourcesPlugin;
35+
import org.eclipse.core.runtime.FileLocator;
3436
import org.eclipse.core.runtime.IStatus;
37+
import org.eclipse.core.runtime.Path;
38+
import org.eclipse.core.runtime.Platform;
3539
import org.eclipse.core.runtime.Status;
3640
import org.eclipse.jface.resource.ImageDescriptor;
3741
import org.eclipse.swt.graphics.Image;
@@ -87,12 +91,11 @@ public static FMUIPlugin getDefault() {
8791
}
8892

8993
public static Image getImage(String name) {
90-
final ImageDescriptor descriptor = getDefault().getImageDescriptor("icons/" + name);
91-
if (descriptor != null) {
92-
return descriptor.createImage();
94+
final URL url = FileLocator.find(Platform.getBundle(PLUGIN_ID), new Path("icons/" + name), null);
95+
if (url != null) {
96+
return ImageDescriptor.createFromURL(url).createImage();
9397
} else {
94-
final IStatus status = new Status(IStatus.WARNING, PLUGIN_ID, "[FeatureIDE] Image not found: icons/" + name);
95-
getDefault().getLog().log(status);
98+
getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, "Image not found: " + name));
9699
return null;
97100
}
98101
}

0 commit comments

Comments
 (0)