From 139902daaa20ca2d73e5c7416b5ea8d66c947bba Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Thu, 18 Jul 2013 14:36:09 +0000 Subject: [PATCH] - completely removed DetailType enum and all its uses --- .gitattributes | 2 +- .../newWizard/PolytomousKeyWizardPage.java | 9 +- .../taxeditor/ui/element/CdmFormFactory.java | 591 +++++++----------- .../ui/section/AbstractCdmDetailSection.java | 62 +- .../agent/InstitutionDetailSection.java | 18 +- .../section/agent/InstitutionWizardPage.java | 35 +- .../ui/section/agent/PersonDetailSection.java | 18 +- .../ui/section/agent/PersonWizardPage.java | 11 +- .../ui/section/agent/TeamDetailSection.java | 18 +- .../agent/TeamOrPersonBaseDetailSection.java | 23 +- .../ui/section/agent/TeamWizardPage.java | 12 +- .../ClassificationDetailSection.java | 21 +- .../ClassificationWizardPage.java | 45 +- .../TaxonNodeDetailSection.java | 26 +- .../classification/TaxonNodeWizardPage.java | 26 +- ...java => ReferenceEntityDetailElement.java} | 4 +- .../common/ReferencedEntityDetailSection.java | 18 +- .../description/DescriptionDetailSection.java | 18 +- .../DescriptionElementDetailSection.java | 55 +- .../description/MediaDetailsSection.java | 36 +- .../description/NaturalLanguageSection.java | 23 +- .../FeatureDistributionDetailSection.java | 24 +- .../GrantedAuthorityDetailWizardPage.java | 9 +- .../ui/section/group/GroupDetailSection.java | 18 +- .../section/group/GroupDetailWizardPage.java | 9 +- .../key/PolytomousKeyDetailSection.java | 16 +- .../key/PolytomousKeyNodeDetailSection.java | 18 +- .../section/name/AuthorshipDetailSection.java | 27 +- .../ui/section/name/HybridDetailSection.java | 27 +- .../ui/section/name/NameDetailSection.java | 26 +- .../name/NonViralNameDetailElement.java | 74 +-- .../name/NonViralNameDetailSection.java | 19 +- .../section/name/NonViralNameWizardPage.java | 13 +- .../occurrence/CollectionWizardPage.java | 11 +- .../DerivedUnitBaseDetailSection.java | 10 - .../occurrence/DerivedUnitBaseWizardPage.java | 13 +- .../DerivedUnitFacadeDetailElement.java | 17 +- .../DerivedUnitFacadeDetailSection.java | 22 +- .../DeterminationDetailSection.java | 9 - .../FieldObservationDetailSection.java | 7 - .../FieldObservationWizardPage.java | 11 +- .../GatheringEventDetailSection.java | 10 - .../occurrence/GatheringEventWizardPage.java | 11 +- .../occurrence/GeneralDetailSection.java | 9 - .../section/occurrence/GeneralWizardPage.java | 11 +- .../NomenclaturalReferenceDetailSection.java | 27 +- .../reference/ReferenceDetailSection.java | 31 +- .../reference/ReferenceWizardPage.java | 14 +- .../section/taxon/ParsingMessagesSection.java | 32 +- .../section/taxon/TaxonBaseDetailSection.java | 25 +- .../taxon/TaxonRelationshipDetailSection.java | 17 +- .../ui/section/user/UserDetailSection.java | 17 +- .../ui/section/user/UserDetailWizardPage.java | 9 +- .../userecords/UseRecordDetailSection.java | 31 +- .../vocabulary/DefinedTermDetailSection.java | 32 +- .../vocabulary/NamedAreaDetailSection.java | 21 +- .../NamedAreaLevelDetailSection.java | 19 +- .../TermVocabularyDetailSection.java | 27 +- .../taxeditor/view/detail/DetailsViewer.java | 175 ++---- 59 files changed, 828 insertions(+), 1141 deletions(-) rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/{RefereneEntityDetailElement.java => ReferenceEntityDetailElement.java} (91%) diff --git a/.gitattributes b/.gitattributes index ebec2033f..0689b0531 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1331,8 +1331,8 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/cla eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferenceEntityDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferencedEntityDetailSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/RefereneEntityDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java -text diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java index 7738eed49..c4248413c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java @@ -1,16 +1,13 @@ /** - * + * */ package eu.etaxonomy.taxeditor.newWizard; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.PolytomousKey; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailElement; @@ -27,12 +24,12 @@ public class PolytomousKeyWizardPage extends AbstractCdmEntityWizardPage - * createCdmDetailSection - *

