- added icons to derivates in DerivateView

diff --git a/.gitattributes b/.gitattributes
index 8bcfb6a7379208d82e6f9fd72db60de32cfc190a..4772386687705c3c2d15c5319bad41aeb8f908ba 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -969,6 +969,7 @@ eu.etaxonomy.taxeditor.store/icons/db.gif -text
 eu.etaxonomy.taxeditor.store/icons/debug.gif -text
 eu.etaxonomy.taxeditor.store/icons/delete.gif -text
 eu.etaxonomy.taxeditor.store/icons/delete_edit.gif -text
+eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif -text
 eu.etaxonomy.taxeditor.store/icons/eclipse.gif -text
 eu.etaxonomy.taxeditor.store/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.store/icons/edit_16x16.ico -text
@@ -976,6 +977,7 @@ eu.etaxonomy.taxeditor.store/icons/edit_256color.ICO -text
 eu.etaxonomy.taxeditor.store/icons/error_co.gif -text
 eu.etaxonomy.taxeditor.store/icons/expandAll.jpg -text
 eu.etaxonomy.taxeditor.store/icons/export.gif -text
+eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif -text
 eu.etaxonomy.taxeditor.store/icons/file_obj.gif -text
 eu.etaxonomy.taxeditor.store/icons/filter.gif -text
 eu.etaxonomy.taxeditor.store/icons/flat.gif -text
@@ -1058,6 +1060,7 @@ eu.etaxonomy.taxeditor.store/icons/th_vertical.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_close_view.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_max_view.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_restore_view.GIF -text
+eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif -text
 eu.etaxonomy.taxeditor.store/icons/trash.gif -text
 eu.etaxonomy.taxeditor.store/icons/tree_icon_small.jpg -text
 eu.etaxonomy.taxeditor.store/icons/undo.gif -text

diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif
new file mode 100644 (file)
index 0000000..a186f00
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif differ

diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif
new file mode 100644 (file)
index 0000000..8adc848
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif differ

diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif
new file mode 100644 (file)
index 0000000..e9a3d6a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif differ

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index 9be591dddd571dfc699bb8951c79f8ab6c624191..5c8e549d8068135a637af876ef6c6d37b6d8d613 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@ -135,6 +135,11 @@ public class ImageResources {
        /** Constant <code>COLLAPSE_ALL="collapse_all"</code> */
        public static final String COLLAPSE_ALL = "collapse_all";
 
+       public static final String TISSUE_SAMPLE_DERIVATE = "derivate_view_icon";
+
+       public static final String DNA_DERIVATE = "dna_derivate";
+       public static final String FIELD_UNIT = "field_unit";
+
 
 
        /***************************************************************************
@@ -311,6 +316,12 @@ public class ImageResources {
                        "lock.png");
                registerImage(registry, LOCK_OPEN_ICON,
                        "lock_open.png");
+               registerImage(registry, DNA_DERIVATE,
+                       "dna_derivate-16x16-32.gif");
+               registerImage(registry, FIELD_UNIT,
+                       "fieldunit-16x16-32.gif");
+               registerImage(registry, TISSUE_SAMPLE_DERIVATE,
+                       "tissue_sample_derivate-16x16-32.gif");
        }
 
        private void registerImage(ImageRegistry registry, String key,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java
index a9e956dbca6a3f18127e4636af8f4554d99bb67d..3c0f2af0511efe2e91489d631e5cabc8591366ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java
@@ -10,9 +10,12 @@
 package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.swt.graphics.Image;
 
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.model.ImageResources;
 
 /**
  * Label provider for the views to show {@link SpecimenOrObservationBase}s.
@@ -33,11 +36,31 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
 
     private String getDerivateText(Object element){
         if(element instanceof SpecimenOrObservationBase){
-            SpecimenOrObservationBase derivate = (SpecimenOrObservationBase) element;
+            SpecimenOrObservationBase<?> derivate = (SpecimenOrObservationBase<?>) element;
             SpecimenOrObservationType type = derivate.getRecordBasis();
             return derivate.getTitleCache() + (type!=null?" ["+type.toString()+"]":"");
         }
         return element.toString();
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.viewers.ColumnLabelProvider#getImage(java.lang.Object)
+     */
+    @Override
+    public Image getImage(Object element) {
+        if(element instanceof DerivedUnit){
+            DerivedUnit derivedUnit = (DerivedUnit)element;
+            if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.FieldUnit){
+                return ImageResources.getImage(ImageResources.FIELD_UNIT);
+            }
+            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.DnaSample){
+                return ImageResources.getImage(ImageResources.DNA_DERIVATE);
+            }
+            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
+                return ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE);
+            }
+        }
+        return super.getImage(element);
+    }
+
 }