Skip to content

Commit d57384e

Browse files
ackeacke
committed
fix: moved all images to ImageRegistry
1 parent 71b956b commit d57384e

File tree

3 files changed

+74
-62
lines changed

3 files changed

+74
-62
lines changed

‎plugin/src/main/java/io/snyk/eclipse/plugin/Activator.java

+61-39
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,72 @@
22

33
import org.eclipse.core.runtime.Platform;
44
import org.eclipse.jface.resource.ImageDescriptor;
5+
import org.eclipse.jface.resource.ImageRegistry;
56
import org.eclipse.ui.plugin.AbstractUIPlugin;
67
import org.osgi.framework.BundleContext;
78

89
/**
910
* The activator class controls the plug-in life cycle
1011
*/
1112
public class Activator extends AbstractUIPlugin {
12-
// The plug-in ID
13-
public static final String PLUGIN_ID = "io.snyk.eclipse.plugin"; //$NON-NLS-1$
14-
public static final String PLUGIN_VERSION = Platform.getBundle(Activator.PLUGIN_ID).getVersion().toString();
15-
public static final String INTEGRATION_NAME = "ECLIPSE";
16-
17-
// The shared instance
18-
private static Activator plugin;
19-
20-
@Override
21-
public void start(BundleContext context) throws Exception {
22-
super.start(context);
23-
plugin = this;
24-
}
25-
26-
@Override
27-
public void stop(BundleContext context) throws Exception {
28-
plugin = null;
29-
super.stop(context);
30-
}
31-
32-
/**
33-
* Returns the shared instance
34-
*
35-
* @return the shared instance
36-
*/
37-
public static Activator getDefault() {
38-
return plugin;
39-
}
40-
41-
/**
42-
* Returns an image descriptor for the image file at the given plug-in relative
43-
* path
44-
*
45-
* @param path the path
46-
* @return the image descriptor
47-
*/
48-
public static ImageDescriptor getImageDescriptor(String path) {
49-
return imageDescriptorFromPlugin(PLUGIN_ID, path);
50-
}
13+
// The plug-in ID
14+
public static final String PLUGIN_ID = "io.snyk.eclipse.plugin"; //$NON-NLS-1$
15+
public static final String PLUGIN_VERSION = Platform.getBundle(Activator.PLUGIN_ID).getVersion().toString();
16+
public static final String INTEGRATION_NAME = "ECLIPSE";
17+
18+
// The shared instance
19+
private static Activator plugin;
20+
21+
@Override
22+
public void start(BundleContext context) throws Exception {
23+
super.start(context);
24+
plugin = this;
25+
}
26+
27+
@Override
28+
public void stop(BundleContext context) throws Exception {
29+
super.stop(context);
30+
}
31+
32+
/**
33+
* Returns the shared instance
34+
*
35+
* @return the shared instance
36+
*/
37+
public static Activator getDefault() {
38+
return plugin;
39+
}
40+
41+
/**
42+
* Returns an image descriptor for the image file at the given plug-in relative
43+
* path
44+
*
45+
* @param path the path
46+
* @return the image descriptor
47+
*/
48+
public static ImageDescriptor getImageDescriptor(String key) {
49+
return getDefault().getImageRegistry().getDescriptor(key);
50+
}
51+
52+
@Override
53+
protected void initializeImageRegistry(ImageRegistry registry) {
54+
addImageToRegistry(registry, "CODE", "/icons/code.png");
55+
addImageToRegistry(registry, "CODE_DISABLED", "/icons/code_disabled.png");
56+
addImageToRegistry(registry, "OSS", "/icons/oss.png");
57+
addImageToRegistry(registry, "OSS_DISABLED", "/icons/oss_disabled.png");
58+
addImageToRegistry(registry, "IAC", "/icons/iac.png");
59+
addImageToRegistry(registry, "IAC_DISABLED", "/icons/iac_disabled.png");
60+
addImageToRegistry(registry, "SEVERITY_CRITICAL", "/icons/severity_critical.png");
61+
addImageToRegistry(registry, "SEVERITY_HIGH", "/icons/severity_high.png");
62+
addImageToRegistry(registry, "SEVERITY_MEDIUM", "/icons/severity_medium.png");
63+
addImageToRegistry(registry, "SEVERITY_LOW", "/icons/severity_low.png");
64+
addImageToRegistry(registry, "ENABLED", "/icons/enabled.png");
65+
addImageToRegistry(registry, "DISABLED", "/icons/transparent.png");
66+
}
67+
68+
private void addImageToRegistry(ImageRegistry registry, String key, String path) {
69+
ImageDescriptor descriptor = imageDescriptorFromPlugin(PLUGIN_ID, path);
70+
registry.put(key, descriptor);
71+
72+
}
5173
}

