Added icons to MoleculesPage.

olas · Aug 26, 2009 · 5b36bcf · 5b36bcf
1 parent bf684d1
commit 5b36bcf
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 74 deletions.
diff --git a/plugins/net.bioclipse.qsar.ui/icons/table16-with-molecule.png b/plugins/net.bioclipse.qsar.ui/icons/table16-with-molecule.png
diff --git a/plugins/net.bioclipse.qsar.ui/icons/warn2.gif b/plugins/net.bioclipse.qsar.ui/icons/warn2.gif
diff --git a/.../net.bioclipse.qsar.ui/src/net/bioclipse/qsar/ui/editors/ObservableQSARLabelProvider.java b/.../net.bioclipse.qsar.ui/src/net/bioclipse/qsar/ui/editors/ObservableQSARLabelProvider.java
@@ -14,89 +14,107 @@
 import net.bioclipse.qsar.DescriptorType;
 import net.bioclipse.qsar.ParameterType;
 import net.bioclipse.qsar.ResourceType;
-import net.bioclipse.qsar.StructureType;
+import net.bioclipse.qsar.ui.Activator;
 
 import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
+/**
+ * 
+ * @author ola
+ *
+ */
 public class ObservableQSARLabelProvider extends ObservableMapLabelProvider{
 
-	public ObservableQSARLabelProvider(IObservableMap[] observeMaps) {
-		super(observeMaps);
-	}
-
-	@Override
-	public Image getColumnImage(Object element, int columnIndex) {
-
-		if (columnIndex!=0) return null;
-
-		if (element instanceof DescriptorType) {
-//			return Activator.getImageDescriptor("icons/descriptor.png").createImage();
-		}
-		else if (element instanceof ResourceType) {
-//			return Activator.getImageDescriptor("icons/benzene.gif").createImage();
-		}
-
-		return null;
-
-	}
-
-	@Override
-	public String getColumnText(Object element, int columnIndex) {
-
-		String label= super.getColumnText(element, columnIndex);
-
-		if (element instanceof DescriptorType) {
-			if (label.indexOf('#')>0){
-				label=label.substring(label.lastIndexOf('#')+1, label.length());
-			}
-
-			DescriptorType desc = (DescriptorType) element;
-
-			String cpstr="";
-			if (desc.getParameter()!=null && desc.getParameter().size()>0){
-				for (ParameterType param : desc.getParameter()){
-					String pstr=param.getKey() + "=" + param.getValue()+", ";
-					cpstr=cpstr+pstr;
-				}
-				cpstr=cpstr.substring(0,cpstr.length()-2);
-			}
-
-			if (cpstr.length()>1){
-				label=label + " [" + cpstr + "]";
-			}
-
-		}
-
-    if (element instanceof ResourceType) {
-        ResourceType resource=(ResourceType)element;
-
-        if (columnIndex==4){
-            //status
-            if (resource.isContainsErrors())
-                return "Contains errors";
-            else
-                return "OK";
+    private Image errImg;
+    private Image molImg;
+    private Image molListImg;
+
+    public ObservableQSARLabelProvider(IObservableMap[] observeMaps) {
+        super(observeMaps);
+        errImg=Activator.getImageDescriptor("icons/warn2.gif").createImage();
+        molImg=Activator.getImageDescriptor("icons/benzene.gif").createImage();
+        molListImg=Activator.getImageDescriptor("icons/table16-with-molecule.png").createImage();
+    }
+
+    @Override
+    public Image getColumnImage(Object element, int columnIndex) {
+
+        if (columnIndex!=0) return null;
+
+        if (element instanceof DescriptorType) {
+            //			return Activator.getImageDescriptor("icons/descriptor.png").createImage();
+        }
+        else if (element instanceof ResourceType) {
+            ResourceType rt=(ResourceType)element;
+            if (rt.isContainsErrors()){
+                return errImg;
+            }
+            if (rt.getStructure()!=null && rt.getStructure().size()>1)
+                return molListImg;
+            return molImg;
         }
 
-        int problems=0;
-        //Find all problems
-//        for (StructureType structure : resource.getStructure()){
-//            for (String problem : structure.getProblem()){
-//                problems++;
-//            }
-//        }
-
-        if (problems>0 && columnIndex==0)
-            return super.getColumnText( element, columnIndex ) + " [" + problems + " problems]";
-
+        return null;
+
     }
 
-		return label;
-
-	}
-
-
-
+    @Override
+    public String getColumnText(Object element, int columnIndex) {
+
+        String label= super.getColumnText(element, columnIndex);
+
+        if (element instanceof DescriptorType) {
+            if (label.indexOf('#')>0){
+                label=label.substring(label.lastIndexOf('#')+1, label.length());
+            }
+
+            DescriptorType desc = (DescriptorType) element;
+
+            String cpstr="";
+            if (desc.getParameter()!=null && desc.getParameter().size()>0){
+                for (ParameterType param : desc.getParameter()){
+                    String pstr=param.getKey() + "=" + param.getValue()+", ";
+                    cpstr=cpstr+pstr;
+                }
+                cpstr=cpstr.substring(0,cpstr.length()-2);
+            }
+
+            if (cpstr.length()>1){
+                label=label + " [" + cpstr + "]";
+            }
+
+        }
+
+        if (element instanceof ResourceType) {
+            ResourceType resource=(ResourceType)element;
+
+            if (columnIndex==4){
+                //status
+                if (resource.isContainsErrors())
+                    return "Contains errors";
+                else
+                    return "OK";
+            }
+
+            int problems=0;
+            //Find all problems
+            //        for (StructureType structure : resource.getStructure()){
+            //            for (String problem : structure.getProblem()){
+            //                problems++;
+            //            }
+            //        }
+
+            if (problems>0 && columnIndex==0)
+                return super.getColumnText( element, columnIndex ) + " [" + problems + " problems]";
+
+        }
+
+        return label;
+
+    }
+
+
+
 }