From 3f89e82954083976abaf5b3c7de6883c90032831 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 26 Oct 2015 18:53:27 +0100
Subject: [PATCH] Update taxon name in taxon selection element

---
 .../taxeditor/editor/view/derivate/DerivateView.java |  6 ++++++
 .../DerivateSearchCompositeController.java           | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 7414396f1..87072579f 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -47,6 +47,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.Messages;
+import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.derivate.searchFilter.DerivateSearchCompositeController;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
@@ -469,6 +470,10 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
                 updateRootEntities(uuids);
             }
         }
+        if(part instanceof MultiPageTaxonEditor){
+            Taxon taxon = ((MultiPageTaxonEditor) part).getTaxon();
+            derivateSearchCompositeController.setTaxon(taxon);
+        }
     }
 
     /**
@@ -498,6 +503,7 @@ public class DerivateView extends AbstractCdmViewPart implements IPartContentHas
     public void toggleListenToSelectionChange() {
         listenToSelectionChange = !listenToSelectionChange;
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);
+        derivateSearchCompositeController.setTaxon(null);
     }
 
     /**
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
index 08aab151b..b70fec260 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
@@ -172,4 +172,16 @@ public class DerivateSearchCompositeController implements Listener{
         labelProvider.setConversation(conversationHolder);
     }
 
+    /**
+     * @param taxon
+     */
+    public void setTaxon(Taxon taxon) {
+        if(taxon==null){
+            derivateSearchComposite.getTextTaxonName().setText("");
+        }
+        else{
+            derivateSearchComposite.getTextTaxonName().setText(taxon.getTitleCache());
+        }
+    }
+
 }
-- 
2.30.2