From b72ce91f468d715e5970d85ccd7db0ed4d166e22 Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Thu, 19 Jun 2014 12:39:11 +0000
Subject: [PATCH]  - removed debug output  - made DerivateLabelProvider use
 occurrence service

---
 .../view/dataimport/DataImportEditorContextMenu.java      | 1 -
 .../view/derivateSearch/DerivateLabelProvider.java        | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorContextMenu.java
index 36c45b126..d556221c8 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorContextMenu.java
@@ -70,7 +70,6 @@ public class DataImportEditorContextMenu extends CompoundContributionItem {
                                                 DataImportEditor<?> dataImportEditor = (DataImportEditor<?>)activeEditor;
                                                 CdmStore.getService(IOccurrenceService.class).saveOrUpdate((SpecimenOrObservationBase<?>) next);
                                                 dataImportEditor.getConversationHolder().commit(true);
-                                                System.out.println("commit");
                                             }
                                         }
                                     }
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 4842391de..ba8fa96b5 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
@@ -19,6 +19,7 @@ import org.eclipse.swt.graphics.Image;
 import org.hibernate.LazyInitializationException;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
@@ -104,9 +105,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
      * @return
      */
     public static String getDerivateText(Object element){
-        TreeNode parentNode = null;
         if(element instanceof TreeNode){
-            parentNode = ((TreeNode) element).getParent();
             //unwrap specimen from TreeNode
             element = ((TreeNode) element).getValue();
         }
@@ -143,8 +142,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         else if(element instanceof DerivedUnit){
             DerivedUnit derivedUnit = (DerivedUnit)element;
             if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
-                if(parentNode!=null && parentNode.getValue() instanceof FieldUnit){
-                    FieldUnit fieldUnit = (FieldUnit) parentNode.getValue();
+                java.util.Collection<FieldUnit> fieldUnits = CdmStore.getService(IOccurrenceService.class).getFieldUnits(derivedUnit.getUuid());
+                if(fieldUnits!=null && !fieldUnits.isEmpty()){
+                    FieldUnit fieldUnit = fieldUnits.iterator().next();
                     GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent();
                     if(gatheringEvent!=null){
                         label += gatheringEvent.getCollector()!=null?gatheringEvent.getCollector()+", ":"";
-- 
2.34.1