- added static method to DerivateLabelProvider to get the derivate text

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / derivate / DerivateViewEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
index 141299b613d91e3c4f057506679a60d8e92cb48a..0d677cd096f6738ac89c2d2b26d8428aacd90a06 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
@@ -131,17 +131,14 @@ public class DerivateViewEditorInput implements IEditorInput{
 
     private String getEditorName() {
         String name = null;
-        //FIXME consider giving label provider a static method to get the derivate text. Pass the conversation as a method parameter.
-        DerivateLabelProvider labelProvider = new DerivateLabelProvider();
-        labelProvider.setConversation(conversationHolder);
         for(UUID uuid:rootUUIDs){
-            SpecimenOrObservationBase specimen = CdmStore.getService(IOccurrenceService.class).load(uuid);
+            SpecimenOrObservationBase<?> specimen = CdmStore.getService(IOccurrenceService.class).load(uuid);
             if(specimen!=null){
                 if(name==null){
-                    name = labelProvider.getDerivateText(specimen);
+                    name = DerivateLabelProvider.getDerivateText(specimen, conversationHolder);
                 }
                 else{
-                    name += ", "+labelProvider.getDerivateText(specimen);
+                    name += " + "+DerivateLabelProvider.getDerivateText(specimen, conversationHolder);
                 }
             }
         }