ref #6971 Fix creation of two sessions for each name editor

 - session is now passed from editor input to editor

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 de28b99ab51a62ea6e454f8c56fb4810d20c59e9..420570b729197137ef23f3219a7536e48a9f031b 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
@@ -146,14 +146,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
        @PostConstruct
     public void createPartControl(Composite parent, MPart thisPart) {
            this.thisPart = thisPart;
-        if (CdmStore.isActive()){
-            if(conversation == null){
-                conversation = CdmStore.createConversation();
-            }
-        }
-        else{
-            return;
-        }
 
         createManagedForm(parent);
 
@@ -398,6 +390,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
                }
 
                this.input = input;
+               conversation = input.getConversationHolder();
 
         createOrUpdateNameComposites();