Author: scabanovich Date: 2011-12-01 13:01:03 -0500 (Thu, 01 Dec 2011) New Revision: 36839 Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java Log: JBIDE-10246 https://issues.jboss.org/browse/JBIDE-10246 ImageRegistry is used to manage images. Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-01 17:48:52 UTC (rev 36838) +++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-01 18:01:03 UTC (rev 36839) @@ -1,6 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 +Bundle-Activator: org.jboss.tools.common.ui.CommonUIPlugin Bundle-SymbolicName: org.jboss.tools.common.ui;singleton:=true Bundle-Version: 3.3.0.qualifier Require-Bundle: org.eclipse.osgi;bundle-version="3.7.0", Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2011-12-01 17:48:52 UTC (rev 36838) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2011-12-01 18:01:03 UTC (rev 36839) @@ -29,6 +29,7 @@ * The constructor */ public CommonUIPlugin() { + plugin = this; } /* @@ -37,7 +38,6 @@ */ public void start(BundleContext context) throws Exception { super.start(context); - plugin = this; } /* @@ -45,7 +45,6 @@ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { - plugin = null; super.stop(context); } Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2011-12-01 17:48:52 UTC (rev 36838) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2011-12-01 18:01:03 UTC (rev 36839) @@ -17,11 +17,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jdt.internal.ui.JavaPluginImages; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.progress.UIJob; import org.jboss.tools.common.ui.CommonUIMessages; +import org.jboss.tools.common.ui.CommonUIPlugin; /** * @author Daniel Azarov @@ -60,7 +62,14 @@ } public Image getImage() { - return JavaPluginImages.DESC_ELCL_CONFIGURE_PROBLEM_SEVERITIES.createImage(); + String key = "DESC_ELCL_CONFIGURE_PROBLEM_SEVERITIES"; + ImageRegistry registry = CommonUIPlugin.getDefault().getImageRegistry(); + Image image = registry.get(key); + if(image == null) { + image = JavaPluginImages.DESC_ELCL_CONFIGURE_PROBLEM_SEVERITIES.createImage(); + registry.put(key, image); + } + return image; } }