From: Patrick Plitzner Date: Thu, 11 Aug 2016 13:25:46 +0000 (+0200) Subject: Fix specimen editor label provider for still images X-Git-Tag: 4.3.0^2~79 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5c228c718aa7f1b6c3126f423ea6059a0277471f?hp=66b0c98f15c514608fda3395ad1bb12e7a3cfd00;ds=sidebyside 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 ebe3b81bf..8eabfd07b 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 @@ -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.format.ICdmFormatter; 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 multiLinkSingleReads; private static Map> typeDesignations; - + 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); } - 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);