* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.editor.view.media;
import java.util.HashSet;
MessagingUtils.error(getClass(), "Taxon is null", null); //$NON-NLS-1$
return NO_CHILDREN;
}
- HashSet<DescriptionBase<?>> imageGalleries = new HashSet<>();
+ Set<DescriptionBase<?>> imageGalleries = new HashSet<>();
for(DescriptionBase<?> description : taxon.getDescriptions()){
if(description.isImageGallery()){
imageGalleries.add(description);
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import info.bioinfweb.libralign.pherogram.provider.ReverseComplementPherogramProvider;
import info.bioinfweb.tic.SWTComponentFactory;
-
-
/**
* Editor component to edit a contig alignment used to combine different overlapping pherograms from Sanger sequencing to
* a consensus sequence.
private MultipleAlignmentsContainer alignmentsContainer = null;
- private final Map<String, SingleReadAlignment> cdmMap = new TreeMap<String, SingleReadAlignment>(); //TODO Move this to ContigSequenceDataProvider
-
+ private final Map<String, SingleReadAlignment> cdmMap = new TreeMap<>(); //TODO Move this to ContigSequenceDataProvider
@Inject
private MDirtyable dirty;
public AlignmentEditorE4() {
}
-
private void refreshToolbarElement(String id) {
ICommandService commandService =
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
}
}
-
private void registerEditSettingListener(MultipleAlignmentsContainer container) {
container.getEditSettings().addListener(new EditSettingsListener() {
@Override
});
}
-
private AlignmentArea createIndexArea(MultipleAlignmentsContainer container, AlignmentArea labeledArea) {
AlignmentArea result = new AlignmentArea(container);
result.setAllowVerticalScrolling(false);
return result;
}
-
private AlignmentArea createEditableAlignmentArea(MultipleAlignmentsContainer container, boolean allowVerticalScrolling) {
AlignmentArea result = new AlignmentArea(container);
result.setAllowVerticalScrolling(allowVerticalScrolling);
return result;
}
-
private AlignmentArea createConsensusHintArea(MultipleAlignmentsContainer container,
AlignmentArea labeledArea) {
return result;
}
-
private MultipleAlignmentsContainer getAlignmentsContainer() {
if (alignmentsContainer == null) {
alignmentsContainer = new MultipleAlignmentsContainer();
}
}
-
/**
* Checks whether the specified alignment area or one of its subcomponents currently has the
* focus.
return SWTUtils.childHasFocus((Composite)area.getToolkitComponent());
}
-
public boolean hasPherogram(String sequenceID) {
return getReadsArea().getDataAreas().getSequenceAreas(sequenceID).size() > PHEROGRAM_AREA_INDEX;
}
-
public PherogramArea getPherogramArea(String sequenceID) {
if (hasPherogram(sequenceID)) {
return (PherogramArea)getReadsArea().getDataAreas().getSequenceAreas(sequenceID).get(PHEROGRAM_AREA_INDEX);
}
}
-
private ConsensusSequenceArea getConsensusHintDataArea() {
return (ConsensusSequenceArea)getAlignmentsContainer().getAlignmentAreas().
get(CONSENSUS_HINT_AREA_INDEX).getDataAreas().getBottomAreas().
get(CONSENSUS_DATA_AREA_INDEX);
}
-
@Deprecated //TODO Remove as soon as testing period is over
private void createTestContents() {
// Just for testing:
}
}
-
- private void readCDMData(Sequence sequenceNode) {
+ private void readCdmData(Sequence sequenceNode) {
//TODO If called from somewhere else than createPartControl() the editorInput needs to be checked and previous contents need to be cleared (or updated).
// Add reads:
//TODO Can the consensus sequence also be null? / Should it be created here, if nothing is in the DB?
}
-
@PostConstruct
public void createPartControl(Composite parent) {
if (CdmStore.isActive()){
if(sequenceNode!=null && sequenceNode.getId()!=0){
sequenceNode = CdmStore.getService(ISequenceService.class).load(sequenceNode.getUuid());
}
- readCDMData(sequenceNode);
+ readCdmData(sequenceNode);
}
else {
createTestContents(); // This case will removed after the test phase and an exception should probably be thrown.
import eu.etaxonomy.cdm.model.media.MediaRepresentation;
import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
import eu.etaxonomy.cdm.model.media.Rights;
-import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
// }
} else if (entity instanceof Identifier) {
if(parentElement instanceof AbstractSampleDesignationDetailSection){
- element = new SampleDesignationTextDetailElement(this, parentElement, (Identifier<DnaSample>) entity, removeListener, backgroundColor, style);
+ element = new SampleDesignationTextDetailElement(this, parentElement, (Identifier) entity, removeListener, backgroundColor, style);
}
else{
element = new IdentifierElement(this, parentElement, (Identifier) entity, removeListener, style);
*
* @author n.hoffmann
* @created Oct 13, 2010
- * @version 1.0
*/
public abstract class AbstractDeterminationEventDetailSection extends
AbstractEntityCollectionSection<DerivedUnitFacade, DeterminationEvent> {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param title
- * @param style
- */
public AbstractDeterminationEventDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
String title, int style) {
super(formFactory, conversation, parentElement, title, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#createNewElement()
- */
- /** {@inheritDoc} */
@Override
public DeterminationEvent createNewElement() {
DeterminationEvent instance = DeterminationEvent.NewInstance();
return instance;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#addElement(eu.etaxonomy.cdm.model.common.IVersionableEntity)
- */
- /** {@inheritDoc} */
@Override
public void addElement(DeterminationEvent determination) {
getEntity().addDetermination(determination);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#removeElement(eu.etaxonomy.cdm.model.common.IVersionableEntity)
- */
- /** {@inheritDoc} */
@Override
public void removeElement(DeterminationEvent determination) {
getEntity().removeDetermination(determination);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getEmptyString()
- */
- /** {@inheritDoc} */
@Override
public String getEmptyString() {
return "No determinations yet.";
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence;
import java.util.Arrays;
public class CurrentDeterminationDetailSection extends
AbstractDeterminationEventDetailSection {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param style
- */
public CurrentDeterminationDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
int style) {
return newElement;
}
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Create new current determination event";
}
- /**
- * {@inheritDoc}
- */
@Override
public DeterminationEvent addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
/**
* @author n.hoffmann
* @created May 11, 2011
- * @version 1.0
*/
public class DeterminationDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> {
private DeterminationHistoryDetailSection section_determinationHistory;
- /**
- * @param formFactory
- * @param formElement
- */
public DeterminationDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement) {
super(formFactory, formElement);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)
- */
@Override
protected void createControls(ICdmFormElement formElement,
DerivedUnitFacade entity, int style) {
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
if(eventSource == section_currentDetermination){
section_determinationHistory.refresh();
}
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence;
import org.eclipse.jface.viewers.ISelectionProvider;
/**
* @author n.hoffmann
* @created May 11, 2011
- * @version 1.0
*/
public class DeterminationDetailSection extends AbstractCdmDetailSection<DerivedUnitFacade> implements IDerivedUnitFacadeDetailSection {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
public DeterminationDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
String sectionTitle = "Determinations";
if(getEntity()!=null && getEntity().getDeterminations().size()>0){
- return sectionTitle+" +";
+ return sectionTitle+" +";
}
return sectionTitle;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<DerivedUnitFacade> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitFacade> parentElement, int style) {
return formFactory.createDeterminationDetailElement(parentElement);
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence;
import java.util.Collection;
public class DeterminationHistoryDetailSection extends
AbstractDeterminationEventDetailSection {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param style
- */
public DeterminationHistoryDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
int style) {
internalUpdateSection(false);
}
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Add a determination event to the history";
}
- /**
- * {@inheritDoc}
- */
@Override
public DeterminationEvent addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
import java.util.Collection;
import eu.etaxonomy.taxeditor.view.search.derivative.DerivateLabelProvider;
/**
- *
* @author pplitzner
* @date Oct 16, 2014
- *
*/
public class CurrentSampleDesignationDetailSection extends AbstractSampleDesignationDetailSection {
return new DefaultCdmBaseComparator<>();
}
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Create new current sample designation";
}
- /** {@inheritDoc} */
@Override
public void addElement(Identifier sampleDesignation) {
//The current sample designation is always the first one found.
getEntity().addIdentifier(0, sampleDesignation);
}
- /**
- * {@inheritDoc}
- */
@Override
public Identifier addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-
-}
+}
\ No newline at end of file
}
else if(eventSource==dateQualityCheck.getController()){
DateTime dateTime = dateQualityCheck.getController().getDateTime();
-
dnaQuality.setQualityCheckDate(dateTime);
}
}
/**
* @author pplitzner
* @date 05.03.2014
- *
*/
public class DnaQualityDetailSection extends AbstractCdmDetailSection<DerivedUnitFacade> {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
public DnaQualityDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
return "DNA Quality";
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<DerivedUnitFacade> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitFacade> parentElement, int style) {
return formFactory.createDnaQualityDetailElement(parentElement);
}
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
/**
* @author pplitzner
* @date 16.12.2013
- *
*/
public class DnaSamplePreparationPreservationDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> {
private NumberWithLabelElement numberPreservationTemperature;
private TextWithLabelElement txtMaterialOrMethods;
- /**
- * @param formFactory
- * @param formElement
- */
public DnaSamplePreparationPreservationDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
super(formFactory, formElement);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
- */
@Override
protected void createControls(ICdmFormElement formElement, DerivedUnitFacade facade, int style) {
Institution institution = null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
- * .lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
DnaSample entity = (DnaSample)getEntity().innerDerivedUnit();
/**
* @author pplitzner
* @date 12.12.2013
- *
*/
public class DnaSamplePreparationPreservationSection extends AbstractCdmDetailSection<DerivedUnitFacade> {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
-
@Override
public String getHeading() {
return "Preparation/Preservation";
protected AbstractCdmDetailElement<DerivedUnitFacade> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitFacade> parentElement, int style) {
return formFactory.createDnaSamplePreparationPreservationDetailElement(parentElement);
}
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
import org.eclipse.jface.viewers.ISelectionProvider;
/**
* @author n.hoffmann
* @created May 11, 2011
- * @version 1.0
*/
public class SampleDesignationDetailSection extends AbstractCdmDetailSection<DerivedUnitFacade> {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
public SampleDesignationDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
return "Sample Designations";
setTextClient(createToolbar());
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<DerivedUnitFacade> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitFacade> parentElement, int style) {
return formFactory.createSampleDesignationDetailElement(parentElement);
}
-
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
import java.util.Collection;
/**
* @author n.hoffmann
* @created May 11, 2011
- * @version 1.0
*/
public class SampleDesignationHistoryDetailSection extends AbstractSampleDesignationDetailSection {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param style
- */
public SampleDesignationHistoryDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
int style) {
super(formFactory, conversation, parentElement, "Sample Designation History", style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#getCollection(java.lang.Object)
- */
@Override
public Collection<Identifier> getCollection(IdentifiableEntity<?> entity) {
LinkedList<Identifier> sampleDesignations = new LinkedList<>();
internalUpdateSection(false);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getTooltipString()
- */
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Add a sample designation to the history";
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#addElement(eu.etaxonomy.cdm.model.common.IVersionableEntity)
- */
- /** {@inheritDoc} */
@Override
public void addElement(Identifier sampleDesignation) {
//The current sample designation is always the first one found.
getEntity().addIdentifier(indexOfCurrentSampleDesignation+1, sampleDesignation);
}
- /**
- * {@inheritDoc}
- */
@Override
public Identifier addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-
-}
+}
\ No newline at end of file
if(entity.getPreservation()!=null){
preservationMedium = entity.getPreservation().getMedium();
}
- selectionInstitution = formFactory.createSelectionElement(Institution.class, //getConversationHolder(),
+ selectionInstitution = formFactory.createSelectionElement(Institution.class,
formElement, "Institution", institution, EntitySelectionElement.ALL, style);
- selectionStaff = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
+ selectionStaff = formFactory.createSelectionElement(AgentBase.class,
formElement, "Staff", staff, EntitySelectionElement.ALL,style);
datePreparation = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
comboPreservationMedium = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation medium", preservationMedium, style);
- selectionCollection = formFactory.createSelectionElement(Collection.class, //getConversationHolder(),
+ selectionCollection = formFactory.createSelectionElement(Collection.class,
formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
textAccessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
textBarcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
}
destroySections();
if (input instanceof TaxonBase) {
- if(((TaxonBase) input).getName()==null){
+ if(((TaxonBase<?>) input).getName()==null){
createEmptySection(Messages.DetailsViewerE4_TAXON_HAS_NO_NAME, rootElement);
}
else{
else if(facade.getType()==SpecimenOrObservationType.DnaSample){
if(facade.innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.TissueSample){
+ //this case seems to be very unlikely as innerDerivedUnit has almost always the same type
createTissueSampleSection(rootElement);
}
else if(facade.innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.DnaSample){
else if(derivate instanceof DnaSample
&& ((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
DnaSample dnaSample = (DnaSample)derivate;
- if(((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
- Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
+ if(dnaSample.getRecordBasis()==SpecimenOrObservationType.DnaSample){
+ Identifier currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
label += currentSampleDesignation.getIdentifier()+separator;
}
if(derivedUnit.getKindOfUnit()!=null){
label += derivedUnit.getKindOfUnit()+separator;
}
- Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(derivedUnit);
+ Identifier currentSampleDesignation = getCurrentSampleDesignation(derivedUnit);
if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
label += currentSampleDesignation.getIdentifier() + separator;
}
//Sequence
else if(derivate instanceof Sequence){
Sequence sequence = (Sequence)derivate;
- Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(sequence);
+ Identifier currentSampleDesignation = getCurrentSampleDesignation(sequence);
if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
label += currentSampleDesignation.getIdentifier()+separator;
}
SingleRead singleRead = (SingleRead)derivate;
if(parentNode!=null && parentNode.getValue() instanceof Sequence){
Sequence sequence = (Sequence) parentNode.getValue();
- Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(sequence);
+ Identifier currentSampleDesignation = getCurrentSampleDesignation(sequence);
if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
label = currentSampleDesignation.getIdentifier()+separator;
}
return ImageResources.getImage(ImageResources.DEFAULT_DERIVATIVE);
}
- public static Identifier<DnaSample> getCurrentSampleDesignation(CdmBase entity) {
+ public static Identifier getCurrentSampleDesignation(CdmBase entity) {
if(entity.isInstanceOf(DnaSample.class)){
DnaSample dnaSample = HibernateProxyHelper.deproxy(entity, DnaSample.class);
- for (Identifier<DnaSample> identifier : dnaSample.getIdentifiers()) {
+ for (Identifier identifier : dnaSample.getIdentifiers()) {
if(identifier.getType()!=null && identifier.getType().equals(DerivateLabelProvider.getSampleDesignationTerm())){
//first sample designation is the current
return identifier;