Author: rob.stryker(a)jboss.com
Date: 2010-01-07 16:41:42 -0500 (Thu, 07 Jan 2010)
New Revision: 19677
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
Log:
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-07
19:05:18 UTC (rev 19676)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-07
21:41:42 UTC (rev 19677)
@@ -86,6 +86,7 @@
* This method is called when the plug-in is stopped
*/
public void stop(BundleContext context) throws Exception {
+ JBossServerUISharedImages.instance().cleanup();
super.stop(context);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2010-01-07
19:05:18 UTC (rev 19676)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2010-01-07
21:41:42 UTC (rev 19677)
@@ -89,45 +89,45 @@
descriptors.put(GENERIC_SERVER_IMAGE,
ImageDescriptor.createFromImage((Image)images.get(GENERIC_SERVER_IMAGE)));
}
- private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String
relativePath)
- {
+ private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String relativePath)
{
return ImageDescriptor.createFromURL(pluginBundle.getEntry(relativePath));
}
- private static JBossServerUISharedImages instance() {
+ public static JBossServerUISharedImages instance() {
if (instance == null)
- return new JBossServerUISharedImages();
-
+ instance = new JBossServerUISharedImages();
return instance;
}
- public static Image getImage(String key)
- {
+ public static Image getImage(String key) {
return instance().image(key);
}
- public static ImageDescriptor getImageDescriptor(String key)
- {
+ public static ImageDescriptor getImageDescriptor(String key) {
return instance().descriptor(key);
}
- public Image image(String key)
- {
+ public Image image(String key) {
return (Image) images.get(key);
}
- public ImageDescriptor descriptor(String key)
- {
+ public ImageDescriptor descriptor(String key) {
return (ImageDescriptor) descriptors.get(key);
}
- protected void finalize() throws Throwable {
+ public void cleanup() {
Iterator<String> iter = images.keySet().iterator();
- while (iter.hasNext())
- {
+ while (iter.hasNext()) {
Image image = (Image) images.get(iter.next());
image.dispose();
}
+ images = null;
+ descriptors = null;
+ instance = null;
+ }
+
+ protected void finalize() throws Throwable {
+ cleanup();
super.finalize();
}
}
Show replies by date