From 07929589e907929be00e327c25dc23ca8f7f5d7f Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 2 Nov 2015 18:12:17 +0100 Subject: [PATCH] Remove types from taxon associations detail element --- .../TaxonAssociationDetailElement.java | 31 ------------------- 1 file changed, 31 deletions(-) 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 4ff63d538..53d9ea6ab 100644 --- 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 @@ -11,8 +11,6 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.association; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionException; @@ -36,10 +34,6 @@ import org.eclipse.ui.handlers.IHandlerService; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; 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.name.SpecimenTypeDesignation; -import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -55,9 +49,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; */ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement implements IDoubleClickListener{ - private TableViewer associationsViewer; - private TableViewer typeDesignationViewer; public TaxonAssociationDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) { super(formFactory, formElement); @@ -70,7 +62,6 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement> associatedTaxa = CdmStore.getService(IOccurrenceService.class).listAssociatedTaxa(entity.innerDerivedUnit(), null, null, null, null); - Collection typeDesignations = CdmStore.getService(IOccurrenceService.class).listTypeDesignations(entity.innerDerivedUnit(), null, null, null, null); if(!associatedTaxa.isEmpty()){ associationsViewer = new TableViewer(getLayoutComposite(), SWT.FULL_SELECTION); @@ -84,28 +75,6 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement> typedTaxa = new HashSet>(); - for (SpecimenTypeDesignation specimenTypeDesignation : typeDesignations) { - for (TaxonNameBase taxonNameBase : specimenTypeDesignation.getTypifiedNames()) { - Set taxa = taxonNameBase.getTaxa(); - for (Object taxon : taxa) { - if(taxon instanceof CdmBase && ((CdmBase)taxon).isInstanceOf(TaxonBase.class)){ - typedTaxa.add(HibernateProxyHelper.deproxy(taxon, TaxonBase.class)); - } - } - } - } - if(!typedTaxa.isEmpty()){ - Label typeLabel = formFactory.createLabel(getLayoutComposite(), "Type Designations"); - typeLabel.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - - typeDesignationViewer = new TableViewer(getLayoutComposite(), SWT.FULL_SELECTION); - typeDesignationViewer.getTable().setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - typeDesignationViewer.setContentProvider(new ArrayContentProvider()); - typeDesignationViewer.setInput(typedTaxa); - typeDesignationViewer.addDoubleClickListener(this); - } } /** {@inheritDoc} */ -- 2.34.1