From 968295ecb82935694c80d86250de6a9da3901fc1 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Wed, 8 Apr 2015 12:40:47 +0000 Subject: [PATCH] - added icons for derivates which have character data attached --- .gitattributes | 8 +++++ .../icons/artwork_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../detail_image_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../icons/dna_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../icons/fieldunit_data-16x16-32.png | Bin 0 -> 1388 bytes ...ing_plant_photo_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../icons/specimen_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../specimen_scan_derivate_data-16x16-32.png | Bin 0 -> 1388 bytes .../icons/tissue_sample_data-16x16-32.png | Bin 0 -> 1388 bytes .../taxeditor/model/ImageResources.java | 24 +++++++++++++ .../derivateSearch/DerivateLabelProvider.java | 33 +++++++++--------- 11 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.store/icons/artwork_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/detail_image_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/dna_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/fieldunit_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/tissue_sample_data-16x16-32.png diff --git a/.gitattributes b/.gitattributes index 08f910469..cf5f071a7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1070,6 +1070,7 @@ eu.etaxonomy.taxeditor.store/icons/alt_window_32.gif -text eu.etaxonomy.taxeditor.store/icons/amplification_derivate-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/applications-office.png -text eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/artwork_derivate_data-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/autonym_no_bg.gif -text eu.etaxonomy.taxeditor.store/icons/back.gif -text eu.etaxonomy.taxeditor.store/icons/basionym.gif -text @@ -1096,7 +1097,9 @@ eu.etaxonomy.taxeditor.store/icons/delete.gif -text eu.etaxonomy.taxeditor.store/icons/delete_edit.gif -text eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/detail_image_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/detail_image_derivate_data-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/dna_derivate_data-16x16-32.png -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 @@ -1105,6 +1108,7 @@ 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.png -text +eu.etaxonomy.taxeditor.store/icons/fieldunit_data-16x16-32.png -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 @@ -1133,6 +1137,7 @@ eu.etaxonomy.taxeditor.store/icons/large_image.gif -text eu.etaxonomy.taxeditor.store/icons/leaf_detail.png -text eu.etaxonomy.taxeditor.store/icons/linkto_help.gif -text eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate_data-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/lock.png -text eu.etaxonomy.taxeditor.store/icons/lock_open.png -text eu.etaxonomy.taxeditor.store/icons/lockedstate.gif -text @@ -1179,7 +1184,9 @@ eu.etaxonomy.taxeditor.store/icons/single_read_derivate_multilink-16x16-32.png - eu.etaxonomy.taxeditor.store/icons/smartmode_co.gif -text eu.etaxonomy.taxeditor.store/icons/sort.gif -text eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/specimen_derivate_data-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/step_done.gif -text eu.etaxonomy.taxeditor.store/icons/swap.gif -text eu.etaxonomy.taxeditor.store/icons/swap2.gif -text @@ -1194,6 +1201,7 @@ 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.png -text +eu.etaxonomy.taxeditor.store/icons/tissue_sample_data-16x16-32.png -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/artwork_derivate_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/artwork_derivate_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..317d2fe29f6f68b255e0c990ee4887c2664819a2 GIT binary patch literal 1388 zcmd6nYgp1(9LJAymvT9+R%;`=1l+g`sxW63^juv(ut#TBW^%kiRaz9_yB76+rNA$K#3dr+BN@2!+gBmYXrL zq_MHFz#<+WeVR$PBM``O7%Yv`j1G0ylE@7D=@FFq6qCh>iqZ!Jmry9U9g#jaAEK#t zgKAAHlPi-NU%k9R`2<@-rMI-G9!+3L^`KR(Jlj1+kL!6S`s`jN3o*-3ArbDYv@Thjih8#ydF07D*La%!51A zjY_LKo@ra~m>igfQJ7maS8_$&7Nd%_N^F#pFdAcO-)NnOHWUK@!~~BMn-04 zW>!{Kc6K(2M9Rs@A(P1z3MDr;H!m+QKR>^qprEj@u&Ai0xVX5aq~ztxm!+kpWo2dM z<>gc=wW6Y;va+(Os;auWnnt75)YR10*4EY4(dqR1`g#U~!DKR7ELKB9Lt|rOQ&SV0 z&E{}8&CSg%EiGIwx3#sE$K$oNwY9gmcXV`gc6Rdle1SmF)z#JA-7ORfdwP0AB9T}u z?(OZBNF;rIeNw5kzrTNAU|?`?P$rYf<#L5WF*GzZJUl!yGBP?kiVU7osT?04fA#8> zN~J;?IypHxH8rJHt2G+U^z^h=tDTvdnVp@To14?=bo2A`$owoUEU+V&djntqf=-}4 zk?T7MyhHZ?5Csd4)*0zYEzDe<9K1rh4NMKj^#Fx&a>AfcC`?G;&wuQ}paDGdy(dKU z&5W-C>{mdp|c= z1i^~{ZvXMx$Kc?$0RP3v4g|oze!7A97NgtY5mv~f5MDTN7xClkPk+5?ISRn*zdbQr zi-51*`{nm9eIvnVH*NmDZ2OV5#nP3>qE~fQx$S(?9ozYGdN56Zo0aKGB|mLR=Z5L?<6ybxKqqucL0K zll$!(H%)R~Yu0z4pFgu8K=bqR6<@!64K7GJ?P#kMW%Sz3v$dtAWA!92ch7A{cdpD$ zeJUpT>D1}+opTt9HD3#p}`@^6KWnZFwATzU0|xgTyB__ zlDcBsnkRgMfB*j7bLsNO*>m&vFL`ca{^s@T(9C%L6!m#?=Din{)~a_d-9D#qR^6J? za`UqAtqH-;p1epdNqfn~SF?9vWLWr`W1C~^(|?J`e^Jpma`>=Ft+8XW-`sWUtCvh; ztWtf;Cw%kKBasZ<%BH4I>o=Ucaz1Zr)mJ&yxl?MlZQYi8d|A%onknn&2xlwSZl3l` zOE*X!bWTaedefadzPpKI{zyF8|k9Z;= zT(N5UqeqVl_AdIoVN*{}Pj7E;UteE;fB%FD6DCfaIBC+P$&)8fnKEVS)Tz^^O`AS_ z`ivPfX3m^BYu2pUvuDqlGiUDHx%1}Dn?Ha4f&~i}E?l^1(W1qR7cW_|Wa-kS%a$!$ zzI^$L6)RS*T)Ar1s@1DkuUWHZ?b@~L)~#E=e*K0G8#Zp-xM|a-&6_uG*|KHp)~(yN zZQH(m`;HwucJAD{YuB#byLa!|vuE$#z5Dj<+rNMRfddB)9z1yH(4oVJ4<9*l(;H?w{PFMbLZ~eyZ7$hyMO=wg9i^DK70raipP&1KY8-x z>C>mro;`d1{P~L)FJ8WU`RdiH*RNl{dGqG&+qduDy?g)u{f7@9K7Rc8>C>mrpFe;3 z^5yH-uiw6X`~Lm=j~_pN{`~pt*RS8dfB*UO2blc+{rmU-|9>U1)tU?pj0`0~e!)O4 zQGkIcRYOb>&{G1BHqHcwg|w%OV@SmV}0zodk}nn5E=uUNcG$z5HsL_;**N{T^)yTG_u+?cmY zT}!Sy%^`(BL&H*`P&_G=*S*fqo{2*PC=eqbS6G~sgTe~DWM4fO>8!g literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/dna_derivate_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..3255f79b4c080bef8f94f57a09fc9810ca019881 GIT binary patch literal 1388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR?)PCoNfdVI!aJcW>{D zH{M6Jp55O*=ew$EzFW=rHLL!;e*S-E`*#M0?%8K1hu54=%?(am^}f33p{>K+`uhLB zzgO4pIK2PHO$PRVd-r`86#QOa|2;QmMf<8mr-m-g$hx=*-+Ow$ySlZOE_)pp@tJ5-8WL56`w|R3-*TEm(e}00t*xu8tFNzbXlQ6`Y;0<3YHn_BX=!O~ZEb67Yj1Dw z=;-L|?Ck35>hA9D>FMe1?d|L9>+kQMFk!;Pi4!MHnlyRx({T}uwlc-jT<*@+O&D|<}F*cY~8wb+qP}n zw{PFEW5>>&J9q8cwR`vOJ$v@--Me?+zJ2@m?>}(hz`=tD4;?ym`0(K)M~)mldi2<_ zW5Po6w| z`t;eeXV0HMfAQkQ%a<=-y?XWf_3Jlp-n@PL_T9U8@87@w@ZrP9j~_pM`toO%)9PkB9}a0>eVu)5S5Q;ufO-|7NHF7-^X5@hHRkb7V+djqu}M{ROpY+tR8=sJU}s=d_qS6u&2-{aRn=8h zm5^jm6}3{$bXIjyVU|+WWY%W~8mhs^t(q$2&65o>BN8ZJ9v#PT7{cV86c!A!1>_D3 zYl8p*H8*jcNL8piRL!GoJ%rh0S+igQssi$%KGIy;41N%os;UYoc?zm>nurC!1Y$Vc zRqd34E`bSnY3cgf0QqnMRm*T6kc9|=_;fw6fU>;4*mrK0slZZ{!PC{xWt~$(69CHj BJZJy_ literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/fieldunit_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..3626a2c5ca3f6f40156bbfe56de862a4117e7820 GIT binary patch literal 1388 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 IIVCg!0R0_8@c;k- literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ca7cf44ef8163169c162f4645053c5077cee78 GIT binary patch literal 1388 zcmcgsX;4#V6#bAcilrc6v945WOIz(Kt#za5qX~#WfeO}Iu_|bxQWZp&Anpa*S{GD6 zkR6Hai-aXC2@rO&Xn>FeLKd=-#PE{5Eads@^iTggJu~;*x%bDJxo6JYv_OBHz1?y< z0D!#@9ty&`FIH~(Ut|axxJ+WL>C0s&0DS2-l04JN$0u@Nl1(mUGw9fM*0U(PL$L- z+ol;p6iOKmSFa#&dkI~v;dy1P(yXzbJ~gjrjaayxoU~$;3?E!i&=!>lTDX+-P<}G1 zyoAECi3zSwZ_KO7@RyvKQL>Lol2Bf(VT~KxGzDv6^V_G! zv$H5%e{wEEzkCHjmCfxuKhu3wGZ>kLwi-5U7%kso;v|@0p;E#@XuV~!<|J!wxae}R zphmlOTa4)z!Z?MRl_pu4fSPn(dLJRAk|h0Ni+rCjg@EQ+Bab0j_cbd0Y~Nv~nb%2Y zNPT^cPD}lyabc6md3kyH`S}F}1%-u$MMXu$#l0t*xu8tFNzbXlQu+_;F)nBZ)+6YHDh3ZfDyKlgVvu zZSC#t9UUE=ot+d4g^FF<)z#hI-P6-UqtSYMd;9wO`unk94Gazr4h;nl|LZMVDF^5$um0GRVXf)5BJ=1Enb8~Yr4C{0{y7HD7Qh>9$=$#@F9Cee{LxdC!xtf*AMXZ|}K!^{4OLKL38@ zx9|T9T(3Ah*mG^0_m1$-qBh%q@&}07cjmDFo~*RDehfPF)hYabfXCyrPTa!yU%XiS Y2aY6P`$VpTEA~Z!kGDTmxikF2bKBdMGXMYp literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/tissue_sample_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..68fb3cd25399c074f46f60bd02a33dec4d3c1046 GIT binary patch literal 1388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR=ZsWIDD^*&@by`{})Q zTLsU?h)=z}|6N?1{A9#x4Zo|azy9)h)A{|6nHdh&75rGdM7Q2~_oV)~)z#mHh53_I zf9=}!_us!|JJ-B^|K@v3Yqc3KN51lRMn;}qoBxT4X|qf0ihQof3Cguv9JqbryNPMg zw3Ht=Z~bLpTzq2f&(&*wOq=T-#B+mgiowo|F5C(>#y$^bEFkpy?%9deSZJxznYqAvt7TV!qN*HX75}qRc9hp zt^0q*jNhD`|AoX}GB5~sTJAq}Fn&Xgb*KNwPagwjrieEf8FqLWw7Y#**GNrGO-oBl zPfyRt$jHph%*x8j&d$!s$;r*l&CAQn&(AL?C@3r}EGjB0E-o%9DJd;2Eh{T4FE6jC zsHm*0tg5Q2uCA`Bsj024t*fi6udi=tXlQI~Y-(z1ZfFMq5?d$97@9&>5VZy|T6DLiYG|;B zXU&>5d-m)(bLPyQJ9pl^dGqJbU$9`o!i5VLEn2jA@!};*mMmSmblI|H%a<=-v0}x_ zl`B`RTD5xh>NRWDtX;cy-MV$_*RS8OVZ+9a8#is*w0ZO9EnBv1-MV$#wr$(DZ{M+F z$IhKQckSA>d-v`=d-m+zyLaEdef#(CKXBl{!Gi}69XfRQ@ZlpzjvPID^w_au$B!RB zapJ_ulP6D|I(7Q==`&}}oIQK?+_`h-&!4|=;ljm>7cX79bouh-D_5>uy?XW9wQJX} zU%zqV#?6~IZ{50e`}XZSckbN1d-vYGd-w0(fAHYJ!-o$aJ$m%`@#7~?o;-c}^x3m# z&!0bk@#4kHmoHzvdiDDC>o;%SynXxj-Me@1-@pIx;lsy|A3uHi^!fAWFJHcV{rdIW zw{PFSfB*60$IqWXfBpLP`}glZfByXa3rx2E{{R19*JU}Ifq{{sB*-rq$i)H}u!s#$ zA#G_xVCldp?djqeQgMq>fbso51~Diw()42!1hQcQRsrhj>Jf5q0Zkbh3sF;b8FpQW z3SCQ}fEd4wjJh9KfSXUE2XX@CZ-EyItT*=T$~MA)Fm}V#nd#d zyo4DXZJ0I8IE>Y0QpB`?W;ifd`v?Sk3o)t7sDKT1WzY-tNf3)QS5%L5@RE@U7h{O? zOq5U-iM9*!h~jk+1v*ULhfz!~Ovz0)%-kO23x*h5F$0EBPHkxc9uObs7YP@Iq`+j= s5PvWqDB#V?EEW&pKvan9BX~eo_gB^RUyELC0frNUr>mdKI;Vst05K^QkpKVy 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 d1d90b90b..51dcd8413 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,13 +135,21 @@ public class ImageResources { public static final String COLLAPSE_ALL = "collapse_all"; public static final String TISSUE_SAMPLE_DERIVATE = "tissue_sample_derivate"; + public static final String TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA = "tissue_sample_derivate_character_data"; public static final String DNA_SAMPLE_DERIVATE = "dna_sample_derivate"; + public static final String DNA_SAMPLE_DERIVATE_CHARACTER_DATA = "dna_sample_derivate_character_data"; public static final String FIELD_UNIT = "field_unit"; + public static final String FIELD_UNIT_CHARACTER_DATA = "field_unit_character_data"; public static final String SPECIMEN_DERIVATE = "specimen_derivate"; + public static final String SPECIMEN_DERIVATE_CHARACTER_DATA = "specimen_derivate_character_data"; public static final String ARTWORK_DERIVATE = "artwork_derivate"; + public static final String ARTWORK_DERIVATE_CHARACTER_DATA = "artwork_derivate_character_data"; public static final String SPECIMEN_SCAN_DERIVATE = "specimen_scan_derivate"; + public static final String SPECIMEN_SCAN_DERIVATE_CHARACTER_DATA = "specimen_scan_derivate_character_data"; public static final String LIVING_PLANT_PHOTO_DERIVATE = "living_plant_photo_derivate"; + public static final String LIVING_PLANT_PHOTO_DERIVATE_CHARACTER_DATA = "living_plant_photo_derivate_character_data"; public static final String DETAIL_IMAGE_DERIVATE = "detail_image_derivate"; + public static final String DETAIL_IMAGE_DERIVATE_CHARACTER_DATA = "detail_image_derivate_character_data"; public static final String SEQUENCE_DERIVATE = "sequence_derivate"; public static final String AMPLIFICATION_DERIVATE = "amplification_derivate"; public static final String SINGLE_READ_DERIVATE = "single_read_derivate"; @@ -327,20 +335,36 @@ public class ImageResources { "lock_open.png"); registerImage(registry, DNA_SAMPLE_DERIVATE, "dna_derivate-16x16-32.png"); + registerImage(registry, DNA_SAMPLE_DERIVATE_CHARACTER_DATA, + "dna_derivate_data-16x16-32.png"); registerImage(registry, FIELD_UNIT, "fieldunit-16x16-32.png"); + registerImage(registry, FIELD_UNIT_CHARACTER_DATA, + "fieldunit_data-16x16-32.png"); registerImage(registry, SPECIMEN_DERIVATE, "specimen_derivate-16x16-32.png"); + registerImage(registry, SPECIMEN_DERIVATE_CHARACTER_DATA, + "specimen_derivate_data-16x16-32.png"); registerImage(registry, ARTWORK_DERIVATE, "artwork_derivate-16x16-32.png"); + registerImage(registry, ARTWORK_DERIVATE_CHARACTER_DATA, + "artwork_derivate_data-16x16-32.png"); registerImage(registry, SPECIMEN_SCAN_DERIVATE, "specimen_scan_derivate-16x16-32.png"); + registerImage(registry, SPECIMEN_SCAN_DERIVATE_CHARACTER_DATA, + "specimen_scan_derivate_data-16x16-32.png"); registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE, "living_plant_photo_derivate-16x16-32.png"); + registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE_CHARACTER_DATA, + "living_plant_photo_derivate_data-16x16-32.png"); registerImage(registry, DETAIL_IMAGE_DERIVATE, "detail_image_derivate-16x16-32.png"); + registerImage(registry, DETAIL_IMAGE_DERIVATE_CHARACTER_DATA, + "detail_image_derivate_data-16x16-32.png"); registerImage(registry, TISSUE_SAMPLE_DERIVATE, "tissue_sample-16x16-32.png"); + registerImage(registry, TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA, + "tissue_sample_data-16x16-32.png"); registerImage(registry, SEQUENCE_DERIVATE, "sequence_derivate-16x16-32.png"); registerImage(registry, AMPLIFICATION_DERIVATE, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java index cdcf55009..80d49bca7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java @@ -304,44 +304,43 @@ public class DerivateLabelProvider extends ColumnLabelProvider { } if(element instanceof CdmBase){ CdmBase cdmBase = (CdmBase)element; -// boolean hasCharacterData = false; -// if(cdmBase.isInstanceOf(SpecimenOrObservationBase.class)){ -// SpecimenOrObservationBase specimen = HibernateProxyHelper.deproxy(cdmBase, SpecimenOrObservationBase.class); -// if(!CdmStore.getService(IOccurrenceService.class).getCharacterDataForSpecimen(specimen).isEmpty()){ -// hasCharacterData = true; -// return ImageResources.getImage(ImageResources.CHARACTER_DATA_DERIVATE); -// } -// } + boolean hasCharacterData = false; + if(cdmBase.isInstanceOf(SpecimenOrObservationBase.class)){ + SpecimenOrObservationBase specimen = HibernateProxyHelper.deproxy(cdmBase, SpecimenOrObservationBase.class); + if(!CdmStore.getService(IOccurrenceService.class).getCharacterDataForSpecimen(specimen).isEmpty()){ + hasCharacterData = true; + } + } if(cdmBase.isInstanceOf(FieldUnit.class)){ - return ImageResources.getImage(ImageResources.FIELD_UNIT); + return hasCharacterData?ImageResources.getImage(ImageResources.FIELD_UNIT_CHARACTER_DATA):ImageResources.getImage(ImageResources.FIELD_UNIT); } else if(cdmBase.isInstanceOf(DerivedUnit.class)){ DerivedUnit derivedUnit = HibernateProxyHelper.deproxy(element, DerivedUnit.class); if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.FieldUnit){ - return ImageResources.getImage(ImageResources.FIELD_UNIT); + return hasCharacterData?ImageResources.getImage(ImageResources.FIELD_UNIT_CHARACTER_DATA):ImageResources.getImage(ImageResources.FIELD_UNIT); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.DnaSample){ - return ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){ - return ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){ - return ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.Media){ if(derivedUnit.getKindOfUnit()!=null){ if(derivedUnit.getKindOfUnit().equals(getArtworkTerm())){ - return ImageResources.getImage(ImageResources.ARTWORK_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.ARTWORK_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.ARTWORK_DERIVATE); } else if(derivedUnit.getKindOfUnit().equals(getLivingPlantPhotoTerm())){ - return ImageResources.getImage(ImageResources.LIVING_PLANT_PHOTO_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.LIVING_PLANT_PHOTO_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.LIVING_PLANT_PHOTO_DERIVATE); } else if(derivedUnit.getKindOfUnit().equals(getSpecimenScanTerm())){ - return ImageResources.getImage(ImageResources.SPECIMEN_SCAN_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.SPECIMEN_SCAN_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.SPECIMEN_SCAN_DERIVATE); } else if(derivedUnit.getKindOfUnit().equals(getDetailImageTerm())){ - return ImageResources.getImage(ImageResources.DETAIL_IMAGE_DERIVATE); + return hasCharacterData?ImageResources.getImage(ImageResources.DETAIL_IMAGE_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.DETAIL_IMAGE_DERIVATE); } } } -- 2.34.1