From: p.plitzner <p.plitzner@bgbm.org>
Date: Tue, 23 Feb 2016 07:58:20 +0000 (+0100)
Subject: REvert caching of cdm formatter
X-Git-Tag: 4.0.0^2~129
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/23ffcd61b9203211db1044d24a3ef7f13e19b061

REvert caching of cdm formatter
---

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 980a464f3..540748a0e 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
@@ -64,8 +64,6 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
 
     private static Map<DerivedUnit, Collection<SpecimenTypeDesignation>> typeDesignations;
     
-    private static Map<Class<? extends Object>, ICdmFormatter> formatterMap = new HashMap<>();
-
     private ConversationHolder conversation;
 
     private static DefinedTerm photoTerm = null;
@@ -154,12 +152,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 FormatKey.MEDIA_TITLE, FormatKey.SPACE,
                 FormatKey.MEDIA_ARTIST, FormatKey.SPACE
         };
-        ICdmFormatter formatter = formatterMap.get(element.getClass());
-        if(formatter==null){
-        	formatter = CdmFormatterFactory.getFormatter(element, formatKeys);
-        	formatterMap.put(element.getClass(), formatter);
-        }
-        return formatter.format(element);
+        return CdmFormatterFactory.format(element, formatKeys);
     }
 
     /** {@inheritDoc} */