X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/45ab0adb60e41eb97d576a80de97cd9495142871..1bfcc7472ccf5433e950aea359f122445d0b337b:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java index 83dca05af..e26adaafc 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java @@ -62,7 +62,6 @@ import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection; import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailSection; import eu.etaxonomy.taxeditor.ui.section.agent.TeamOrPersonBaseDetailSection; import eu.etaxonomy.taxeditor.ui.section.common.ReferencedEntityDetailSection; -import eu.etaxonomy.taxeditor.ui.section.description.DescribedSpecimenSection; import eu.etaxonomy.taxeditor.ui.section.description.DescriptionDetailSection; import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailSection; import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementMediaSection; @@ -78,7 +77,6 @@ import eu.etaxonomy.taxeditor.ui.section.group.MemberDetailSection; import eu.etaxonomy.taxeditor.ui.section.identifier.IdentifierDetailSection; import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailSection; import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyNodeDetailSection; -import eu.etaxonomy.taxeditor.ui.section.key.TaxonomicScopeSection; import eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection; import eu.etaxonomy.taxeditor.ui.section.name.NomenclaturalStatusSection; import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailSection; @@ -91,9 +89,11 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.EmptySection; import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection; +import eu.etaxonomy.taxeditor.ui.section.occurrence.association.DerivedUnitTypeDesignationSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaQualityDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSampleGeneralDetailSection; +import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSamplePreparationPreservationSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SampleDesignationDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SequenceContigFileCollectionDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SequenceGeneralDetailSection; @@ -130,17 +130,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { private ISelection selection; - /** - *

- * Constructor for DetailsViewer. - *

- * - * @param parent - * a {@link org.eclipse.swt.widgets.Composite} object. - * @param viewPart - * a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart} - * object. - */ public DetailsViewer(Composite parent, AbstractCdmViewPart viewPart) { super(parent, viewPart); } @@ -203,7 +192,12 @@ public class DetailsViewer extends AbstractCdmDataViewer { destroySections(); if (input instanceof TaxonBase) { - createTaxonSections(rootElement); + if(((TaxonBase) input).getName()==null){ + createEmptySection(rootElement); + } + else{ + createTaxonSections(rootElement); + } } else if (input instanceof NonViralName) { createNameSections(rootElement); @@ -328,9 +322,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } - /** - * @param rootElement - */ private void createEmptySection(RootElement parent) { destroySections(); @@ -339,9 +330,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(emptySection); } - /** - * @param rootElement - */ private void createGroupSection(RootElement parent) { destroySections(); @@ -354,11 +342,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(grantedAuthorityDetailSection); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.Viewer#getSelection() - */ /** {@inheritDoc} */ @Override public ISelection getSelection() { @@ -375,35 +358,36 @@ public class DetailsViewer extends AbstractCdmDataViewer { } } - /** - * createTaxonSections(RootElement parent) - * - * @param parent - */ private void createTaxonSections(RootElement parent) { destroySections(); ParsingMessagesSection parsingMessagesSection = formFactory.createParsingMessagesSection(getConversationHolder(), parent, this, ExpandableComposite.EXPANDED | ExpandableComposite.EXPANDED); + if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION)){ + TaxonBaseDetailSection taxonBaseDetailSection = formFactory.createTaxonBaseDetailSection(getConversationHolder(), parent, this, + ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); - TaxonBaseDetailSection taxonBaseDetailSection = formFactory.createTaxonBaseDetailSection(getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + addPart(taxonBaseDetailSection); + } + NonViralNameDetailSection nonViralNameSection = formFactory + .createNonViralNameDetailSection(getConversationHolder(), parent, this, true, + ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); + if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION)){ + NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, + ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NomenclaturalStatusSection nomenclaturalStatusSection = formFactory.createNomenclaturalStatusSection(getConversationHolder(), parent, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); + NomenclaturalStatusSection nomenclaturalStatusSection = formFactory.createNomenclaturalStatusSection(getConversationHolder(), parent, + ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + addPart(nomenclaturalStatusSection); + addPart(referenceDetailSection); + } //TODO RL - if(!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.IS_RL)){ + if(!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.IS_RL) && !PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION)){ ProtologueSection protologSection = formFactory.createProtologueSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -418,23 +402,17 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(nameRelationshipSection); } - addPart(parsingMessagesSection); - addPart(taxonBaseDetailSection); + addPart(nonViralNameSection); - addPart(nomenclaturalStatusSection); - addPart(referenceDetailSection); + } - /** - * createNameSections - * - * @param parent - */ private void createNameSections(RootElement parent) { destroySections(); - NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection( + getConversationHolder(), parent, this, false, ExpandableComposite.TWISTIE + | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, @@ -464,11 +442,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } } - /** - * createReferenceSections - * - * @param parent - */ private void createReferenceSections(RootElement parent) { destroySections(); @@ -478,11 +451,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(referenceDetailSection); } - /** - * createTeamOrPersonBaseDetailSection - * - * @param parent - */ private void createTeamOrPersonBaseDetailSection(RootElement parent) { destroySections(); TeamOrPersonBaseDetailSection teamOrPersonBaseDetailSection = formFactory.createTeamOrPersonBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); @@ -490,11 +458,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(teamOrPersonBaseDetailSection); } - /** - * createTeamDetailSection - * - * @param parent - */ private void createTeamDetailSection(RootElement parent) { destroySections(); TeamDetailSection teamDetailSection = formFactory.createTeamDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); @@ -502,22 +465,12 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(teamDetailSection); } - /** - * createPersonDetailSection - * - * @param parent - */ private void createPersonDetailSection(RootElement parent) { destroySections(); PersonDetailSection personDetailSection = formFactory.createPersonDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(personDetailSection); } - /** - * createDescriptionElementSection - * - * @param parent - */ private void createDescriptionElementSection(RootElement parent) { destroySections(); @@ -538,11 +491,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(descriptionElementMediaSection); } - /** - * createDescriptionSection - * - * @param parent - */ private void createDescriptionSection(RootElement parent) { destroySections(); DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); @@ -553,9 +501,9 @@ public class DetailsViewer extends AbstractCdmDataViewer { formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescribedSpecimenSection describedSpecimenSection = formFactory.createDescribedSpecimenSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); +// DescribedSpecimenSection describedSpecimenSection = formFactory.createDescribedSpecimenSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); +// +// formFactory.createHorizontalSeparator(parent, SWT.BORDER); // DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory // .createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE, @@ -569,27 +517,17 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(descriptionDetailSection); addPart(naturalLanguageSection); - addPart(describedSpecimenSection); +// addPart(describedSpecimenSection); // addPart(descriptionSourceSection); addPart(scopeSection); } - /** - * createDescriptionSection - * - * @param parent - */ private void createSpecimenDescriptionSection(RootElement parent) { destroySections(); DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(descriptionDetailSection); } - /** - * Creates the use Description section - * - * @param parent - */ private void createUseDescriptionSection(RootElement parent) { destroySections(); DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); @@ -605,10 +543,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } - - /** - * @param rootElement - */ private void createImageGallerySection(RootElement parent) { destroySections(); DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); @@ -616,12 +550,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(descriptionDetailSection); } - /** - * createMediaElementSection - * - * @param parent - */ - private void createMediaElementSection(RootElement parent) { destroySections(); @@ -630,11 +558,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(mediaDetailSection); } - /** - * createDerivedUnitBaseElementSection - * - * @param parent - */ private void createDerivedUnitBaseElementSection(RootElement parent) { destroySections(); @@ -660,21 +583,26 @@ public class DetailsViewer extends AbstractCdmDataViewer { FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); addPart(fieldUnitDetailSection); } + else{ + if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS)){ + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + addPart(taxonAssociationDetailSection); + } + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + addPart(identifierDetailSection); + } if(!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DETERMINATION_ONLY_FOR_FIELD_UNITS)){ formFactory.createHorizontalSeparator(parent, SWT.BORDER); DeterminationDetailSection determinationDetailSection = formFactory.createDeterminationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); addPart(determinationDetailSection); } - if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS)){ - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - addPart(taxonAssociationDetailSection); - } formFactory.createHorizontalSeparator(parent, SWT.BORDER); - IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); - addPart(identifierDetailSection); + DerivedUnitTypeDesignationSection derivedUnitTypeDesignationSection = formFactory.createDerivedUnitTypeDesignationSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(derivedUnitTypeDesignationSection); } @@ -722,6 +650,10 @@ public class DetailsViewer extends AbstractCdmDataViewer { formFactory.createHorizontalSeparator(parent, SWT.BORDER); + DnaSamplePreparationPreservationSection preparationPreservationSection = formFactory.createDnaSamplePreparationPreservationSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + DnaQualityDetailSection qualitySection = formFactory.createDnaQualityDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -729,6 +661,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { SampleDesignationDetailSection sampleDesignationDetailSection = formFactory.createSampleDesignationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(section); + addPart(preparationPreservationSection); addPart(qualitySection); addPart(sampleDesignationDetailSection); } @@ -778,11 +711,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } - - - /** - * @param rootElement - */ private void createFeatureDistributionSection(RootElement parent) { destroySections(); @@ -791,35 +719,20 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(featureDistributionSection); } - /** - * createPolytomousKeyNodeSection - * - * @param parent - */ private void createPolytomousKeyNodeSection(RootElement parent) { destroySections(); - PolytomousKeyDetailSection polytomousKeyDetailSection = formFactory.createPolytomousKeyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT); + PolytomousKeyDetailSection polytomousKeyDetailSection = formFactory.createPolytomousKeyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); PolytomousKeyNodeDetailSection polytomousKeyNodeDetailSection = formFactory.createPolytomousKeyNodeDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - TaxonomicScopeSection taxonomicScopeSection = formFactory.createTaxonomicScopeSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT); - addPart(polytomousKeyDetailSection); addPart(polytomousKeyNodeDetailSection); - addPart(taxonomicScopeSection); } - /** - * create the UseRecordSection - * - * @param parent - */ private void createUseRecordSection(RootElement parent) { destroySections(); @@ -832,11 +745,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } - /** - * createUserSection - * - * @param parent - */ private void createUserSection(RootElement parent) { destroySections(); @@ -848,11 +756,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(groupByUserDetailSection); } - /** - * createTaxonRelationshipSection - * - * @param parent - */ private void createTaxonRelationshipSection(RootElement parent) { destroySections(); @@ -863,9 +766,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(referencedEntityBaseDetailSection); } - /** - * @param rootElement - */ private void createTermVocabularySection(RootElement parent) { destroySections(); @@ -873,11 +773,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(termVocabularyDetailSection); } - /** - * createDefinedTermSection - * - * @param parent - */ private void createDefinedTermSection(RootElement parent) { destroySections();