Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / derivate / contextMenu / CreateFieldUnitContextMenu.java

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 589869ab44f37098ede72b244374fb0586d85a94..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.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
@@ -49,7 +48,7 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem {
                                 if(selectionInput instanceof CdmBase && ((CdmBase) selectionInput).isInstanceOf(Taxon.class)){
                                     final Taxon taxon = HibernateProxyHelper.deproxy(selectionInput, Taxon.class);
                                     MenuItem item = new MenuItem(menu, SWT.NONE);
-                                    item.setText("Create FieldUnit (attach to "+taxon.getTitleCache()+")");
+                                    item.setText("Create FieldUnit for "+taxon.getName());
                                     item.addSelectionListener(new SelectionAdapter() {
                                         @Override
                                         public void widgetSelected(SelectionEvent e) {
@@ -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);
-                                            association.setFeature(Feature.SPECIMEN());
                                             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);
                                             }
-                                            description.addElement(IndividualsAssociation.NewInstance(fieldUnit));
+                                            description.addElement(association);
 
                                             derivateView.getConversationHolder().commit();
                                             derivateView.addFieldUnit(fieldUnit);