Merge branch 'release/5.42.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / association / TaxonAssociationDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
index 994e326d6d3f18b1bf89d7e2375d80bfff4cadf8..8b1f8a543f2101d1a427974d9a43347f12d88593 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
  * Copyright (C) 2014 EDIT
  * European Distributed Institute of Taxonomy
@@ -28,12 +27,12 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -47,7 +46,6 @@ import eu.etaxonomy.taxeditor.view.CdmViewerChooser;
 /**
  * @author pplitzner
  * @date Dec 1, 2014
- *
  */
 public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> implements IDoubleClickListener{
 
@@ -55,10 +53,10 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
         super(formFactory, formElement);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
-        Collection<TaxonBase<?>> associatedTaxa = CdmStore.getService(IOccurrenceService.class).listIndividualsAssociationTaxa(entity.innerDerivedUnit(), null, null, null, null);
+       boolean includeUnpublished = true;
+        Collection<TaxonBase<?>> associatedTaxa = CdmStore.getService(IOccurrenceService.class).listIndividualsAssociationTaxa(entity.innerDerivedUnit(), includeUnpublished, null, null, null, null);
         Collection<SpecimenTypeDesignation> typeDesignations = CdmStore.getService(IOccurrenceService.class).listTypeDesignations(entity.innerDerivedUnit(), null, null, null, null);
         Collection<DeterminationEvent> determinationEvents = CdmStore.getService(IOccurrenceService.class).listDeterminationEvents(entity.innerDerivedUnit(), null, null, null, null);
 
@@ -111,7 +109,7 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
             }
             openInItem.setData(cdmBase);
             openInItem.addSelectionListener(new SelectionListener() {
-               
+
                @Override
                public void widgetSelected(SelectionEvent e) {
                        new CdmViewerChooser(TaxonAssociationDetailElement.this.getLayoutComposite().getShell()).chooseViewer(e.widget.getData());
@@ -140,8 +138,8 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
         else if(element instanceof SpecimenTypeDesignation){
             SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)element;
             String label = typeDesignation.getTypeStatus()!=null?typeDesignation.getTypeStatus().getLabel()+" of ":"Type of ";
-            Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
-            for (TaxonNameBase taxonNameBase : typifiedNames) {
+            Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
+            for (TaxonName taxonNameBase : typifiedNames) {
                 label += taxonNameBase+", ";
             }
             if(label.endsWith(", ")){
@@ -164,7 +162,7 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
             Object firstElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
             if(firstElement instanceof SpecimenTypeDesignation){
                SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)firstElement;
-               Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
+               Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
                if(typifiedNames.size()==1){
                        firstElement = typifiedNames.iterator().next();
                }
@@ -183,4 +181,10 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
             new CdmViewerChooser(event.getViewer().getControl().getShell()).chooseViewer(firstElement);
         }
     }
+
+       @Override
+       public void fillFields() {
+               // TODO Auto-generated method stub
+
+       }
 }