‎plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
import io.snyk.eclipse.plugin.Activator;
66

77
public class SnykIcons {
8-
public static final ImageDescriptor CODE = Activator.getImageDescriptor("/icons/code.png");
9-
public static final ImageDescriptor CODE_DISABLED = Activator.getImageDescriptor("/icons/code_disabled.png");
8+
public static final ImageDescriptor CODE = Activator.getImageDescriptor("CODE");
9+
public static final ImageDescriptor CODE_DISABLED = Activator.getImageDescriptor("CODE_DISABLED");
1010

11-
public static final ImageDescriptor OSS = Activator.getImageDescriptor("/icons/oss.png");
12-
public static final ImageDescriptor OSS_DISABLED = Activator.getImageDescriptor("/icons/oss_disabled.png");
11+
public static final ImageDescriptor OSS = Activator.getImageDescriptor("OSS");
12+
public static final ImageDescriptor OSS_DISABLED = Activator.getImageDescriptor("OSS_DISABLED");
1313

14-
public static final ImageDescriptor IAC = Activator.getImageDescriptor("/icons/iac.png");
15-
public static final ImageDescriptor IAC_DISABLED = Activator.getImageDescriptor("/icons/iac_disabled.png");
14+
public static final ImageDescriptor IAC = Activator.getImageDescriptor("IAC");
15+
public static final ImageDescriptor IAC_DISABLED = Activator.getImageDescriptor("IAC_DISABLED");
1616

17-
public static final ImageDescriptor SEVERITY_CRITICAL = Activator
18-
.getImageDescriptor("/icons/severity_critical.png");
19-
public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("/icons/severity_high.png");
20-
public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("/icons/severity_medium.png");
21-
public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("/icons/severity_low.png");
17+
public static final ImageDescriptor SEVERITY_CRITICAL = Activator.getImageDescriptor("SEVERITY_CRITICAL");
18+
public static final ImageDescriptor SEVERITY_HIGH = Activator.getImageDescriptor("SEVERITY_HIGH");
19+
public static final ImageDescriptor SEVERITY_MEDIUM = Activator.getImageDescriptor("SEVERITY_MEDIUM");
20+
public static final ImageDescriptor SEVERITY_LOW = Activator.getImageDescriptor("SEVERITY_LOW");
2221

23-
public static final ImageDescriptor ENABLED = Activator.getImageDescriptor("/icons/enabled.png");
24-
public static final ImageDescriptor DISABLED = Activator.getImageDescriptor("/icons/transparent.png");
22+
public static final ImageDescriptor ENABLED = Activator.getImageDescriptor("ENABLED");
23+
public static final ImageDescriptor DISABLED = Activator.getImageDescriptor("DISABLED");
2524
}

‎plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BaseTreeNode.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void setImageDescriptor(ImageDescriptor imageDescriptor) {
6565

6666
protected ImageDescriptor getImageDescriptor(IResource object) {
6767
ILabelProvider labelProvider = null;
68-
Image image = null;
68+
Image image;
6969

7070
try {
7171
labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
@@ -81,15 +81,6 @@ protected ImageDescriptor getImageDescriptor(IResource object) {
8181
SnykLogger.logError(e);
8282
return null;
8383
} finally {
84-
disposeResources(labelProvider, image);
85-
}
86-
}
87-
88-
private void disposeResources(ILabelProvider labelProvider, Image image) {
89-
if (image != null && !image.isDisposed()) {
90-
image.dispose();
91-
}
92-
if (labelProvider != null) {
9384
labelProvider.dispose();
9485
}
9586
}

0 commit comments

Comments
 (0)