From: Patric Plitzner Date: Wed, 4 Dec 2013 15:12:11 +0000 (+0000) Subject: - added icons to derivates in DerivateView X-Git-Tag: 3.6.0~841^2~42 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/926bb819a0a997e63d3f1accb770619b44512922 - added icons to derivates in DerivateView --- diff --git a/.gitattributes b/.gitattributes index 8bcfb6a73..477238668 100644 --- 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 index 000000000..a186f0018 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 index 000000000..8adc848bd 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 index 000000000..e9a3d6ac4 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 9be591ddd..5c8e549d8 100644 --- 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 COLLAPSE_ALL="collapse_all" */ 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 a9e956dbc..3c0f2af05 100644 --- 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); + } + }