ticket #4804

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 24ea70f115b96167c99dd03d563d7a841512f8d8..b3cd23d0d5c3b1d348496b9af6cd0c8edc26e363 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -235,7 +235,8 @@ public class TaxonNameEditor extends EditorPart implements
         * </p>
         */
        public void createOrUpdateNameComposites() {
         * </p>
         */
        public void createOrUpdateNameComposites() {

-               this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
+               //this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
+               //this.taxon = HibernateProxyHelper.deproxy(this.taxon, Taxon.class);

                ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
                ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
                ContainerFactory.createOrUpdateMisapplicationsGroup(this);
                ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
                ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
                ContainerFactory.createOrUpdateMisapplicationsGroup(this);

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
index 6fca0efc663a55c5ae49c249c5f23e3c81a25df6..2ef74bc5d681999e9a2f2330f4dea47ac7f772df 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 

+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;

 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;


@@ -67,11 +68,11 @@ public class CreateSynonymInNewGroupOperation extends AbstractPostTaxonOperation
                // Add name to new homotypic group
                HomotypicalGroup.NewInstance().addTypifiedName(newSynonymName);
                monitor.worked(20);
                // Add name to new homotypic group
                HomotypicalGroup.NewInstance().addTypifiedName(newSynonymName);
                monitor.worked(20);

-
+               HibernateProxyHelper.deproxy(element);

                // Create a new synonym for the taxon
                newSynonymRelationship = element.addHeterotypicSynonymName(newSynonymName);
                monitor.worked(40);
                // Create a new synonym for the taxon
                newSynonymRelationship = element.addHeterotypicSynonymName(newSynonymName);
                monitor.worked(40);

-
+               

                return postExecute(newSynonymRelationship.getSynonym());
        }
 
                return postExecute(newSynonymRelationship.getSynonym());
        }