ref #9594 , ref #5573, ref #7612 use MediaSpecimenCacheStrategy in DerivateLabelProvider

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
index 94802452b7c208836545f03efd4261b2313fa58a..6567d827180cf7472e1a0730b899e9e6aaa9c846 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
@@ -154,14 +154,8 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
             text = ((FieldUnit) element).getTitleCache();
         }
         else if(element instanceof MediaSpecimen){
-            text = CdmFormatterFactory.format(element,
-                    new FormatKey[]{
-//                            FormatKey.MEDIA_TITLE_CACHE, FormatKey.SPACE,
-                            collectionKey, FormatKey.SPACE,
-                            FormatKey.MOST_SIGNIFICANT_IDENTIFIER, FormatKey.SPACE,
-                            FormatKey.MEDIA_TITLE, FormatKey.SPACE,
-                            FormatKey.MEDIA_ARTIST, FormatKey.SPACE,
-                            });
+            MediaSpecimen mediaSpecimen = (MediaSpecimen)element;
+            text = mediaSpecimen.getTitleCache();
         }
         else if (element instanceof DnaSample) {
             text = CdmFormatterFactory.format(element,
@@ -261,18 +255,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         }
         //MediaSpecimen
         else if(derivate instanceof MediaSpecimen){
-            MediaSpecimen mediaSpecimen = (MediaSpecimen)derivate;
-            if(mediaSpecimen.getMediaSpecimen()!=null){
-                label += mediaSpecimen.getMediaSpecimen().getTitle()!=null?mediaSpecimen.getMediaSpecimen().getTitle().getText()+separator:"[no motif]";
-                label += mediaSpecimen.getMediaSpecimen().getArtist()!=null?mediaSpecimen.getMediaSpecimen().getArtist()+separator:emptyString;
-            }
-            eu.etaxonomy.cdm.model.occurrence.Collection collection = mediaSpecimen.getCollection();
-            if(collection!=null){
-                label += collection.getName()!=null?collection.getName()+" ":emptyString;
-                label += collection.getCode()!=null?"("+collection.getCode()+")"+separator:emptyString;
-            }
-            label += mediaSpecimen.getAccessionNumber()!=null?mediaSpecimen.getAccessionNumber()+separator:emptyString;
-            label += mediaSpecimen.getBarcode()!=null?mediaSpecimen.getBarcode()+separator:emptyString;
+            label = ((MediaSpecimen)derivate).generateTitle();
         }
         //TissueSample + DnaSample
         else if(derivate instanceof DnaSample