- * - * @param detailType - * a - * {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType} - * object. - * @param parentElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @param selectionProvider - * a {@link org.eclipse.jface.viewers.ISelectionProvider} object. - * @param style - * a int. - * @param conversation - * a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} - * object. - * @return a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} - * object. - */ - public AbstractFormSection createCdmDetailSection(DetailType detailType, ConversationHolder conversation, - ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - AbstractFormSection section = null; - - switch (detailType) { - case SCIENTIFICNAME: - section = new NameDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case REFERENCEBASE: - section = new ReferenceDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case NOMENCLATURALREFERENCE: - section = new NomenclaturalReferenceDetailSection(this, conversation, parentElement, selectionProvider, - style); - break; - case TAXONBASE: - section = new TaxonBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case AUTHORSHIP: - section = new AuthorshipDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case TEAMORPERSONBASE: - section = new TeamOrPersonBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case TEAM: - section = new TeamDetailSection(this, conversation, parentElement, null, style); - break; - case PERSON: - section = new PersonDetailSection(this, conversation, parentElement, null, style); - break; - case DESCRIPTION: - section = new DescriptionDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case DESCRIPTIONELEMENT: - section = new DescriptionElementDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case PARSINGMESSAGE: - section = new ParsingMessagesSection(this, conversation, parentElement, selectionProvider, style); - break; - case NONVIRALNAME: - section = new NonViralNameDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case MEDIA: - section = new eu.etaxonomy.taxeditor.ui.section.description.MediaDetailsSection(this, conversation, - parentElement, selectionProvider, style); - break; - case DERIVED_UNIT_FACADE: - section = new DerivedUnitFacadeDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case FIELD_OBSERVATION: - section = new FieldObservationDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case GATHERING_EVENT: - section = new GatheringEventDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case DERIVED_UNIT: - section = new DerivedUnitBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case NATURAL_LANGUAGE: - section = new NaturalLanguageSection(this, conversation, parentElement, selectionProvider, style); - break; - case FEATURE_DISTRIBUTION: - section = new FeatureDistributionDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case CLASSIFICATION: - section = new ClassificationDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case TAXON_NODE: - section = new TaxonNodeDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case POLYTOMOUS_KEY: - section = new PolytomousKeyDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case POLYTOMOUS_KEY_NODE: - section = new PolytomousKeyNodeDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case INSTITUTION: - section = new InstitutionDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case DERIVED_UNIT_GENERAL: - section = new GeneralDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case HYBRID: - section = new HybridDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case USER: - section = new UserDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case GROUP: - section = new GroupDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case DETERMINATION: - section = new DeterminationDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case TAXON_RELATIONSHIP: - section = new TaxonRelationshipDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case REFERENCED_ENTITY: - section = new ReferencedEntityDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case TERM_VOCABULARY: - section = new TermVocabularyDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case NAMED_AREA: - section = new NamedAreaDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - case USE_RECORD: - section = new UseRecordDetailSection(this, conversation, parentElement, selectionProvider, style); - break; - } - - if (section == null) { - throw new RuntimeException("You tried to create a cdm detail section that is not implemented yet."); - } - - parentElement.addElement(section); - adapt(section); - return section; - } - public NameDetailSection createNameDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ NameDetailSection section = new NameDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public ReferenceDetailSection createReferenceDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ ReferenceDetailSection section = new ReferenceDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public NomenclaturalReferenceDetailSection createNomenclaturalReferenceDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ NomenclaturalReferenceDetailSection section = new NomenclaturalReferenceDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TaxonBaseDetailSection createTaxonBaseDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ TaxonBaseDetailSection section = new TaxonBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public AuthorshipDetailSection createAuthorshipDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ AuthorshipDetailSection section = new AuthorshipDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TeamOrPersonBaseDetailSection createTeamOrPersonBaseDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ TeamOrPersonBaseDetailSection section = new TeamOrPersonBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TeamDetailSection createTeamDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ TeamDetailSection section = new TeamDetailSection(this, conversation, parentElement, null, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public PersonDetailSection createPersonDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ PersonDetailSection section = new PersonDetailSection(this, conversation, parentElement, null, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public DescriptionDetailSection createDescriptionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ DescriptionDetailSection section = new DescriptionDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public DescriptionElementDetailSection createDescriptionElementDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ DescriptionElementDetailSection section = new DescriptionElementDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public ParsingMessagesSection createParsingMessagesSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ ParsingMessagesSection section = new ParsingMessagesSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public NonViralNameDetailSection createNonViralNameDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ NonViralNameDetailSection section = new NonViralNameDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public MediaDetailsSection createMediaDetailsSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ MediaDetailsSection section = new MediaDetailsSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public DerivedUnitFacadeDetailSection createDerivedUnitFacadeDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ DerivedUnitFacadeDetailSection section = new DerivedUnitFacadeDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public FieldObservationDetailSection createFieldObservationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ FieldObservationDetailSection section = new FieldObservationDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public GatheringEventDetailSection createGatheringEventDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ GatheringEventDetailSection section = new GatheringEventDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public DerivedUnitBaseDetailSection createDerivedUnitBaseDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ DerivedUnitBaseDetailSection section = new DerivedUnitBaseDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public NaturalLanguageSection createNaturalLanguageSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ NaturalLanguageSection section = new NaturalLanguageSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public FeatureDistributionDetailSection createFeatureDistributionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ FeatureDistributionDetailSection section = new FeatureDistributionDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public ClassificationDetailSection createClassificationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ ClassificationDetailSection section = new ClassificationDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TaxonNodeDetailSection createTaxonNodeDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ TaxonNodeDetailSection section = new TaxonNodeDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public PolytomousKeyDetailSection createPolytomousKeyDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ PolytomousKeyDetailSection section = new PolytomousKeyDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public PolytomousKeyNodeDetailSection createPolytomousKeyNodeDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ PolytomousKeyNodeDetailSection section = new PolytomousKeyNodeDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public InstitutionDetailSection createInstitutionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ InstitutionDetailSection section = new InstitutionDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public GeneralDetailSection createGeneralDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ GeneralDetailSection section = new GeneralDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public HybridDetailSection createHybridDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ HybridDetailSection section = new HybridDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public UserDetailSection createUserDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ UserDetailSection section = new UserDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public GroupDetailSection createGroupDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ GroupDetailSection section = new GroupDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public DeterminationDetailSection createDeterminationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ DeterminationDetailSection section = new DeterminationDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TaxonRelationshipDetailSection createTaxonRelationshipDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ TaxonRelationshipDetailSection section = new TaxonRelationshipDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public ReferencedEntityDetailSection createReferencedEntityDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ ReferencedEntityDetailSection section = new ReferencedEntityDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public TermVocabularyDetailSection createTermVocabularyDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ TermVocabularyDetailSection section = new TermVocabularyDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public NamedAreaDetailSection createNamedAreaDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ NamedAreaDetailSection section = new NamedAreaDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public UseRecordDetailSection createUseRecordDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ UseRecordDetailSection section = new UseRecordDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public GeneralDetailSection createFOSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ GeneralDetailSection section = new GeneralDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public GatheringEventDetailSection createGatheringSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ GatheringEventDetailSection section = new GatheringEventDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdapt(parentElement, section); + addAndAdaptSection(parentElement, section); return section; } public FieldObservationDetailSection createFODetailsSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ - FieldObservationDetailSection foDetailsSection = new FieldObservationDetailSection(this, conversation, parentElement, selectionProvider, style); - parentElement.addElement(foDetailsSection); - adapt(foDetailsSection); - return foDetailsSection; + FieldObservationDetailSection section = new FieldObservationDetailSection(this, conversation, parentElement, selectionProvider, style); + addAndAdaptSection(parentElement, section); + return section; } - private void addAndAdapt(ICdmFormElement parentElement, AbstractFormSection section) { + private void addAndAdaptSection(ICdmFormElement parentElement, AbstractFormSection section) { parentElement.addElement(section); adapt(section); } - /** - *

- * createCdmDetailElement - *

- * - * @param detailType - * a - * {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType} - * object. - * @param style - * a int. - * @param parentElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @return a - * {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement} - * object. - */ - public AbstractCdmDetailElement createCdmDetailElement(DetailType detailType, ICdmFormElement parentElement, int style) { - AbstractCdmDetailElement element = null; + public UseRecordDetailElement createUseRecordDetailElement(ICdmFormElement parentElement){ + UseRecordDetailElement element = new UseRecordDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } - switch (detailType) { - case SCIENTIFICNAME: - element = new NameDetailElement(this, parentElement, style); - break; - case REFERENCEBASE: - element = new ReferenceDetailElement(this, parentElement, style); - break; - case NOMENCLATURALREFERENCE: - element = new NomenclaturalReferenceDetailElement(this, parentElement, style); - break; - case TAXONBASE: - element = new TaxonBaseDetailElement(this, parentElement, style); - break; - case AUTHORSHIP: - element = new AuthorshipDetailElement(this, parentElement, style); - break; - case TEAM: - element = new TeamDetailElement(this, parentElement, style); - break; - case PERSON: - element = new PersonDetailElement(this, parentElement, style); - break; - case DESCRIPTION: - element = new DescriptionDetailElement(this, parentElement, style); - break; - case DESCRIPTIONELEMENT: - element = new DescriptionElementDetailElement(this, parentElement, style); - break; - case NONVIRALNAME: - element = new NonViralNameDetailElement(this, parentElement); - break; - case DERIVED_UNIT_FACADE: - element = new DerivedUnitFacadeDetailElement(this, parentElement); - break; - case FIELD_OBSERVATION: - element = new FieldObservationDetailElement(this, parentElement); - break; - case GATHERING_EVENT: - element = new GatheringEventDetailElement(this, parentElement); - break; - case DERIVED_UNIT: - element = new DerivedUnitBaseDetailElement(this, parentElement); - break; - case NATURAL_LANGUAGE: - element = new NaturalLanguageDetailElement(this, parentElement); - break; - case FEATURE_DISTRIBUTION: - element = new FeatureDistributionDetailElement(this, parentElement); - break; - case CLASSIFICATION: - element = new ClassificationDetailElement(this, parentElement); - break; - case TAXON_NODE: - element = new TaxonNodeDetailElement(this, parentElement); - break; - case COLLECTION: - element = new CollectionDetailElement(this, parentElement); - break; - case POLYTOMOUS_KEY: - element = new PolytomousKeyDetailElement(this, parentElement); - break; - case POLYTOMOUS_KEY_NODE: - element = new PolytomousKeyNodeDetailElement(this, parentElement); - break; - case INSTITUTION: - element = new InstitutionDetailElement(this, parentElement); - break; - case DERIVED_UNIT_GENERAL: - element = new GeneralDetailElement(this, parentElement); - break; - case HYBRID: - element = new HybridDetailElement(this, parentElement); - break; - case USER: - element = new UserDetailElement(this, parentElement); - break; - case GROUP: - element = new GroupDetailElement(this, parentElement); - break; - case GRANTEDAUTHORITY: - element = new GrantedAuthorityDetailElement(this, parentElement); - break; - case DETERMINATION: - element = new DeterminationDetailElement(this, parentElement); - break; - case TAXON_RELATIONSHIP: - element = new TaxonRelationshipDetailElement(this, parentElement); - break; - case REFERENCED_ENTITY: - element = new RefereneEntityDetailElement(this, parentElement); - break; - case TERM_VOCABULARY: - element = new TermVocabularyDetailElement(this, parentElement); - break; - case NAMED_AREA: - element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement); - break; - case NAMED_AREA_LEVEL: - element = new DefinedTermDetailElement(this, parentElement); - break; - case USE_RECORD: - // element = new UseRecordDetailElement(this, parentElement, style); - element = new UseRecordDetailElement(this, parentElement); - break; - } + public DefinedTermDetailElement createNamedAreaLevelElement(ICdmFormElement parentElement){ + DefinedTermDetailElement element = new DefinedTermDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } - if (element == null) { - AbstractUtility.error(this.getClass(), - "Detail element was not created. Seems like the case was not implemented for the requested detail type: " - + detailType, null); - } + public eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement createNamedAreaDetailElement(ICdmFormElement parentElement){ + eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } - adapt(element); - parentElement.addElement(element); + public TermVocabularyDetailElement createTermVocabularyDetailElement(ICdmFormElement parentElement){ + TermVocabularyDetailElement element = new TermVocabularyDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public ReferenceEntityDetailElement createReferenceEntityDetailElement(ICdmFormElement parentElement){ + ReferenceEntityDetailElement element = new ReferenceEntityDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public TaxonRelationshipDetailElement createTaxonRelationshipDetailElement(ICdmFormElement parentElement){ + TaxonRelationshipDetailElement element = new TaxonRelationshipDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public GrantedAuthorityDetailElement createGrantedAuthorityDetailElement(ICdmFormElement parentElement){ + GrantedAuthorityDetailElement element = new GrantedAuthorityDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public GroupDetailElement createGroupDetailElement(ICdmFormElement parentElement){ + GroupDetailElement element = new GroupDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public UserDetailElement createUserDetailElement(ICdmFormElement parentElement){ + UserDetailElement element = new UserDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public HybridDetailElement createHybridDetailElement(ICdmFormElement parentElement){ + HybridDetailElement element = new HybridDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public InstitutionDetailElement createInstitutionDetailElement(ICdmFormElement parentElement){ + InstitutionDetailElement element = new InstitutionDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public PolytomousKeyNodeDetailElement createPolytomousKeyNodeDetailElement(ICdmFormElement parentElement){ + PolytomousKeyNodeDetailElement element = new PolytomousKeyNodeDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public PolytomousKeyDetailElement createPolytomousKeyDetailElement(ICdmFormElement parentElement){ + PolytomousKeyDetailElement element = new PolytomousKeyDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public CollectionDetailElement createCollectionDetailElement(ICdmFormElement parentElement){ + CollectionDetailElement element = new CollectionDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public TaxonNodeDetailElement createTaxonNodeDetailElement(ICdmFormElement parentElement){ + TaxonNodeDetailElement element = new TaxonNodeDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public ClassificationDetailElement createClassificationDetailElement(ICdmFormElement parentElement){ + ClassificationDetailElement element = new ClassificationDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public FeatureDistributionDetailElement createFeatureDistributionDetailElement(ICdmFormElement parentElement){ + FeatureDistributionDetailElement element = new FeatureDistributionDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public NaturalLanguageDetailElement createNaturalLanguageDetailElement(ICdmFormElement parentElement){ + NaturalLanguageDetailElement element = new NaturalLanguageDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public DerivedUnitFacadeDetailElement createDerivedUnitFacadeDetailElement(ICdmFormElement parentElement){ + DerivedUnitFacadeDetailElement element = new DerivedUnitFacadeDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public NonViralNameDetailElement createNonViralNameDetailElement(ICdmFormElement parentElement){ + NonViralNameDetailElement element = new NonViralNameDetailElement(this, parentElement); + addAndAdaptElement(parentElement, element); + return element; + } + + public DescriptionElementDetailElement createDescriptionElementDetailElement(ICdmFormElement parentElement, int style){ + DescriptionElementDetailElement element = new DescriptionElementDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public DescriptionDetailElement createDescriptionDetailElement(ICdmFormElement parentElement, int style){ + DescriptionDetailElement element = new DescriptionDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public PersonDetailElement createPersonDetailElement(ICdmFormElement parentElement, int style){ + PersonDetailElement element = new PersonDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public TeamDetailElement createTeamDetailElement(ICdmFormElement parentElement, int style){ + TeamDetailElement element = new TeamDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public AuthorshipDetailElement createAuthorshipDetailElement(ICdmFormElement parentElement, int style){ + AuthorshipDetailElement element = new AuthorshipDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); return element; } + public TaxonBaseDetailElement createTaxonBaseDetailElement(ICdmFormElement parentElement, int style){ + TaxonBaseDetailElement element = new TaxonBaseDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public NameDetailElement createNameDetailElement(ICdmFormElement parentElement, int style){ + NameDetailElement element = new NameDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public ReferenceDetailElement createReferenceDetailElement(ICdmFormElement parentElement, int style){ + ReferenceDetailElement element = new ReferenceDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public NomenclaturalReferenceDetailElement createNomenclaturalReferenceDetailElement(ICdmFormElement parentElement, int style){ + NomenclaturalReferenceDetailElement element = new NomenclaturalReferenceDetailElement(this, parentElement, style); + addAndAdaptElement(parentElement, element); + return element; + } + + public GeneralDetailElement createGeneralDetailElement(ICdmFormElement parentElement){ GeneralDetailElement element = new GeneralDetailElement(this, parentElement); - addAndAdapt(parentElement, element); + addAndAdaptElement(parentElement, element); return element; } public GatheringEventDetailElement createGatheringEventDetailElement(ICdmFormElement parentElement) { GatheringEventDetailElement element = new GatheringEventDetailElement(this, parentElement); - addAndAdapt(parentElement, element); + addAndAdaptElement(parentElement, element); return element; } public FieldObservationDetailElement createFieldObservationDetailElement(ICdmFormElement parentElement) { FieldObservationDetailElement element = new FieldObservationDetailElement(this, parentElement); - addAndAdapt(parentElement, element); + addAndAdaptElement(parentElement, element); return element; } public DerivedUnitBaseDetailElement createDerivedUnitBaseDetailElement(ICdmFormElement parentElement) { DerivedUnitBaseDetailElement element = new DerivedUnitBaseDetailElement(this, parentElement); - addAndAdapt(parentElement, element); + addAndAdaptElement(parentElement, element); return element; } public DeterminationDetailElement createDeterminationDetailElement(ICdmFormElement parentElement) { DeterminationDetailElement element = new DeterminationDetailElement(this, parentElement); - addAndAdapt(parentElement, element); + addAndAdaptElement(parentElement, element); return element; } @@ -1941,7 +1784,7 @@ public class CdmFormFactory extends FormToolkit { * @param parentElement * @param element */ - private void addAndAdapt(ICdmFormElement parentElement, AbstractCdmDetailElement element) { + private void addAndAdaptElement(ICdmFormElement parentElement, AbstractCdmDetailElement element) { adapt(element); parentElement.addElement(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java index 86dbf40e5..ee222adad 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java @@ -24,7 +24,6 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement; import eu.etaxonomy.taxeditor.ui.element.ISelectableElement; @@ -40,7 +39,7 @@ import eu.etaxonomy.taxeditor.ui.element.ISelectableElement; */ public abstract class AbstractCdmDetailSection extends AbstractFormSection implements IEnableableFormElement, IExpansionListener { - protected AbstractCdmDetailElement detailElement; + private AbstractCdmDetailElement detailElement; /** *

@@ -66,27 +65,26 @@ public abstract class AbstractCdmDetailSection extends AbstractFormSecti public AbstractCdmDetailSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - super(formFactory, parentElement, selectionProvider, - ExpandableComposite.CLIENT_INDENT | style); - - setText(getHeading()); - - addExpansionListener(this); - - createControls(this, SWT.NULL); + this(formFactory, null, conversation, parentElement, selectionProvider, style); } + public AbstractCdmDetailSection(CdmFormFactory formFactory, Class clazz, ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { super(formFactory, parentElement, selectionProvider, ExpandableComposite.CLIENT_INDENT | style); - setText(getHeading()); + setText(getHeading()); - addExpansionListener(this); + addExpansionListener(this); - createControlsByType(this, clazz, SWT.NULL); + if(clazz==null){ + createControls(this, style); + } + else{ + createControlsByType(this, clazz, SWT.NULL); + } } /** @@ -94,7 +92,18 @@ public abstract class AbstractCdmDetailSection extends AbstractFormSecti * @param definedTermClass * @param null1 */ - protected void createControlsByType(AbstractCdmDetailSection abstractCdmDetailSection, Class entityClass, int style) { + protected void createControlsByType(AbstractCdmDetailSection formElement, Class entityClass, int style) { + TableWrapLayout layout = (TableWrapLayout) getLayoutComposite().getLayout(); + layout.topMargin = 10; + layout.numColumns = 2; + + getLayoutComposite().setLayout(layout); + if(entityClass==null){ + detailElement = createCdmDetailElement(formElement, style); + } + else{ + detailElement = createCdmDetailElementByType(formElement, entityClass, style); + } } @@ -111,29 +120,14 @@ public abstract class AbstractCdmDetailSection extends AbstractFormSecti * a int. */ protected void createControls(AbstractCdmDetailSection formElement, int style) { - TableWrapLayout layout = (TableWrapLayout) getLayoutComposite().getLayout(); - layout.topMargin = 10; - layout.numColumns = 2; - - getLayoutComposite().setLayout(layout); - detailElement = createCdmDetailElement(formElement, style); + createControlsByType(formElement, null, style); } - //TODO: when all detail type enums are removed this can be abstract - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style){ - return formFactory.createCdmDetailElement(getDetailType(), parentElement, style); - } + protected abstract AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style); - /** - *

- * getDetailType - *

- * - * @return a - * {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType} - * object. - */ - protected abstract DetailType getDetailType(); + protected AbstractCdmDetailElement createCdmDetailElementByType(AbstractCdmDetailSection parentElement, Class entityClass, int style){ + return createCdmDetailElement(parentElement, style); + } /** *

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java index bf510748c..11e4a2d99 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Institution; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -40,19 +40,19 @@ public class InstitutionDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createInstitutionDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java index 0c0656b63..5f4933cba 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java @@ -1,22 +1,19 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu - * + * * 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.agent; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Institution; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -38,19 +35,17 @@ public class InstitutionWizardPage extends super(formFactory, conversation, entity); } - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement - * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - InstitutionDetailElement detailElement = (InstitutionDetailElement) formFactory - .createCdmDetailElement(DetailType.INSTITUTION, rootElement, - SWT.NULL); - detailElement.setEntity(entity); - return detailElement; - } + /* + * (non-Javadoc) + * + * @see + * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement + * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) + */ + @Override + public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { + InstitutionDetailElement detailElement = formFactory.createInstitutionDetailElement(rootElement); + detailElement.setEntity(entity); + return detailElement; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java index 77e6277e6..7821e7a02 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -44,13 +44,15 @@ public class PersonDetailSection extends AbstractCdmDetailSection{ /** {@inheritDoc} */ @Override - protected DetailType getDetailType() { - return DetailType.PERSON; + public String getHeading() { + return "Person"; } - /** {@inheritDoc} */ + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ @Override - public String getHeading() { - return "Person"; + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createPersonDetailElement(parentElement, style); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java index 75fecc337..51ab6ad03 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -17,7 +17,6 @@ import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; /** @@ -41,15 +40,15 @@ public class PersonWizardPage extends AbstractCdmEntityWizardPage { super(formFactory, conversation, entity); setTitle("Person"); } - - + + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.forms.CdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) */ /** {@inheritDoc} */ @Override public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - PersonDetailElement personElement = (PersonDetailElement) formFactory.createCdmDetailElement(DetailType.PERSON, rootElement, SWT.NULL); + PersonDetailElement personElement = formFactory.createPersonDetailElement(rootElement, SWT.NULL); personElement.setEntity(entity); return personElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java index 8752f86de..bacd6b548 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -44,13 +44,15 @@ public class TeamDetailSection extends AbstractCdmDetailSection{ /** {@inheritDoc} */ @Override - protected DetailType getDetailType() { - return DetailType.TEAM; + public String getHeading() { + return "Team"; } - /** {@inheritDoc} */ + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ @Override - public String getHeading() { - return "Team"; + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createTeamDetailElement(parentElement, style); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java index 77808b23d..578d220b2 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,9 +16,10 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; +import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -43,12 +44,6 @@ public class TeamOrPersonBaseDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + AbstractUtility.error(this.getClass(), "Detail element was not created. Seems like the case was not implemented for TeamOrPersonBaseDetailSection", null); + //TODO DetailElement missing?? + return null; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java index bbabd642a..9016f92c6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu - * + * * 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. */ @@ -17,14 +17,13 @@ import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; /** *

* TeamWizardPage class. *

- * + * * @author n.hoffmann * @created Jun 1, 2010 * @version 1.0 @@ -35,7 +34,7 @@ public class TeamWizardPage extends AbstractCdmEntityWizardPage { *

* Constructor for TeamWizardPage. *

- * + * * @param formFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -55,8 +54,7 @@ public class TeamWizardPage extends AbstractCdmEntityWizardPage { @Override public AbstractCdmDetailElement createElement( ICdmFormElement rootElement) { - TeamDetailElement teamElement = (TeamDetailElement) formFactory - .createCdmDetailElement(DetailType.TEAM, rootElement, SWT.NULL); + TeamDetailElement teamElement = formFactory.createTeamDetailElement(rootElement, SWT.NULL); teamElement.setEntity(entity); return teamElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java index c3e67fe2e..83eb7ee15 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; * @version 1.0 */ public class ClassificationDetailSection extends AbstractCdmDetailSection { - + /** *

Constructor for ClassificationDetailSection.

* @@ -42,7 +42,7 @@ public class ClassificationDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createClassificationDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java index 0f4718268..292916ba5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java @@ -1,29 +1,26 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu - * + * * 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.classification; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; /** *

* ClassificationWizardPage class. *

- * + * * @author n.hoffmann * @created 23.06.2009 * @version 1.0 @@ -35,7 +32,7 @@ public class ClassificationWizardPage extends *

* Constructor for ClassificationWizardPage. *

- * + * * @param formFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -49,24 +46,22 @@ public class ClassificationWizardPage extends ConversationHolder conversation, Classification entity) { super(formFactory, conversation, entity); setTitle("Classification"); - - } - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement - * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - /** {@inheritDoc} */ - @Override - public ClassificationDetailElement createElement(ICdmFormElement rootElement) { - ClassificationDetailElement detailElement = (ClassificationDetailElement) formFactory - .createCdmDetailElement(DetailType.CLASSIFICATION, rootElement, - SWT.NULL); - detailElement.setEntity(getEntity()); - return detailElement; } - + + /* + * (non-Javadoc) + * + * @see + * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement + * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) + */ + /** {@inheritDoc} */ + @Override + public ClassificationDetailElement createElement(ICdmFormElement rootElement) { + ClassificationDetailElement detailElement = formFactory.createClassificationDetailElement(rootElement); + detailElement.setEntity(getEntity()); + return detailElement; + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java index 1460d9330..0508372da 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -27,16 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; * @version 1.0 */ public class TaxonNodeDetailSection extends AbstractCdmDetailSection { - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType() - */ - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return null; - } - + /** *

Constructor for TaxonNodeDetailSection.

* @@ -60,4 +51,13 @@ public class TaxonNodeDetailSection extends AbstractCdmDetailSection public String getHeading() { return null; } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + //FIXME generic + return formFactory.createTaxonNodeDetailElement(parentElement); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java index 4db6c49fc..4f261d545 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu - * + * * 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. */ @@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.ui.section.classification; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.taxon.ITreeNode; @@ -19,13 +18,12 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; /** *

* TaxonNodeWizardPage class. *

- * + * * @author n.hoffmann * @created Sep 15, 2009 * @version 1.0 @@ -36,7 +34,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage *

* Constructor for TaxonNodeWizardPage. *

- * + * * @param formFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -54,7 +52,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) @@ -63,9 +61,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage @Override public TaxonNodeDetailElement createElement(ICdmFormElement rootElement) { - TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) formFactory - .createCdmDetailElement(DetailType.TAXON_NODE, rootElement, - SWT.NULL); + TaxonNodeDetailElement detailElement = formFactory.createTaxonNodeDetailElement(rootElement); detailElement.setEntity(entity); formFactory.addPropertyChangeListener(this); return detailElement; @@ -75,7 +71,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage *

* openInEditor *

- * + * * @return a boolean. */ public boolean openInEditor() { @@ -84,7 +80,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage /* * (non-Javadoc) - * + * * @see * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse * .jface.util.PropertyChangeEvent) @@ -98,7 +94,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage } /** - * + * */ @Override protected void checkComplete() { @@ -119,7 +115,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage *

* Getter for the field parentTreeNode. *

- * + * * @return a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object. */ public ITreeNode getParentTreeNode() { @@ -133,7 +129,7 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage /* * (non-Javadoc) - * + * * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#dispose() */ /** {@inheritDoc} */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/RefereneEntityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferenceEntityDetailElement.java similarity index 91% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/RefereneEntityDetailElement.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferenceEntityDetailElement.java index 69b1e1a42..8649289c4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/RefereneEntityDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferenceEntityDetailElement.java @@ -22,12 +22,12 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; * @date Dec 1, 2011 * */ -public class RefereneEntityDetailElement extends AbstractCdmDetailElement{ +public class ReferenceEntityDetailElement extends AbstractCdmDetailElement{ private EntitySelectionElement selection_reference; private TextWithLabelElement text_referenceDetail; - public RefereneEntityDetailElement(CdmFormFactory formFactory, + public ReferenceEntityDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) { super(formFactory, formElement); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferencedEntityDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferencedEntityDetailSection.java index f0ade829c..d9825324d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferencedEntityDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/common/ReferencedEntityDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -31,15 +31,17 @@ public class ReferencedEntityDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createReferenceEntityDetailElement(parentElement); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java index 569ebb9b7..5cf40dc83 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,8 +15,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -40,18 +40,20 @@ public class DescriptionDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createDescriptionDetailElement(parentElement, style); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java index 8f43590dd..2fe958839 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -22,8 +22,8 @@ import eu.etaxonomy.cdm.model.description.TextData; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.description.operation.ChangeDescriptionElementType; @@ -36,7 +36,7 @@ import eu.etaxonomy.taxeditor.ui.section.description.operation.ChangeDescription */ public class DescriptionElementDetailSection extends AbstractCdmDetailSection { - + /** *

Constructor for DescriptionElementDetailSection.

* @@ -50,19 +50,20 @@ public class DescriptionElementDetailSection extends ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { super(cdmFormFactory, conversation, parentElement, selectionProvider, style); } - - - protected Control createToolbar() { + + + @Override + protected Control createToolbar() { if(! hasSpecificElement()){ return null; } - + ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT); - + final String destinationString = (getEntity() instanceof TextData) ? "the specific element" : "free text"; - - final String label = "Change to " + destinationString; - + + final String label = "Change to " + destinationString; + Action addAction = new Action("Change Type", Action.AS_PUSH_BUTTON) { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() @@ -73,52 +74,54 @@ public class DescriptionElementDetailSection extends + destinationString + "? Current data will be lost."); if (confirmed) { // FIXME - ChangeDescriptionElementType operation = new ChangeDescriptionElementType(label, + ChangeDescriptionElementType operation = new ChangeDescriptionElementType(label, getEntity(), StoreUtil.getDetailsView(), StoreUtil.getUndoContext()); StoreUtil.executeOperation(operation); } } }; - // TODO enable this once a proper icon has been found + // TODO enable this once a proper icon has been found // addAction.setImageDescriptor(new ImageDescriptor() { -// +// // @Override // public ImageData getImageData() { // return ImageResources.getImage(ImageResources.ADD_ICON).getImageData(); // } // }); addAction.setToolTipText(label); - + toolBarManager.add(addAction); - + return toolBarManager.createControl(this); } - + /** {@inheritDoc} */ @Override public String getHeading() { return "Description Element"; } - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return DetailType.DESCRIPTIONELEMENT; - } - /** {@inheritDoc} */ @Override protected void setSectionTitle() { this.setText(getHeading() + ": " + getEntity().getFeature().getLabel(CdmStore.getDefaultLanguage())); setTextClient(createToolbar()); } - + private boolean hasSpecificElement(){ - return getEntity().getFeature().isSupportsCategoricalData() + return getEntity().getFeature().isSupportsCategoricalData() || getEntity().getFeature().isSupportsCommonTaxonName() || getEntity().getFeature().isSupportsDistribution() || getEntity().getFeature().isSupportsIndividualAssociation() || getEntity().getFeature().isSupportsQuantitativeData() || getEntity().getFeature().isSupportsTaxonInteraction(); } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createDescriptionElementDetailElement(parentElement, style); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java index f82b59c3c..04a0171b1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -17,8 +17,8 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.media.MediaElement; @@ -47,16 +47,7 @@ public class MediaDetailsSection extends AbstractCdmDetailSection { ISelectionProvider selectionProvider, int style) { super(formFactory, conversation, parentElement, selectionProvider, style); } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType() - */ - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return null; - } - + /** {@inheritDoc} */ @Override protected void createControls(AbstractCdmDetailSection formElement, @@ -64,18 +55,19 @@ public class MediaDetailsSection extends AbstractCdmDetailSection { TableWrapLayout layout = (TableWrapLayout) getLayoutComposite().getLayout(); layout.topMargin = 10; layout.numColumns = 2; - + getLayoutComposite().setLayout(layout); - - + + } - + /** *

setEntity

* * @param entity a {@link eu.etaxonomy.cdm.model.media.Media} object. */ - public void setEntity(Media entity) { + @Override + public void setEntity(Media entity) { if(element_media != null){ this.removeElements(); } @@ -94,4 +86,12 @@ public class MediaDetailsSection extends AbstractCdmDetailSection { public String getHeading() { return "Image"; } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return null; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java index e073f7e3a..ee928e4e3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,8 +15,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; * @version 1.0 */ public class NaturalLanguageSection extends AbstractCdmDetailSection { - + /** *

Constructor for NaturalLanguageSection.

* @@ -42,22 +42,21 @@ public class NaturalLanguageSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNaturalLanguageDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java index 84aeb25ec..456fc997f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; * @version 1.0 */ public class FeatureDistributionDetailSection extends AbstractCdmDetailSection { - + /** *

Constructor for FeatureDistributionDetailSection.

* @@ -42,22 +42,22 @@ public class FeatureDistributionDetailSection extends AbstractCdmDetailSection parentElement, int style) { + //FIXME generic + return formFactory.createFeatureDistributionDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java index 47d911def..3fd5b3887 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java @@ -1,22 +1,19 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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.grantedAuthority; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; /** @@ -34,7 +31,7 @@ public class GrantedAuthorityDetailWizardPage extends AbstractCdmEntityWizardPag @Override public AbstractCdmDetailElement createElement( ICdmFormElement rootElement) { - GrantedAuthorityDetailElement authorityElement = (GrantedAuthorityDetailElement) formFactory.createCdmDetailElement(DetailType.GRANTEDAUTHORITY, rootElement, SWT.NULL); + GrantedAuthorityDetailElement authorityElement = formFactory.createGrantedAuthorityDetailElement(rootElement); authorityElement.setEntity(getEntity()); return authorityElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailSection.java index 9d66d8208..e5543bd34 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.Group; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -40,19 +40,19 @@ public class GroupDetailSection extends AbstractCdmDetailSection { } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() */ @Override - protected DetailType getDetailType() { - return DetailType.GROUP; + public String getHeading() { + return "Group " + (getEntity() != null ? getEntity().getName() : ""); } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) */ @Override - public String getHeading() { - return "Group " + (getEntity() != null ? getEntity().getName() : ""); + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createGroupDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailWizardPage.java index 35a6292a3..15c4f4910 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailWizardPage.java @@ -1,23 +1,20 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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.group; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.Group; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; /** @@ -44,7 +41,7 @@ public class GroupDetailWizardPage extends AbstractCdmEntityWizardPage{ @Override public AbstractCdmDetailElement createElement( ICdmFormElement rootElement) { - GroupDetailElement groupElement = (GroupDetailElement) formFactory.createCdmDetailElement(DetailType.GROUP, rootElement, SWT.NULL); + GroupDetailElement groupElement = formFactory.createGroupDetailElement(rootElement); return groupElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java index 390de78b7..68a5db7d8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java @@ -1,5 +1,5 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.key; @@ -9,7 +9,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.PolytomousKey; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -25,19 +25,19 @@ public class PolytomousKeyDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createPolytomousKeyDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java index fdfa64709..65c4d636c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java @@ -1,5 +1,5 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.key; @@ -9,7 +9,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -23,21 +23,21 @@ public class PolytomousKeyNodeDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createPolytomousKeyNodeDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java index 7fba074cd..66c071ced 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -46,7 +46,7 @@ public class AuthorshipDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createAuthorshipDetailElement(parentElement, style); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java index 77fb8fe00..ae1812feb 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -46,7 +46,7 @@ public class HybridDetailSection extends AbstractCdmDetailSection super(formFactory, conversation, parentElement, selectionProvider, style); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection#setTaxonBase(eu.etaxonomy.cdm.model.taxon.TaxonBase) */ @@ -65,14 +65,6 @@ public class HybridDetailSection extends AbstractCdmDetailSection return taxonBase; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType() - */ - @Override - protected DetailType getDetailType() { - return DetailType.HYBRID; - } - /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() */ @@ -88,5 +80,14 @@ public class HybridDetailSection extends AbstractCdmDetailSection protected void setSectionTitle() { setText(getHeading()); } - + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + //FIXME generic + return formFactory.createHybridDetailElement(parentElement); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java index 1b18a4562..32315ed8d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -48,7 +48,8 @@ public class NameDetailSection extends AbstractCdmDetailSection im } /** {@inheritDoc} */ - public void setTaxonBase(TaxonBase entity) { + @Override + public void setTaxonBase(TaxonBase entity) { this.taxonBase = entity; NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName()); setEntity(name); @@ -60,19 +61,13 @@ public class NameDetailSection extends AbstractCdmDetailSection im return "Scientific Name"; } - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return DetailType.SCIENTIFICNAME; - } - /** {@inheritDoc} */ @Override protected void setSectionTitle() { if(!isDisposed()){ String title = ""; if(getEntity() != null && (getEntity() instanceof NonViralName)){ - title = ": " + ((NonViralName) getEntity()).getNameCache(); + title = ": " + getEntity().getNameCache(); } this.setText(getHeading() + title); } @@ -85,5 +80,12 @@ public class NameDetailSection extends AbstractCdmDetailSection im public TaxonBase getTaxonBase() { return taxonBase; } - + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNameDetailElement(parentElement, style); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java index 55662b2d5..d4e17a472 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT - * European Distributed Institute of Taxonomy + * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu - * + * * 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. */ @@ -12,14 +12,13 @@ package eu.etaxonomy.taxeditor.ui.section.name; import java.util.Arrays; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement; @@ -28,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement *

* NonViralNameDetailElement class. *

- * + * * @author n.hoffmann * @created May 20, 2010 * @version 1.0 @@ -45,7 +44,7 @@ public class NonViralNameDetailElement extends *

* Constructor for NonViralNameDetailElement. *

- * + * * @param formFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -60,7 +59,7 @@ public class NonViralNameDetailElement extends /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls * (eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement, @@ -68,39 +67,27 @@ public class NonViralNameDetailElement extends */ /** {@inheritDoc} */ @Override - protected void createControls(ICdmFormElement formElement, - final NonViralName entity, int style) { - - toggleable_cache = formFactory.createToggleableTextField(formElement, - "Cache", entity.getTitleCache(), entity.isProtectedTitleCache() - || entity.isProtectedFullTitleCache(), style); - - combo_nomenclaturalCode = formFactory - .createEnumComboElement(NomenclaturalCode.class, - formElement, style); - combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode()); - - section_name = (NameDetailSection) formFactory.createCdmDetailSection( - DetailType.SCIENTIFICNAME, getConversationHolder(), - formElement, null, Section.TWISTIE | Section.EXPANDED); - section_name.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - addControl(section_name); - addElement(section_name); - section_author = (AuthorshipDetailSection) formFactory - .createCdmDetailSection(DetailType.AUTHORSHIP, - getConversationHolder(), formElement, null, - Section.TWISTIE | Section.EXPANDED); - section_author.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - addControl(section_author); - addElement(section_author); - - section_hybrid = (HybridDetailSection) formFactory.createCdmDetailSection(DetailType.HYBRID, - getConversationHolder(), formElement, null, - Section.TWISTIE); - section_hybrid.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - addControl(section_hybrid); - addElement(section_hybrid); - } + protected void createControls(ICdmFormElement formElement, final NonViralName entity, int style) { + + toggleable_cache = formFactory.createToggleableTextField(formElement, "Cache", entity.getTitleCache(), entity.isProtectedTitleCache() || entity.isProtectedFullTitleCache(), style); + + combo_nomenclaturalCode = formFactory.createEnumComboElement(NomenclaturalCode.class, formElement, style); + combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode()); + + section_name = formFactory.createNameDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + section_name.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + addControl(section_name); + addElement(section_name); + section_author = formFactory.createAuthorshipDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + section_author.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + addControl(section_author); + addElement(section_author); + + section_hybrid = formFactory.createHybridDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE); + section_hybrid.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + addControl(section_hybrid); + addElement(section_hybrid); + } /** {@inheritDoc} */ @Override @@ -144,7 +131,7 @@ public class NonViralNameDetailElement extends /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java * .lang.Object) @@ -159,8 +146,9 @@ public class NonViralNameDetailElement extends // initiating the free text name editor getEntity().setProtectedFullTitleCache(false); } else if (eventSource == section_name || eventSource == section_author) { - if (getParentElement() instanceof AbstractCdmDetailSection) - ((AbstractCdmDetailSection) getParentElement()).updateTitle(); + if (getParentElement() instanceof AbstractCdmDetailSection) { + ((AbstractCdmDetailSection) getParentElement()).updateTitle(); + } if (!toggleable_cache.getState()) { toggleable_cache.setText(getEntity().getTitleCache()); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java index d76f59a91..654a025e4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java @@ -23,9 +23,9 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -99,15 +99,6 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNonViralNameDetailElement(parentElement); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java index 4603f031d..de04f7c59 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java @@ -1,22 +1,19 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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.name; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -43,15 +40,15 @@ public class NonViralNameWizardPage extends AbstractCdmEntityWizardPage createElement(ICdmFormElement rootElement) { - nameElement = (NonViralNameDetailElement) formFactory.createCdmDetailElement(DetailType.NONVIRALNAME, rootElement, SWT.NULL); + nameElement = formFactory.createNonViralNameDetailElement(rootElement); nameElement.setEntity(entity); return nameElement; } - + /** {@inheritDoc} */ @Override public void dispose() { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java index 9c9574b31..ba24188ba 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java @@ -1,22 +1,19 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.occurrence.Collection; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -49,14 +46,14 @@ public class CollectionWizardPage extends AbstractCdmEntityWizardPage createElement(ICdmFormElement rootElement) { - CollectionDetailElement collectionDetailElement = (CollectionDetailElement) formFactory.createCdmDetailElement(DetailType.COLLECTION, rootElement, SWT.NULL); + CollectionDetailElement collectionDetailElement = formFactory.createCollectionDetailElement(rootElement); collectionDetailElement.setEntity(entity); return collectionDetailElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java index 00731806d..4f7448432 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java @@ -15,7 +15,6 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; @@ -44,15 +43,6 @@ public class DerivedUnitBaseDetailSection extends AbstractCdmDetailSection createElement(ICdmFormElement rootElement) { - DerivedUnitBaseDetailElement detailElement = (DerivedUnitBaseDetailElement) formFactory.createCdmDetailElement(DetailType.DERIVED_UNIT, rootElement, SWT.NULL); - detailElement.setEntity(getEntity()); + DerivedUnitBaseDetailElement detailElement = formFactory.createDerivedUnitBaseDetailElement(rootElement); + detailElement.setEntity(getEntity()); return detailElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java index 3997d2af3..edd068f7f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java @@ -10,16 +10,15 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; @@ -35,7 +34,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement { - + /** *

Constructor for DerivedUnitFacadeDetailSection.

* @@ -42,16 +42,18 @@ public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createDerivedUnitFacadeDetailElement(parentElement); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java index 036b660af..c2ae96f52 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java @@ -15,7 +15,6 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; @@ -40,14 +39,6 @@ public class DeterminationDetailSection extends AbstractCdmDetailSection createElement(ICdmFormElement rootElement) { - FieldObservationDetailElement detailElement = (FieldObservationDetailElement) formFactory.createCdmDetailElement(DetailType.FIELD_OBSERVATION, rootElement, SWT.NONE); + FieldObservationDetailElement detailElement = formFactory.createFieldObservationDetailElement(rootElement); detailElement.setEntity(getEntity()); return detailElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java index 41a04b2da..44c86337c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java @@ -15,7 +15,6 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; @@ -45,15 +44,6 @@ public class GatheringEventDetailSection extends AbstractCdmDetailSection createElement(ICdmFormElement rootElement) { - GatheringEventDetailElement detailElement = (GatheringEventDetailElement) formFactory.createCdmDetailElement(DetailType.GATHERING_EVENT, rootElement, SWT.NULL); + GatheringEventDetailElement detailElement = formFactory.createGatheringEventDetailElement(rootElement); detailElement.setEntity(getEntity()); return detailElement; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java index 39004c3a9..d2b3e7276 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java @@ -15,7 +15,6 @@ import org.eclipse.jface.viewers.ISelectionProvider; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; @@ -41,14 +40,6 @@ public class GeneralDetailSection extends AbstractCdmDetailSection createElement(ICdmFormElement rootElement) { - GeneralDetailElement detailElement = (GeneralDetailElement) formFactory.createCdmDetailElement(DetailType.DERIVED_UNIT_GENERAL, rootElement, SWT.NULL); + GeneralDetailElement detailElement = formFactory.createGeneralDetailElement(rootElement); detailElement.setEntity(getEntity()); checkComplete(); return detailElement; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java index d9a824f9c..33cd1e7b9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -48,12 +48,6 @@ public class NomenclaturalReferenceDetailSection extends ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { super(cdmFormFactory, conversation, parentElement, selectionProvider, style); } - - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return DetailType.NOMENCLATURALREFERENCE; - } /** {@inheritDoc} */ @Override @@ -62,12 +56,13 @@ public class NomenclaturalReferenceDetailSection extends } /** {@inheritDoc} */ - public void setTaxonBase(TaxonBase entity) { + @Override + public void setTaxonBase(TaxonBase entity) { this.taxonBase = entity; TaxonNameBase name = (TaxonNameBase) HibernateProxyHelper.deproxy(entity.getName()); setEntity(name); } - + /** {@inheritDoc} */ @Override protected void setSectionTitle() { @@ -76,7 +71,7 @@ public class NomenclaturalReferenceDetailSection extends INomenclaturalReference reference = getEntity().getNomenclaturalReference(); String nomenclaturalCitation = reference.getNomenclaturalCitation(getEntity().getNomenclaturalMicroReference()); title = ": " + nomenclaturalCitation; - } + } this.setText(getHeading() + title); } @@ -87,4 +82,12 @@ public class NomenclaturalReferenceDetailSection extends public TaxonBase getTaxonBase() { return taxonBase; } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNomenclaturalReferenceDetailElement(parentElement, style); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java index c04bad78f..ec35e1d91 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; * @version 1.0 */ public class ReferenceDetailSection extends AbstractCdmDetailSection implements ITaxonBaseDetailSection{ - + private TaxonBase taxonBase; /** @@ -54,12 +54,13 @@ public class ReferenceDetailSection extends AbstractCdmDetailSection * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase) */ /** {@inheritDoc} */ - public void setTaxonBase(TaxonBase entity) { + @Override + public void setTaxonBase(TaxonBase entity) { this.taxonBase = entity; NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName()); - + Reference reference = (Reference) HibernateProxyHelper.deproxy(name.getNomenclaturalReference()); - + setEntity(reference); } @@ -73,12 +74,6 @@ public class ReferenceDetailSection extends AbstractCdmDetailSection return "Reference"; } - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return DetailType.REFERENCEBASE; - } - /** {@inheritDoc} */ @Override public void refresh() { @@ -93,5 +88,13 @@ public class ReferenceDetailSection extends AbstractCdmDetailSection public TaxonBase getTaxonBase() { return taxonBase; } - + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createReferenceDetailElement(parentElement, style); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java index bfd30b9e7..a8bdfe4d0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -16,7 +16,6 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.IExceptionHandler; @@ -42,14 +41,15 @@ public class ReferenceWizardPage extends AbstractCdmEntityWizardPage super(formFactory, conversation, entity); setTitle("Reference"); } - - /* + + /* * (non-Javadoc) * @see eu.etaxonomy.taxeditor.forms.CdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) */ /** {@inheritDoc} */ - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement){ - ReferenceDetailElement referenceElement = (ReferenceDetailElement) formFactory.createCdmDetailElement(DetailType.REFERENCEBASE, rootElement, SWT.NULL); + @Override + public AbstractCdmDetailElement createElement(ICdmFormElement rootElement){ + ReferenceDetailElement referenceElement = formFactory.createReferenceDetailElement(rootElement, SWT.NULL); referenceElement.addExceptionHandler(this); referenceElement.setEntity(entity); return referenceElement; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java index af0d316cf..bf989c41c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.strategy.parser.ParserProblem; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -39,7 +39,7 @@ public class ParsingMessagesSection extends AbstractCdmDetailSectionHEADING_PROBLEM="The name has problems." */ public static final String HEADING_PROBLEM = "The name has problems."; private TaxonBase taxonBase; - + /** *

Constructor for ParsingMessagesSection.

* @@ -53,15 +53,16 @@ public class ParsingMessagesSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + //no detail element + return null; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java index 8ba2e3449..e0a5d92eb 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -50,9 +50,10 @@ public class TaxonBaseDetailSection extends AbstractCdmDetailSection * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase) */ /** {@inheritDoc} */ - public void setTaxonBase(TaxonBase entity) { + @Override + public void setTaxonBase(TaxonBase entity) { this.taxonBase = entity; - TaxonBase taxonBase = (TaxonBase) HibernateProxyHelper.deproxy(entity); + TaxonBase taxonBase = (TaxonBase) HibernateProxyHelper.deproxy(entity); setEntity(taxonBase); } @@ -62,12 +63,6 @@ public class TaxonBaseDetailSection extends AbstractCdmDetailSection return getEntity() != null ? getEntity().getClass().getSimpleName() : "TaxonBase"; } - /** {@inheritDoc} */ - @Override - protected DetailType getDetailType() { - return DetailType.TAXONBASE; - } - /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase) */ @@ -76,4 +71,12 @@ public class TaxonBaseDetailSection extends AbstractCdmDetailSection return taxonBase; } + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createTaxonBaseDetailElement(parentElement, style); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailSection.java index 262a9eb57..c787ad00d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -32,13 +32,16 @@ public class TaxonRelationshipDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createTaxonRelationshipDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java index e1010d885..a80b492c0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java @@ -1,5 +1,5 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.user; @@ -12,7 +12,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -37,19 +37,18 @@ public class UserDetailSection extends AbstractCdmDetailSection { } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType() + * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() */ @Override - protected DetailType getDetailType() { - return DetailType.USER; + public String getHeading() { + return "User " + (getEntity() != null ? getEntity().getUsername() : ""); } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) */ @Override - public String getHeading() { - return "User " + (getEntity() != null ? getEntity().getUsername() : ""); + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createUserDetailElement(parentElement); } - } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java index 3c82fbe95..972b92dc6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java @@ -1,15 +1,12 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.user; -import org.eclipse.swt.SWT; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -30,11 +27,11 @@ public class UserDetailWizardPage extends AbstractCdmEntityWizardPage { */ @Override public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - UserDetailElement userElement = (UserDetailElement) formFactory.createCdmDetailElement(DetailType.USER, rootElement, SWT.NULL); + UserDetailElement userElement = formFactory.createUserDetailElement(rootElement); userElement.setEntity(getEntity()); return userElement; } - + @Override protected void checkComplete() { boolean hasUsername = getEntity().getUsername() != null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java index 953928966..01b8ce6e5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailSection.java @@ -1,8 +1,8 @@ /** * Copyright (C) 2011 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -14,20 +14,20 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** * UseRecordDetailSection Class - * @author a.theys + * @author a.theys * @created mar 13, 2012 * @version 1.0 */ public class UseRecordDetailSection extends AbstractCdmDetailSection { - + /**Constructor for class UseRecordDetailSection - * + * * @param cdmFormFactory * @param conversation * @param parentElement @@ -38,23 +38,26 @@ public class UseRecordDetailSection extends AbstractCdmDetailSection parentElement, int style) { + return formFactory.createUseRecordDetailElement(parentElement); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java index 14c9f6267..b7e482e60 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java @@ -10,13 +10,12 @@ package eu.etaxonomy.taxeditor.ui.section.vocabulary; import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.ui.forms.widgets.TableWrapLayout; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -41,29 +40,28 @@ public class DefinedTermDetailSection extends Abstrac } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() */ @Override - protected DetailType getDetailType() { - return null; + public String getHeading() { + return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : ""); } - @Override - protected void createControlsByType(AbstractCdmDetailSection abstractCdmDetailSection, Class clazz, int style) { - TableWrapLayout layout = (TableWrapLayout) getLayoutComposite().getLayout(); - layout.topMargin = 10; - layout.numColumns = 2; - - getLayoutComposite().setLayout(layout); - detailElement = formFactory.createDefinedTermDetailElement(clazz, abstractCdmDetailSection, style); - } + //FIXME clean up create element methods + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElementByType(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, java.lang.Class, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElementByType(AbstractCdmDetailSection parentElement, Class entityClass, int style) { + return formFactory.createDefinedTermDetailElement(entityClass, parentElement, style); + } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) */ @Override - public String getHeading() { - return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : ""); + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return null; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java index c8242850f..86082a690 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -40,21 +40,20 @@ public class NamedAreaDetailSection extends AbstractCdmDetailSection } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() */ @Override - protected DetailType getDetailType() { - - return DetailType.NAMED_AREA; + public String getHeading() { + + return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : ""); } /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) */ @Override - public String getHeading() { - - return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : ""); + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNamedAreaDetailElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java index cf6394ef7..69daf2ba7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.location.NamedAreaLevel; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -37,20 +37,19 @@ public class NamedAreaLevelDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createNamedAreaLevelElement(parentElement); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java index 18f10bf67..767ffb8fe 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2009 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * 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. */ @@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; +import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; /** @@ -40,24 +40,15 @@ public class TermVocabularyDetailSection extends // TODO Auto-generated constructor stub } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType() - */ - @Override - protected DetailType getDetailType() { - - return DetailType.TERM_VOCABULARY; - } - /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading() */ @Override public String getHeading() { - + return "Vocabulary: "+ (getEntity() != null ? getEntity().getLabel() : ""); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#setSectionTitle() */ @@ -65,4 +56,12 @@ public class TermVocabularyDetailSection extends protected void setSectionTitle() { setText(getHeading()); } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) + */ + @Override + protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { + return formFactory.createTermVocabularyDetailElement(parentElement); + } } 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 bc5e6b170..4fe9b9f42 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 @@ -48,7 +48,6 @@ import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.RootElement; import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection; @@ -230,7 +229,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { createMediaElementSection(rootElement); } else if (input instanceof DerivedUnitFacade) { - createFOSection(rootElement); + createDerivedUnitBaseElementSection(rootElement); } else if (input instanceof FeatureNodeContainer) { createFeatureDistributionSection(rootElement); @@ -262,15 +261,9 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createGroupSection(RootElement parent) { destroySections(); - GroupDetailSection groupDetailSection = (GroupDetailSection) formFactory.createCdmDetailSection( - DetailType.GROUP, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); - MemberDetailSection memberDetailSection = (MemberDetailSection) formFactory.createEntityDetailSection( - EntityDetailType.MEMBER, getConversationHolder(), parent, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); - GrantedAuthorityDetailSection grantedAuthorityDetailSection = (GrantedAuthorityDetailSection) formFactory - .createEntityDetailSection(EntityDetailType.GRANTED_AUTHORITY, getConversationHolder(), parent, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + GroupDetailSection groupDetailSection = formFactory.createGroupDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE| ExpandableComposite.EXPANDED); + MemberDetailSection memberDetailSection = (MemberDetailSection) formFactory.createEntityDetailSection(EntityDetailType.MEMBER, getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + GrantedAuthorityDetailSection grantedAuthorityDetailSection = (GrantedAuthorityDetailSection) formFactory.createEntityDetailSection(EntityDetailType.GRANTED_AUTHORITY, getConversationHolder(), parent,ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(groupDetailSection); addPart(memberDetailSection); @@ -311,47 +304,36 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createTaxonSections(RootElement parent) { destroySections(); - TaxonBaseDetailSection taxonBaseDetailSection = (TaxonBaseDetailSection) formFactory.createCdmDetailSection( - DetailType.TAXONBASE, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + TaxonBaseDetailSection taxonBaseDetailSection = formFactory.createTaxonBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NonViralNameDetailSection nonViralNameSection = (NonViralNameDetailSection) formFactory.createCdmDetailSection( - DetailType.NONVIRALNAME, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE + NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NomenclaturalReferenceDetailSection referenceDetailSection = (NomenclaturalReferenceDetailSection) formFactory - .createCdmDetailSection(DetailType.NOMENCLATURALREFERENCE, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE); + NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NomenclaturalStatusSection nomenclaturalStatusSection = (NomenclaturalStatusSection) formFactory - .createEntityDetailSection(EntityDetailType.NOMENCLATURALSTATUS, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + NomenclaturalStatusSection nomenclaturalStatusSection = (NomenclaturalStatusSection) formFactory.createEntityDetailSection(EntityDetailType.NOMENCLATURALSTATUS, getConversationHolder(), parent,ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - ProtologueSection protologSection = (ProtologueSection) formFactory.createEntityDetailSection( - EntityDetailType.PROTOLOG, getConversationHolder(), parent, ExpandableComposite.TWISTIE); + ProtologueSection protologSection = (ProtologueSection) formFactory.createEntityDetailSection(EntityDetailType.PROTOLOG, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - TypeDesignationSection typeDesignationSection = (TypeDesignationSection) formFactory.createEntityDetailSection( - EntityDetailType.TYPEDESIGNATION, getConversationHolder(), parent, ExpandableComposite.TWISTIE); + TypeDesignationSection typeDesignationSection = (TypeDesignationSection) formFactory.createEntityDetailSection(EntityDetailType.TYPEDESIGNATION, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NameRelationshipDetailSection nameRelationshipSection = (NameRelationshipDetailSection) formFactory - .createEntityDetailSection(EntityDetailType.NAME_RELATIONSHIP, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + NameRelationshipDetailSection nameRelationshipSection = (NameRelationshipDetailSection) formFactory.createEntityDetailSection(EntityDetailType.NAME_RELATIONSHIP, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - ParsingMessagesSection parsingMessagesSection = (ParsingMessagesSection) formFactory.createCdmDetailSection( - DetailType.PARSINGMESSAGE, getConversationHolder(), parent, this, ExpandableComposite.EXPANDED); + ParsingMessagesSection parsingMessagesSection = formFactory.createParsingMessagesSection(getConversationHolder(), parent, this, ExpandableComposite.EXPANDED); addPart(taxonBaseDetailSection); addPart(nonViralNameSection); @@ -370,37 +352,27 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createNameSections(RootElement parent) { destroySections(); - NonViralNameDetailSection nonViralNameSection = (NonViralNameDetailSection) formFactory.createCdmDetailSection( - DetailType.NONVIRALNAME, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NomenclaturalReferenceDetailSection referenceDetailSection = (NomenclaturalReferenceDetailSection) formFactory - .createCdmDetailSection(DetailType.NOMENCLATURALREFERENCE, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE); + NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NomenclaturalStatusSection nomenclaturalStatusSection = (NomenclaturalStatusSection) formFactory - .createEntityDetailSection(EntityDetailType.NOMENCLATURALSTATUS, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + NomenclaturalStatusSection nomenclaturalStatusSection = (NomenclaturalStatusSection) formFactory.createEntityDetailSection(EntityDetailType.NOMENCLATURALSTATUS, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - ProtologueSection protologSection = (ProtologueSection) formFactory.createEntityDetailSection( - EntityDetailType.PROTOLOG, getConversationHolder(), parent, ExpandableComposite.TWISTIE); + ProtologueSection protologSection = (ProtologueSection) formFactory.createEntityDetailSection(EntityDetailType.PROTOLOG, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - TypeDesignationSection typeDesignationSection = (TypeDesignationSection) formFactory.createEntityDetailSection( - EntityDetailType.TYPEDESIGNATION, getConversationHolder(), parent, ExpandableComposite.TWISTIE); + TypeDesignationSection typeDesignationSection = (TypeDesignationSection) formFactory.createEntityDetailSection(EntityDetailType.TYPEDESIGNATION, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NameRelationshipDetailSection nameRelationshipSection = (NameRelationshipDetailSection) formFactory - .createEntityDetailSection(EntityDetailType.NAME_RELATIONSHIP, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + NameRelationshipDetailSection nameRelationshipSection = (NameRelationshipDetailSection) formFactory.createEntityDetailSection(EntityDetailType.NAME_RELATIONSHIP, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -420,9 +392,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createReferenceSections(RootElement parent) { destroySections(); - ReferenceDetailSection referenceDetailSection = (ReferenceDetailSection) formFactory.createCdmDetailSection( - DetailType.REFERENCEBASE, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + ReferenceDetailSection referenceDetailSection = formFactory.createReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(referenceDetailSection); } @@ -434,9 +404,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createTeamOrPersonBaseDetailSection(RootElement parent) { destroySections(); - TeamOrPersonBaseDetailSection teamOrPersonBaseDetailSection = (TeamOrPersonBaseDetailSection) formFactory - .createCdmDetailSection(DetailType.TEAMORPERSONBASE, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + TeamOrPersonBaseDetailSection teamOrPersonBaseDetailSection = formFactory.createTeamOrPersonBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(teamOrPersonBaseDetailSection); } @@ -448,8 +416,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createTeamDetailSection(RootElement parent) { destroySections(); - TeamDetailSection teamDetailSection = (TeamDetailSection) formFactory.createCdmDetailSection(DetailType.TEAM, - getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + TeamDetailSection teamDetailSection = formFactory.createTeamDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(teamDetailSection); } @@ -461,9 +428,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createPersonDetailSection(RootElement parent) { destroySections(); - PersonDetailSection personDetailSection = (PersonDetailSection) formFactory.createCdmDetailSection( - DetailType.PERSON, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + PersonDetailSection personDetailSection = formFactory.createPersonDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(personDetailSection); } @@ -475,21 +440,15 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createDescriptionElementSection(RootElement parent) { destroySections(); - DescriptionElementDetailSection descriptionElementDetailSection = (DescriptionElementDetailSection) formFactory - .createCdmDetailSection(DetailType.DESCRIPTIONELEMENT, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + DescriptionElementDetailSection descriptionElementDetailSection = formFactory.createDescriptionElementDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescriptionElementSourceSection descriptionElementSourceSection = (DescriptionElementSourceSection) formFactory - .createEntityDetailSection(EntityDetailType.DESCRIPTIONELEMENTSOURCE, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + DescriptionElementSourceSection descriptionElementSourceSection = (DescriptionElementSourceSection) formFactory.createEntityDetailSection(EntityDetailType.DESCRIPTIONELEMENTSOURCE, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescriptionElementMediaSection descriptionElementMediaSection = (DescriptionElementMediaSection) formFactory - .createEntityDetailSection(EntityDetailType.DESCRIPTIONELEMENTMEDIA, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + DescriptionElementMediaSection descriptionElementMediaSection = (DescriptionElementMediaSection) formFactory.createEntityDetailSection(EntityDetailType.DESCRIPTIONELEMENTMEDIA, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -505,32 +464,23 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createDescriptionSection(RootElement parent) { destroySections(); - DescriptionDetailSection descriptionDetailSection = (DescriptionDetailSection) formFactory - .createCdmDetailSection(DetailType.DESCRIPTION, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - NaturalLanguageSection naturalLanguageSection = (NaturalLanguageSection) formFactory.createCdmDetailSection( - DetailType.NATURAL_LANGUAGE, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + NaturalLanguageSection naturalLanguageSection = formFactory.createNaturalLanguageSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescribedSpecimenSection describedSpecimenSection = (DescribedSpecimenSection) formFactory - .createEntityDetailSection(EntityDetailType.DESCRIBED_SPECIMEN, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + DescribedSpecimenSection describedSpecimenSection = (DescribedSpecimenSection) formFactory.createEntityDetailSection(EntityDetailType.DESCRIBED_SPECIMEN, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory - .createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE, getConversationHolder(), parent, - ExpandableComposite.TWISTIE); + DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory.createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - ScopeSection scopeSection = (ScopeSection) formFactory.createEntityDetailSection(EntityDetailType.SCOPE, - getConversationHolder(), parent, ExpandableComposite.TWISTIE); + ScopeSection scopeSection = (ScopeSection) formFactory.createEntityDetailSection(EntityDetailType.SCOPE, getConversationHolder(), parent, ExpandableComposite.TWISTIE); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -548,15 +498,11 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createUseDescriptionSection(RootElement parent) { destroySections(); - DescriptionDetailSection descriptionDetailSection = (DescriptionDetailSection) formFactory - .createCdmDetailSection(DetailType.DESCRIPTION, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory - .createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE, getConversationHolder(), parent, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory.createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE, getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -570,9 +516,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ private void createImageGallerySection(RootElement parent) { destroySections(); - DescriptionDetailSection descriptionDetailSection = (DescriptionDetailSection) formFactory - .createCdmDetailSection(DetailType.DESCRIPTION, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(descriptionDetailSection); } @@ -585,9 +529,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createMediaElementSection(RootElement parent) { destroySections(); - MediaDetailsSection mediaDetailSection = (MediaDetailsSection) formFactory.createCdmDetailSection( - DetailType.MEDIA, getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + MediaDetailsSection mediaDetailSection = formFactory.createMediaDetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(mediaDetailSection); } @@ -631,9 +573,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createFeatureDistributionSection(RootElement parent) { destroySections(); - FeatureDistributionDetailSection featureDistributionSection = (FeatureDistributionDetailSection) formFactory - .createCdmDetailSection(DetailType.FEATURE_DISTRIBUTION, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + FeatureDistributionDetailSection featureDistributionSection = formFactory.createFeatureDistributionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(featureDistributionSection); } @@ -646,21 +586,15 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createPolytomousKeyNodeSection(RootElement parent) { destroySections(); - PolytomousKeyDetailSection polytomousKeyDetailSection = (PolytomousKeyDetailSection) formFactory - .createCdmDetailSection(DetailType.POLYTOMOUS_KEY, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT); + PolytomousKeyDetailSection polytomousKeyDetailSection = formFactory.createPolytomousKeyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - PolytomousKeyNodeDetailSection polytomousKeyNodeDetailSection = (PolytomousKeyNodeDetailSection) formFactory - .createCdmDetailSection(DetailType.POLYTOMOUS_KEY_NODE, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + PolytomousKeyNodeDetailSection polytomousKeyNodeDetailSection = formFactory.createPolytomousKeyNodeDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); - TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory.createEntityDetailSection( - EntityDetailType.TAXONOMIC_SCOPE, getConversationHolder(), parent, ExpandableComposite.TWISTIE - | ExpandableComposite.COMPACT); + TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory.createEntityDetailSection(EntityDetailType.TAXONOMIC_SCOPE, getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT); addPart(polytomousKeyDetailSection); addPart(polytomousKeyNodeDetailSection); @@ -676,9 +610,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createUseRecordSection(RootElement parent) { destroySections(); - UseRecordDetailSection descriptionUseRecordSection = (UseRecordDetailSection) formFactory - .createCdmDetailSection(DetailType.USE_RECORD, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + UseRecordDetailSection descriptionUseRecordSection = formFactory.createUseRecordDetailSection(getConversationHolder(), parent, this,ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -694,12 +626,9 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createUserSection(RootElement parent) { destroySections(); - UserDetailSection userDetailSection = (UserDetailSection) formFactory.createCdmDetailSection(DetailType.USER, - getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + UserDetailSection userDetailSection = formFactory.createUserDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - GroupsByUserDetailSection groupByUserDetailSection = (GroupsByUserDetailSection) formFactory - .createEntityDetailSection(EntityDetailType.GROUPS_BY_USER, getConversationHolder(), parent, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + GroupsByUserDetailSection groupByUserDetailSection = (GroupsByUserDetailSection) formFactory.createEntityDetailSection(EntityDetailType.GROUPS_BY_USER, getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(userDetailSection); addPart(groupByUserDetailSection); @@ -713,13 +642,9 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createTaxonRelationshipSection(RootElement parent) { destroySections(); - TaxonRelationshipDetailSection taxonRelationshipDetailSection = (TaxonRelationshipDetailSection) formFactory - .createCdmDetailSection(DetailType.TAXON_RELATIONSHIP, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + TaxonRelationshipDetailSection taxonRelationshipDetailSection = formFactory.createTaxonRelationshipDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - ReferencedEntityDetailSection referencedEntityBaseDetailSection = (ReferencedEntityDetailSection) formFactory - .createCdmDetailSection(DetailType.REFERENCED_ENTITY, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + ReferencedEntityDetailSection referencedEntityBaseDetailSection = formFactory.createReferencedEntityDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(taxonRelationshipDetailSection); addPart(referencedEntityBaseDetailSection); } @@ -730,9 +655,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createTermVocabularySection(RootElement parent) { destroySections(); - TermVocabularyDetailSection termVocabularyDetailSection = (TermVocabularyDetailSection) formFactory - .createCdmDetailSection(DetailType.TERM_VOCABULARY, getConversationHolder(), parent, this, - ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + TermVocabularyDetailSection termVocabularyDetailSection = formFactory.createTermVocabularyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(termVocabularyDetailSection); } @@ -744,16 +667,14 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createDefinedTermSection(RootElement parent) { destroySections(); - AbstractFormSection definedTermDetailSection = formFactory.createDefinedTermDetailSection( - getInput().getClass(), getConversationHolder(), parent, this, ExpandableComposite.TWISTIE - | ExpandableComposite.EXPANDED); + AbstractFormSection definedTermDetailSection = formFactory.createDefinedTermDetailSection(getInput().getClass(), getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); addPart(definedTermDetailSection); } - private void createFOSection(RootElement parent){ + private void createFODetailsView(RootElement parent) { destroySections(); - GeneralDetailSection generalDetailSection = formFactory.createFOSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + GeneralDetailSection generalDetailSection = formFactory.createFOSection(getConversationHolder(), parent, this,ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); formFactory.createHorizontalSeparator(parent, SWT.BORDER); @@ -761,7 +682,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { formFactory.createHorizontalSeparator(parent, SWT.BORDER); - FieldObservationDetailSection fieldObservationDetailSection =formFactory.createFODetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + FieldObservationDetailSection fieldObservationDetailSection = formFactory.createFODetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); addPart(generalDetailSection); addPart(gatheringEventDetailSection); -- 2.34.1