solution addressing Bug 3223 from Arvid

bioclipse · Jun 21, 2012 · 8af489c · 8af489c
1 parent 671f0bf
commit 8af489c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/plugins/net.bioclipse.browser/src/net/bioclipse/browser/views/ScrapingLabelProvider.java b/plugins/net.bioclipse.browser/src/net/bioclipse/browser/views/ScrapingLabelProvider.java
@@ -17,6 +17,8 @@ public class ScrapingLabelProvider implements ILabelProvider {
     private Image changingImage1;
     private Image changingImage2;
     private Image missingImage;
+
+    private Image image;
 
     public ScrapingLabelProvider() {
         pageImage=Activator.getImageDescriptor("icons/world_dl.png")
@@ -45,8 +47,12 @@ public Image getImage( Object element ) {
                 return pageImage;
         }
         if ( element instanceof IBioObject ) {
-                Object image = ((IBioObject)element).getAdapter( Image.class );
-                if (image!=null) return (Image) image;
+        	ImageDescriptor imageDescriptor = (ImageDescriptor) ((IBioObject)element).getAdapter( ImageDescriptor.class );
+                if (image==null) {
+                	//FIXME only the first image that is asked for is used.
+                	image = imageDescriptor.createImage();
+                }
+                return (Image) image;
         }
 
         return missingImage;
@@ -70,6 +76,9 @@ public void addListener( ILabelProviderListener listener ) {
     }
 
     public void dispose() {
+    	if(image!= null ) {
+    		image.dispose();
+    	}
     }
 
     public boolean isLabelProperty( Object element, String property ) {
@@ -78,4 +87,5 @@ public boolean isLabelProperty( Object element, String property ) {
 
     public void removeListener( ILabelProviderListener listener ) {
     }
+
 }