Quick solution addressing Bug 3223

Rich Browser Extraction view should handle icons better
bioclipse · Jun 21, 2012 · 59635cc · 59635cc
1 parent b9499c9
commit 59635cc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/plugins/net.bioclipse.cdk.business/icons/benzene.gif b/plugins/net.bioclipse.cdk.business/icons/benzene.gif
diff --git a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/Activator.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/Activator.java
@@ -15,6 +15,7 @@
 import net.bioclipse.core.util.LogUtils;
 
 import org.apache.log4j.Logger;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.openscience.cdk.tools.LoggingToolFactory;
 import org.osgi.framework.BundleContext;
@@ -44,6 +45,10 @@ public Activator() {
     	logger.info("Registering the BioclipseLoggingTool...");
     }
 
+    public static ImageDescriptor getImageDescriptor(String path) {
+        return imageDescriptorFromPlugin(PLUGIN_ID, path);
+    }
+
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

diff --git a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/domain/CDKMolecule.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/domain/CDKMolecule.java
@@ -28,6 +28,7 @@
 import nu.xom.Element;
 
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.openscience.cdk.CDKConstants;
 import org.openscience.cdk.atomtype.CDKAtomTypeMatcher;
@@ -56,6 +57,7 @@ public class CDKMolecule extends BioObject implements ICDKMolecule {
 
     private String name;
     private IAtomContainer atomContainer;
+	private Object icon;
 
     // cached properties
     public static final String FINGERPRINT_KEY = "net.bioclipse.fingerprint";
@@ -251,7 +253,13 @@ public boolean has3dCoords() throws BioclipseException {
 
     @Override
     public Object getAdapter( Class adapter ) {
-
+
+        if (Image.class .equals( adapter )){
+            if (icon==null)
+                icon=Activator.getImageDescriptor( "icons/benzene.gif" ).createImage();
+            return icon;
+        }
+
         if (adapter == IMolecule.class){
             return this;
         }