From e34c0af1644b57056e119b22a6e6d498521340c8 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Thu, 26 Oct 2017 09:05:14 +0200
Subject: [PATCH] ref #6595 Set correct focus when opening a taxon/synonym

---
 .../etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java  | 2 ++
 .../taxeditor/editor/name/e4/TaxonNameEditorE4.java        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
index 8527ebfa6..d916996a3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
@@ -109,6 +109,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IEdito
         if (taxonBase != null){
             if(taxonBase.isInstanceOf(Taxon.class)){
                 Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class);
+                setInitiallySelectedTaxonBase(taxon);
 
                 if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){
                     // TODO get accepted taxon
@@ -135,6 +136,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IEdito
                 	taxa.add(taxon);
                 }
                 setInputForMultipleTaxa(conversation, taxa);
+                setInitiallySelectedTaxonBase(synonym);
             }
         }
     }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
index c5c6c735d..4b900dc97 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
@@ -403,7 +403,12 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         setPartName();
 
         //set initial selection
-        selService.setSelection(new StructuredSelection(input.getTaxon()));
+        if(input.getInitiallySelectedTaxonBase()!=null){
+            selService.setSelection(new StructuredSelection(input.getInitiallySelectedTaxonBase()));
+        }
+        else{
+            selService.setSelection(new StructuredSelection(input.getTaxon()));
+        }
 	}
 
    private void createDragSupport() {
-- 
2.34.1