From 926bb819a0a997e63d3f1accb770619b44512922 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Wed, 4 Dec 2013 15:12:11 +0000 Subject: [PATCH] - added icons to derivates in DerivateView --- .gitattributes | 3 +++ .../icons/dna_derivate-16x16-32.gif | Bin 0 -> 992 bytes .../icons/fieldunit-16x16-32.gif | Bin 0 -> 984 bytes .../icons/tissue_sample-16x16-32.gif | Bin 0 -> 1002 bytes .../taxeditor/model/ImageResources.java | 11 ++++++++ .../derivatesearch/DerivateLabelProvider.java | 25 +++++++++++++++++- 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif create mode 100644 eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif create mode 100644 eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif 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 0000000000000000000000000000000000000000..a186f0018076d8082fc12450483d228b33f1b400 GIT binary patch literal 992 zcmV<610VcHNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000 z5C9MWhXMitsHmq{SXboaWo2Xy4GS?bFSE0=?Ck3t92$g#gQ20IMMXnUP)~GpbCQyg(9qB|H8WdVT1`z% zAt4`#h=-h{0D=aK5EiElBE-o)GFEB7LF)=YR zGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4B zLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz` zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b% zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfI znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2 ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)- zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6znoFHNGqCgK592g)mz@vi<5+XPlVZs3h3IZ8C zcwiAii3kfEi1-i!go6$i0D!n~p<{{>4oCo?aKHnB2O16xcz}Y#0|gc&JaF&;zz3HI z4mcQ4VuJt_9Z4YgaKS->3=RT(RagQh0;CTj6p$b`VucAXHwZO3paBOG6+JT8fB*mj O282I=7}0lOKma>1zvu`6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8adc848bdd945b4ce8a4ea6b31c95126dcb37b2b GIT binary patch literal 984 zcmV;}11J1PNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000 z5C9MWhXMiuo12?NL`37`<8N9N_lyCtgNi{0D=aK5EiElBE-o)GFEB7LF)=YR zGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4B zLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz` zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b% zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfI znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2 ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)- zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T65Fnrc0t*ldOfV>+0fY)3Ay_Ctp`Zi+C=ozdU|~Up00Rvq z_y_<&01gQ#SP*c)0RsvUAT$7=zyQt!7&m5E5OgSo0W$@(Od#-rg$ETt8n}=^K*k0z z9T-6H-~xaM9RO_DaG?T(0RsaxXu!dN29F9bET~J6L4<)FDiojyH=%<87!q_a%((Hu GfB-ux-rKYQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e9a3d6ac402a7ff926f90715f0e6ed0588b59949 GIT binary patch literal 1002 zcmVHxhr-*6oN4oZ!PKT>d4f~f2fI3mSYHK zAs2ixJZ(yv$fs_pe*XUc@A>j3emon4HUx7aGk!*SjeQe(El_@3vC+EJ-PT-|YlOIx zL2;Jehqd8vi<^7YTx(Y?sPQi)&@f-g3LN)mJ{0BaVZw5Bh3LI7Z`$bI`}g|g=;msicSML*&D+r%i8xPBPf$=$QBhG+Qc_b>Q&dz` zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b% zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfI znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2 ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)- zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6IDz!S2_*s@@Q7i70t^&X zsV2xUP-_bs6^xv4Qq%SDWV8~%$;EfhTg2bQ-fkle~HVQJJz=6jG Y2qr$@cvvFEf+hnJKRgh@;=q6aJ1&4682|tP literal 0 HcmV?d00001 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); + } + } -- 2.34.1