ref #6595 Set correct focus when opening a taxon/synonym

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 8527ebfa6155f1b776c86be25302549c6d66abe0..d916996a3263981621c03334f28ccfca71dc1799 100644 (file)
--- 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 c5c6c735d0561d7935b51c18747d7d11462fcbe4..4b900dc9721f30a0494fd5ce292141be9573a8c4 100644 (file)
--- 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() {