From 968295ecb82935694c80d86250de6a9da3901fc1 Mon Sep 17 00:00:00 2001 From: Patric Plitzner
AXq@%NYF?}H^kdj z*VBc8RmwcViGfpAS;f!JSyG;rfkR8&gVV-HR@R(bf=yb~7NkW_#Kg+nTuDe%49EeS zA!TpFz{zgH3bF^RLR?D3ijmdaO%Ey{0(6B|mLR=Y=C8jN0uz{Pa(p%-h z{ReA&y*j&E|4GXp*uK})!Za==?q^xqzh%pQfBqakE#0uy?K=a*Lt}l;29y4c)4vCY zT)uyQ_Sr3kC57M3%=xlaCrz68eex8kGUI)h57#g1`1|kQcR|55Ygb=lWsqq$6E4?~y0f{ZJ~uDx#PQ=jw$@W;&;A}4|KH91eQoVgc|MLx z)yk@}yO(Y$mzbqaDg3`>`~20bCQs>q`Rv8_=9Y&}Hs2K$^P6h_+1LtK>B==Zbj|5o zba16rqxal-bGEJBEM0B#kAdNPM&_~Gr+G@${%aYCG?^qVEINMr^rII~7A~BB@xj&q zs;b{LH2QbWyL0=FX{Xo!+D6`bEu}{5Z&p_PB^rgrc{8U^d-VA6{7p-~*Vg^k(*D~w z!Q9Tex4*MsL5*RDdtzqd;VZ`*R&-r^aFZcZ>dcwb1+`V*!y~qy+V$b{$A2qVJvBB` zuCVCaI-{zp;>C;SCr%u%si~>0t*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<_ zW5o;%SynXxj-Me@1-@pIx;lsy|A3uHi^!fAWFJHcV z{rdIWw{PFSfB*60$IqWXfBpLP`}glZfByXa3rw5;{{R0UBB}>W(u@oxL4LtNEjm?&)^oL3}i%cSo(Q+DVqk$ zGbF_VMO64b@{a{NjCqev#!@iI2_9c2b=gW}?c}_mmS5=-%5#(zi011FVWF&-^ Z*I#LNOHcE360j6y@O1TaS?83{1OUXfG(rFX literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate_data-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate_data-16x16-32.png new file mode 100644 index 0000000000000000000000000000000000000000..62c0d6c8a7b1ec8c2d7542e95946c9e29013ca4d GIT binary patch literal 1388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^_srTZe6d}m+?Pl>#H z_wGM;j~km;h0RJ|x?<^B-4L}Jo7X?TRdgiR`_2B5oqcH8v0KltPM*~zTViydPwAhI zZt2p-Rpw>iTiXs@JUajI#^;|O*>wf}{{HLN;UoMd8p}IYbsZ`CvvgTo{Jj5s0zdEE z-Mr<%(iIagN*n1mIQ=Or%gV`Ie`@RR^XHEpI$Axe={py9=A>etY!&fl`*P zq~~v4&42&E7x!L#H#C%QauTf5`LSj#bC&FX4(1K3*ZpB+l&LoP^!d|&2|3*kmlZ4K z6|Ab`E>?}4l)iV@o_F70-+p{IDJ@*MOsA=@{J*W!uS-|{n;ZX{I#ssO?9|P3ZB7%n zoY^&T?xdf~S1=dKD>hm=cZ4iHw5oJ%b4FId(vFS)xww7=1a$dMV#`-B=x{rB<>a}| zmx5+x{FhPs`2M|7r$=>lbxlo8ZEbB`U0r>BeM3V-V`F1eQ&V$ub4yE0Yiny;TU&d3 zdq+n{XJ=CQh6C&akmMvSp zeEEtMD^{*txoXv_)vH&pS+i#C+O_M}ty{l-{e}%2Hg4RwY15|7n>TOSvSsVmt=qP3 z+rEAKjvYI8?%cU+*RI{WckkJ=XYby<`}XbIzkmOM0|yQsJb38Pp~Hs{A31X5=+UFc zjvYIG{P>9zCr+L`dFs@u)2C0LIdkUh*|X=)ojZU2{Dlh_E?&HN>C&akmoHzra^>pP ztJkhwyMF!pjT<*^-n@D1)~(yOZ{N9d2bdJ^-Me@H{{06J9z1;b@X@13j~_pN^5n_W zr%#_fd-nYK^A|5(ynOlc)vH&pU%!6y<_$0nynFZV{rmSHK79E2@#CjYpFV&7{N>A+ zuV24@`}Xbo_wPS`{P_9v=dWMCe*gac=g*(NfByp0)&Kwh&o|${!oa}DP!i-94CIml z7|75w7_~6`FEKdv9vBwVo-U3d6}K1#7~lV6FoOdfH%(bHGl+ncf}pB(frx2r%)!A-(F!79?83|Gr|*-XA5aJt zD9X364-n4?P)=Z|1X*jtZRcM_VHOl>#;wLv?iIn{%wQNRlr15n zo5E#o9xIo|5L99(6c{e#6e%4Z7#Nrw&0xlEo*Wn$?#ht`HF_>v*nj6LX>iKIF zn}>%xgPfit%@vYs!kiYyE}8=MT#%U=ix$+^5QhOdj!=PXH>}r`Z!cX3EJYbSUHx3v 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