ref #8329: fix multiple representation exception

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 37d59873d72634d2dfb1c8717d07428cdc751883..aee3a1fd38462b118286a843265693f414abd186 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -2986,7 +2986,7 @@ public class CdmFormFactory extends FormToolkit {
      * @return a {@link EntitySelectionElement} object.
      */
     public <T extends CdmBase> EntitySelectionElement<T> createSelectionElement(Class<T> clazz,
-            ConversationHolder conversation, ICdmFormElement parentElement, String labelString, T selection, int mode,
+            ICdmFormElement parentElement, String labelString, T selection, int mode,
             int style, boolean filterElement) {
         EntitySelectionElement<T> element = new EntitySelectionElement<T>(this, //conversation,
                 parentElement, clazz,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
index 8268d5827144a5b8c0d6fbee9137ba84dfa740b7..218a50de859f314e5a3bdfe96e21e55a1545e1a9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
@@ -65,6 +65,7 @@ public class NameRelationshipDetailSection extends AbstractEntityCollectionSecti
                int status = dialog.open();
 
                if(status == IStatus.OK) {
+
             return wizard.getNameRelationship();
         }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
index 9da995803be73d84180325ddb9ebd27d29a17aa0..77aa37a1d90bfd92619c332d5267b4db2ac69f44 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
@@ -82,9 +82,7 @@ public class NameRelationshipWizardPage extends AbstractEntityCollectionElementW
 
 
                selection_relatedTo = formFactory
-                               .createSelectionElement(TaxonName.class,
-                                               ((NameRelationshipWizard) getWizard())
-                                                               .getConversationHolder(), rootElement,
+                               .createSelectionElement(TaxonName.class, rootElement,
                                                "",this.entity, EntitySelectionElement.ALL,
                                                SWT.NULL, true);