From 988861592f7f6899e8b999ac79d9f6b04f25e63e Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 7 Dec 2015 15:25:31 +0100
Subject: [PATCH] Add type specimen icon to derivate editor

---
 .../icons/specimen_derivate_type-16x16-32.png     | Bin 0 -> 891 bytes
 .../etaxonomy/taxeditor/model/ImageResources.java |   3 +++
 .../derivateSearch/DerivateLabelProvider.java     |   8 +++-----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_derivate_type-16x16-32.png

diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate_type-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate_type-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e0393c814bb75ce312b32d00ee298459e772a77
GIT binary patch
literal 891
zcmXw1T}TvB6u$S|yW{M*v(D<;x+|h4OQ5usiqH>1p{XwxTQB`sMi4zkP(&{UML+aZ
zJ@gU<Aw)0YlMwkDJp}y_RG5fAs35ui?CQEZGxw)6Mu&6f&Ybz~cfNDZeSBh|*S1m?
zA;j+Q>(1it1j__`K7Dqj3pe9NcHkuOiATg>DwD%V_*&oT>x5L+1dEavFY5?l_5IyP
zPTiWM4qFq{_XHpXV?M&SO=zK%WWX6^|6>H-(4`O@fVxVK-Fe{soaCHSrHZobDL=$2
z!bTW;p(#c8BH?2XZ`UPL92hK2Pi+p5q&D1zFbKzq7fLn(O*9has%`4J)wu%m{a@XO
zlY?i1f>vke-KFJ){k!+Q8_v8QUTkW{^wbEg#H$XCzwP-rwsHP=eyg}Sw}4<SrAqJ3
ztUkZro*hWUYv*RxAXI_$$m9u9m?<`Orm{~SedySe?rc{|aa^(5+WyOz{?%vN2BnJV
z;ENlK8MIs~M?zNbg>x7YLSQeLl2V`x8K5+>2fNamhgf54G8&6u2zfDxt>gKPb*Cy8
zK(@^-dSEa-f|3xWw@DZ<Ux<}_Zf<dkf1UUwl$WSZT4touvLo@BlZdJx3K#)k2%7)%
zdwG4Su(h_D&!y|zcvEWU`_H4Zxk(Dh$}FdLZGE{K7^P75w#L7VnkHzifHDoLG10;k
zHT6;3aYY%?*!@CjrRZ${1&VXk65ZfoEI<=H1CekQ;5eg}qwqq3A_`@2{IOj&p_m2p
zqJdUgm`0^-MNud0N@Z{wScw7=j5uHqOcQLd^pxv*WvY2c%R$pLIW{!i*b0nI%zrO=
zo10Rwd<g*X{+MM^#gh%GdXrhr$#gun1Lr_J-v>$=V;W^?@#gAH{%WMs#@-WEDld1o
z4ULalMhMeMB{dEQ(U@Jzpy46L4_rJupJ~JS1d@boYQXDBQE(uT1XWG9cNGTjek<Y^
N>F*in9z8mA?=S5LQ5*mO

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 e44c05689..8aab0e7ee 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
@@ -146,6 +146,7 @@ public class ImageResources {
 	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_TYPE = "specimen_derivate_type";
 	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";
@@ -353,6 +354,8 @@ public class ImageResources {
 		        "fieldunit_data-16x16-32.png");
 		registerImage(registry, SPECIMEN_DERIVATE,
 		        "specimen_derivate-16x16-32.png");
+		registerImage(registry, SPECIMEN_DERIVATE_TYPE,
+		        "specimen_derivate_type-16x16-32.png");
 		registerImage(registry, SPECIMEN_DERIVATE_CHARACTER_DATA,
 		        "specimen_derivate_data-16x16-32.png");
 		registerImage(registry, ARTWORK_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 3579eff6f..36c5e9278 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
@@ -352,11 +352,6 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
             else if(cdmBase.isInstanceOf(DerivedUnit.class)){
                 DerivedUnit derivedUnit = HibernateProxyHelper.deproxy(element, DerivedUnit.class);
 
-                boolean isType = false;
-                //type designation extension
-                if(typeDesignations.get(derivedUnit)!=null && !typeDesignations.get(derivedUnit).isEmpty()){
-                    isType = true;
-                }
                 if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.FieldUnit){
                     return hasCharacterData?ImageResources.getImage(ImageResources.FIELD_UNIT_CHARACTER_DATA):ImageResources.getImage(ImageResources.FIELD_UNIT);
                 }
@@ -367,6 +362,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                     return hasCharacterData?ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE);
                 }
                 else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
+                    if(typeDesignations.get(derivedUnit)!=null && !typeDesignations.get(derivedUnit).isEmpty()){
+                        return ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE_TYPE);
+                    }
                     return hasCharacterData?ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE);
                 }
                 else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.Media){
-- 
2.34.1