Fix specimen editor label provider for still images

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 ebe3b81bf3778ab995c7e2a5cb0728aa0c933e97..8eabfd07b640e79748116217a2c26ac471d54245 100644 (file)
--- 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
@@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
 import eu.etaxonomy.cdm.format.CdmFormatterFactory;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
 import eu.etaxonomy.cdm.format.CdmFormatterFactory;

-import eu.etaxonomy.cdm.format.ICdmFormatter;

 import eu.etaxonomy.cdm.format.ICdmFormatter.FormatKey;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.format.ICdmFormatter.FormatKey;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;


@@ -63,7 +62,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
     private static Set<SingleRead> multiLinkSingleReads;
 
     private static Map<DerivedUnit, Collection<SpecimenTypeDesignation>> typeDesignations;
     private static Set<SingleRead> multiLinkSingleReads;
 
     private static Map<DerivedUnit, Collection<SpecimenTypeDesignation>> typeDesignations;

-    
+

     private ConversationHolder conversation;
 
     private static DefinedTerm photoTerm = null;
     private ConversationHolder conversation;
 
     private static DefinedTerm photoTerm = null;


@@ -368,7 +367,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                     }
                     return hasCharacterData?ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE_CHARACTER_DATA):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){
+                else if(derivedUnit.getRecordBasis().isKindOf(SpecimenOrObservationType.Media)){

                     if(derivedUnit.getKindOfUnit()!=null){
                         if(derivedUnit.getKindOfUnit().equals(getArtworkTerm())){
                             return hasCharacterData?ImageResources.getImage(ImageResources.ARTWORK_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.ARTWORK_DERIVATE);
                     if(derivedUnit.getKindOfUnit()!=null){
                         if(derivedUnit.getKindOfUnit().equals(getArtworkTerm())){
                             return hasCharacterData?ImageResources.getImage(ImageResources.ARTWORK_DERIVATE_CHARACTER_DATA):ImageResources.getImage(ImageResources.ARTWORK_DERIVATE);