Fix association creation

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
index 838e5c081411dd4b4eda74c7361ad64049d4fd4a..48c38c82ff5d142dfe0ecce5eade106cf7052414 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
@@ -15,7 +15,6 @@ import org.eclipse.ui.actions.CompoundContributionItem;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;

-import eu.etaxonomy.cdm.model.description.Feature;

 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;


@@ -60,7 +59,6 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem {
                                             FieldUnit fieldUnit = FieldUnit.NewInstance();
                                             fieldUnit = CdmBase.deproxy(CdmStore.getService(IOccurrenceService.class).save(fieldUnit), FieldUnit.class);
                                             IndividualsAssociation association = IndividualsAssociation.NewInstance(fieldUnit);
                                             FieldUnit fieldUnit = FieldUnit.NewInstance();
                                             fieldUnit = CdmBase.deproxy(CdmStore.getService(IOccurrenceService.class).save(fieldUnit), FieldUnit.class);
                                             IndividualsAssociation association = IndividualsAssociation.NewInstance(fieldUnit);

-                                            association.setFeature(Feature.SPECIMEN());

                                             TaxonDescription description;
                                             if(!taxon.getDescriptions().isEmpty()){
                                                 description = taxon.getDescriptions().iterator().next();
                                             TaxonDescription description;
                                             if(!taxon.getDescriptions().isEmpty()){
                                                 description = taxon.getDescriptions().iterator().next();


@@ -68,7 +66,7 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem {
                                             else{
                                                 description = TaxonDescription.NewInstance(taxon);
                                             }
                                             else{
                                                 description = TaxonDescription.NewInstance(taxon);
                                             }

-                                            description.addElement(IndividualsAssociation.NewInstance(fieldUnit));
+                                            description.addElement(association);

 
                                             derivateView.getConversationHolder().commit();
                                             derivateView.addFieldUnit(fieldUnit);
 
                                             derivateView.getConversationHolder().commit();
                                             derivateView.addFieldUnit(fieldUnit);