Merge pull request #7 from valyo/2.5.x

2.5.x Also quick but better solution addressing Bug 3223 from Arvid
bioclipse · Jun 21, 2012 · 845ca20 · 845ca20
2 parents 61a7aea + 67a1938
commit 845ca20
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
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/plugin.xml b/plugins/net.bioclipse.cdk.business/plugin.xml
@@ -27,6 +27,13 @@
                type="net.bioclipse.cdk.domain.MoleculesIndexEditorInput">
          </adapter>
       </factory>
+      <factory
+            adaptableType="net.bioclipse.cdk.domain.ICDKMolecule"
+            class="net.bioclipse.cdk.domain.CDKAdapterFactory">
+         <adapter
+               type="org.eclipse.jface.resource.ImageDescriptor">
+         </adapter>
+      </factory>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">

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/CDKAdapterFactory.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/domain/CDKAdapterFactory.java
@@ -7,6 +7,8 @@
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
 
 @SuppressWarnings("unchecked")
 public class CDKAdapterFactory implements IAdapterFactory {
@@ -34,11 +36,16 @@ public Object getAdapter( Object adaptableObject,
         }
         if(molecule !=null &&adapterType.isAssignableFrom( molecule.getClass()))
             return molecule;
+
+        if(adapterType.isAssignableFrom(ImageDescriptor.class)) {
+                return Activator.getImageDescriptor( "icons/benzene.gif" );
+        }
+
         return null;
     }
 
     public Class[] getAdapterList() {
 
-        return new Class[] { ICDKMolecule.class };
+        return new Class[] { ICDKMolecule.class,ImageDescriptor.class };
     }
 }
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,7 @@ public boolean has3dCoords() throws BioclipseException {
 
     @Override
     public Object getAdapter( Class adapter ) {
-    
+
         if (adapter == IMolecule.class){
             return this;
         }