From 15a1b2cd5ba9bd4f63e196702fbf3107257d0528 Mon Sep 17 00:00:00 2001
From: "p.plitzner"
Date: Mon, 22 Feb 2016 16:23:24 +0100
Subject: [PATCH] Adapt to cdmlib formatter interface change
---
.../taxeditor/view/derivateSearch/DerivateLabelProvider.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 14265f1d5..42d538a0c 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
@@ -27,7 +27,7 @@ import org.hibernate.LazyInitializationException;
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.CdmFormatter;
+import eu.etaxonomy.cdm.format.CdmFormatterFactory;
import eu.etaxonomy.cdm.format.ICdmFormatter.FormatKey;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -135,7 +135,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
if(element instanceof TreeNode){
element = ((TreeNode) element).getValue();
}
- CdmFormatter formatter = new CdmFormatter(
+ return CdmFormatterFactory.format(element,
FormatKey.GATHERING_COUNTRY, FormatKey.SPACE,
FormatKey.GATHERING_LOCALITY_TEXT, FormatKey.SPACE,
FormatKey.GATHERING_DATE, FormatKey.SPACE,
@@ -151,7 +151,6 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
FormatKey.MEDIA_TITLE, FormatKey.SPACE,
FormatKey.MEDIA_ARTIST, FormatKey.SPACE
);
- return formatter.format(element);
}
/** {@inheritDoc} */
--
2.34.1