From: Patric Plitzner Date: Mon, 22 Jul 2013 15:09:41 +0000 (+0000) Subject: - completely removed EntityDetailType enum and all its uses X-Git-Tag: 3.6.0~967^2~4 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5b087075e5261204513020d32b6615dfbcdffdd5 - completely removed EntityDetailType enum and all its uses --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 822f70e63..e8b705e26 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -103,7 +103,6 @@ import eu.etaxonomy.taxeditor.ui.password.EditPasswordElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; import eu.etaxonomy.taxeditor.ui.section.EmptyElement; import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailElement; import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailSection; @@ -1789,185 +1788,202 @@ public class CdmFormFactory extends FormToolkit { parentElement.addElement(element); } - /** - * - * Used to define which {@link AbstractEntityCollectionSection} should be - * created in - * {@link CdmFormFactory#createEntityDetailSection(EntityDetailType, ConversationHolder, ICdmFormElement, int)} - * - * @author n.hoffmann - * @created Mar 5, 2010 - * @version 1.0 - */ - public static enum EntityDetailType { - TEAM, // never used - TEAMMEMBER, - ANNOTATION, - CREDIT, - DESCRIPTIONELEMENTSOURCE, - EXTENSION, - MARKER, - MEDIA, - DESCRIPTIONELEMENTMEDIA, - MEDIAREPRESENTATION, - MEDIAREPRESENTATIONPART, - MODIFIER, - NOMENCLATURALSTATUS, - NAME_RELATIONSHIP, - PROTOLOG, - RIGHTS, - SOURCE, - SCOPE, - DESCRIPTIONSOURCE, - TYPEDESIGNATION, - STATE_DATA, - STATISTICAL_MEASUREMENT_VALUE, - DESCRIBED_SPECIMEN, - COLLECTING_AREA, DETERMINATION_EVENT, // never used - SPECIMEN_COLLECTION, - IDENTIFIABLE_SOURCE_COLLECTION, - GEOGRAPHICAL_SCOPE, // never used - SCOPE_RESTRICTION, - MEMBER, - GRANTED_AUTHORITY, - GROUPS_BY_USER, - TAXONOMIC_SCOPE, - DETERMINATION_CURRENT, - DETERMINATION_HISTORY + + public TeamMemberSection createTeamMemberSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + TeamMemberSection section = new TeamMemberSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; } - /** - *

- * createEntityDetailSection - *

- * - * @param entityDetailType - * a - * {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType} - * object. - * @param style - * a int. - * @param conversation - * a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} - * object. - * @param parentElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @return a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} - * object. - */ - public AbstractFormSection createEntityDetailSection(EntityDetailType entityDetailType, - ConversationHolder conversation, ICdmFormElement parentElement, int style) { - AbstractFormSection section = null; - -// System.out.println("EntityDetailSection: " + entityDetailType); - switch (entityDetailType) { - case TEAM: - // TODO this is not an AbstractEntityCollectionSection - section = new TeamDetailSection(this, conversation, parentElement, null, style); - break; - case TEAMMEMBER: - section = new TeamMemberSection(this, conversation, parentElement, style); - break; - case ANNOTATION: - section = new AnnotationSection(this, conversation, parentElement, style); - break; - case CREDIT: - section = new CreditSection(this, conversation, parentElement, style); - break; - case DESCRIPTIONELEMENTSOURCE: - section = new DescriptionElementSourceSection(this, conversation, parentElement, style); - break; - case EXTENSION: - section = new ExtensionSection(this, conversation, parentElement, style); - break; - case MARKER: - section = new MarkerSection(this, conversation, parentElement, style); - break; - case MEDIA: - section = new MediaSection(this, conversation, parentElement, style); - break; - case DESCRIPTIONELEMENTMEDIA: - section = new DescriptionElementMediaSection(this, conversation, parentElement, style); - break; - case MEDIAREPRESENTATION: - section = new MediaRepresentationSection(this, conversation, parentElement, style); - break; - case MEDIAREPRESENTATIONPART: - section = new MediaRepresentationPartSection(this, conversation, parentElement, style); - break; - case MODIFIER: - section = new ModifierSection(this, conversation, parentElement, style); - break; - case NOMENCLATURALSTATUS: - section = new NomenclaturalStatusSection(this, conversation, parentElement, style); - break; - case NAME_RELATIONSHIP: - section = new NameRelationshipDetailSection(this, conversation, parentElement, style); - break; - case PROTOLOG: - section = new ProtologueSection(this, conversation, parentElement, style); - break; - case RIGHTS: - section = new RightsSection(this, conversation, parentElement, style); - break; - case SOURCE: - section = new SourceSection(this, conversation, parentElement, style); - break; - case SCOPE: - section = new ScopeSection(this, conversation, parentElement, style); - break; - case DESCRIPTIONSOURCE: - section = new DescriptionSourceSection(this, conversation, parentElement, style); - break; - case TYPEDESIGNATION: - section = new TypeDesignationSection(this, conversation, parentElement, style); - break; - case STATE_DATA: - section = new StateDataSection(this, conversation, parentElement, style); - break; - case STATISTICAL_MEASUREMENT_VALUE: - section = new StatisticalMeasurementValueSection(this, conversation, parentElement, style); - break; - case DESCRIBED_SPECIMEN: - section = new DescribedSpecimenSection(this, conversation, parentElement, style); - break; - case COLLECTING_AREA: - section = new CollectingAreasDetailSection(this, conversation, parentElement, style); - break; - case DETERMINATION_CURRENT: - section = new CurrentDeterminationDetailSection(this, conversation, parentElement, style); - break; - case DETERMINATION_HISTORY: - section = new DeterminationHistoryDetailSection(this, conversation, parentElement, style); - break; - case SPECIMEN_COLLECTION: - section = new SpecimenCollectionDetailSection(this, conversation, parentElement, style); - break; - case IDENTIFIABLE_SOURCE_COLLECTION: - section = new SourceCollectionDetailSection(this, conversation, parentElement, style); - break; - case GEOGRAPHICAL_SCOPE: - section = new GeographicalScopeDetailSection(this, conversation, parentElement, style); - break; - case SCOPE_RESTRICTION: - section = new ScopeRestrictionSection(this, conversation, parentElement, style); - break; - case MEMBER: - section = new MemberDetailSection(this, conversation, parentElement, style); - break; - case GRANTED_AUTHORITY: - section = new GrantedAuthorityDetailSection(this, conversation, parentElement, style); - break; - case GROUPS_BY_USER: - section = new GroupsByUserDetailSection(this, conversation, parentElement, style); - break; - case TAXONOMIC_SCOPE: - section = new TaxonomicScopeSection(this, conversation, parentElement, style); - break; - } - parentElement.addElement(section); - adapt(section); + public AnnotationSection createAnnotationSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + AnnotationSection section = new AnnotationSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public CreditSection createCreditSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + CreditSection section = new CreditSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public DescriptionElementSourceSection createDescriptionElementSourceSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + DescriptionElementSourceSection section = new DescriptionElementSourceSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public ExtensionSection createExtensionSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + ExtensionSection section = new ExtensionSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public MarkerSection createMarkerSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + MarkerSection section = new MarkerSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public MediaSection createMediaSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + MediaSection section = new MediaSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public DescriptionElementMediaSection createDescriptionElementMediaSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + DescriptionElementMediaSection section = new DescriptionElementMediaSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public MediaRepresentationSection createMediaRepresentationSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + MediaRepresentationSection section = new MediaRepresentationSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public MediaRepresentationPartSection createMediaRepresentationPartSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + MediaRepresentationPartSection section = new MediaRepresentationPartSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public ModifierSection createModifierSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + ModifierSection section = new ModifierSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public NomenclaturalStatusSection createNomenclaturalStatusSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + NomenclaturalStatusSection section = new NomenclaturalStatusSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public NameRelationshipDetailSection createNameRelationshipDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + NameRelationshipDetailSection section = new NameRelationshipDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public ProtologueSection createProtologueSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + ProtologueSection section = new ProtologueSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public RightsSection createRightsSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + RightsSection section = new RightsSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public SourceSection createSourceSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + SourceSection section = new SourceSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public ScopeSection createScopeSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + ScopeSection section = new ScopeSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public DescriptionSourceSection createDescriptionSourceSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + DescriptionSourceSection section = new DescriptionSourceSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public TypeDesignationSection createTypeDesignationSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + TypeDesignationSection section = new TypeDesignationSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public StateDataSection createStateDataSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + StateDataSection section = new StateDataSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public StatisticalMeasurementValueSection createStatisticalMeasurementValueSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + StatisticalMeasurementValueSection section = new StatisticalMeasurementValueSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public DescribedSpecimenSection createDescribedSpecimenSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + DescribedSpecimenSection section = new DescribedSpecimenSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public CollectingAreasDetailSection createCollectingAreasDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + CollectingAreasDetailSection section = new CollectingAreasDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public CurrentDeterminationDetailSection createCurrentDeterminationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + CurrentDeterminationDetailSection section = new CurrentDeterminationDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public DeterminationHistoryDetailSection createDeterminationHistoryDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + DeterminationHistoryDetailSection section = new DeterminationHistoryDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public SpecimenCollectionDetailSection createSpecimenCollectionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + SpecimenCollectionDetailSection section = new SpecimenCollectionDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public SourceCollectionDetailSection createSourceCollectionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + SourceCollectionDetailSection section = new SourceCollectionDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public GeographicalScopeDetailSection createGeographicalScopeDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + GeographicalScopeDetailSection section = new GeographicalScopeDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public ScopeRestrictionSection createScopeRestrictionSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + ScopeRestrictionSection section = new ScopeRestrictionSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public MemberDetailSection createMemberDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + MemberDetailSection section = new MemberDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public GrantedAuthorityDetailSection createGrantedAuthorityDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + GrantedAuthorityDetailSection section = new GrantedAuthorityDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public GroupsByUserDetailSection createGroupsByUserDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + GroupsByUserDetailSection section = new GroupsByUserDetailSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); + return section; + } + + public TaxonomicScopeSection createTaxonomicScopeSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){ + TaxonomicScopeSection section = new TaxonomicScopeSection(this, conversation, parentElement, style); + addAndAdaptSection(parentElement, section); return section; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java index 2462dd3c9..f338bc217 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.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,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.agent; import java.util.Arrays; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -20,14 +20,13 @@ import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement; /** *

* TeamDetailElement class. *

- * + * * @author n.hoffmann * @created Apr 26, 2010 * @version 1.0 @@ -42,7 +41,7 @@ public class TeamDetailElement extends AbstractIdentifiableEntityDetailElement * Constructor for TeamDetailElement. *

- * + * * @param cdmFormFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -58,23 +57,14 @@ public class TeamDetailElement extends AbstractIdentifiableEntityDetailElement { - + private TermComboElement combo_state; private ModifierSection section_modifiers; private TextWithLabelElement text_modifyingText; @@ -53,22 +52,23 @@ public class StateDataElement extends AbstractEntityCollectionElement SelectionListener removeListener, int style) { super(formFactory, section, entity, removeListener, null, style); } - + /** {@inheritDoc} */ @Override public void setEntity(StateData entity) { this.entity = entity; combo_state.setSelection(entity.getState()); section_modifiers.setEntity(entity); - if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) - text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText()); + if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) { + text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText()); + } } /** {@inheritDoc} */ @Override public void createControls(ICdmFormElement element, int style) { combo_state = formFactory.createTermComboElement(State.class, element, "State", null, style); - section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE); + section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE); section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java index bddaddeeb..ed7f08cd0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.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,7 @@ package eu.etaxonomy.taxeditor.ui.section.description; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.model.description.StatisticalMeasure; import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue; @@ -21,7 +21,6 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; /** @@ -33,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; */ public class StatisticalMeasurementValueElement extends AbstractEntityCollectionElement { - + private NumberWithLabelElement number_value; private TermComboElement combo_type; private ModifierSection section_modifiers; @@ -52,7 +51,7 @@ public class StatisticalMeasurementValueElement extends SelectionListener removeListener, int style) { super(formFactory, section, entity, removeListener, null, style); } - + /** {@inheritDoc} */ @Override public void setEntity(StatisticalMeasurementValue entity) { @@ -67,7 +66,7 @@ public class StatisticalMeasurementValueElement extends public void createControls(ICdmFormElement element, int style) { number_value = formFactory.createFloatTextWithLabelElement(element, "Value", 0, style); combo_type = formFactory.createTermComboElement(StatisticalMeasure.class, element, "Statistical Measure", null, style); - section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE); + section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE); section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java index 8a65b46b5..9f6ceb849 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java @@ -1,15 +1,14 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.description.detail; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.model.description.CategoricalData; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.CheckboxElement; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.section.description.StateDataSection; @@ -23,7 +22,7 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet private CheckboxElement checkbox_orderRelevant; private StateDataSection section_stateData; - + /** *

Constructor for CategoricalDataDetailElement.

* @@ -42,11 +41,11 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet protected void createControls(ICdmFormElement formElement, CategoricalData entity, int style) { checkbox_orderRelevant = formFactory.createCheckbox(formElement, "Order Relevant", entity.getOrderRelevant(), style); - section_stateData = (StateDataSection) formFactory.createEntityDetailSection(EntityDetailType.STATE_DATA, getConversationHolder(), formElement, Section.TWISTIE | Section.EXPANDED); + section_stateData = formFactory.createStateDataSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); section_stateData.setEntity(entity); section_stateData.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); } - + /** {@inheritDoc} */ @Override public void setEntity(CategoricalData entity) { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java index 11cbe80cf..1315a206d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java @@ -1,16 +1,15 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.description.detail; -import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.model.description.MeasurementUnit; import eu.etaxonomy.cdm.model.description.QuantitativeData; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueSection; @@ -25,7 +24,7 @@ public class QuantitativeDataDetailElement extends private TermComboElement combo_mesaurementUnit; private StatisticalMeasurementValueSection section_statisticalMeasurementValues; - + /** *

Constructor for QuantitativeDataDetailElement.

* @@ -44,11 +43,11 @@ public class QuantitativeDataDetailElement extends protected void createControls(ICdmFormElement formElement, QuantitativeData entity, int style) { combo_mesaurementUnit = formFactory.createTermComboElement(MeasurementUnit.class, formElement, "Measurement Unit", entity.getUnit(), style); - section_statisticalMeasurementValues = (StatisticalMeasurementValueSection) formFactory.createEntityDetailSection(EntityDetailType.STATISTICAL_MEASUREMENT_VALUE, getConversationHolder(), formElement, Section.TWISTIE | Section.EXPANDED); + section_statisticalMeasurementValues = formFactory.createStatisticalMeasurementValueSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); section_statisticalMeasurementValues.setEntity(entity); section_statisticalMeasurementValues.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java.lang.Object) */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaElement.java index 1d49eae84..299bd27b4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaElement.java @@ -1,5 +1,5 @@ /** - * + * */ package eu.etaxonomy.taxeditor.ui.section.media; @@ -13,7 +13,6 @@ import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; @@ -25,7 +24,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; *

* MediaElement class. *

- * + * * @author n.hoffmann * @created Nov 17, 2009 * @version 1.0 @@ -41,7 +40,7 @@ public class MediaElement extends AbstractEntityCollectionElement { *

* Constructor for MediaElement. *

- * + * * @param formElement * a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} * object. @@ -63,28 +62,19 @@ public class MediaElement extends AbstractEntityCollectionElement { /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite * #createControls(org.eclipse.swt.widgets.Composite, int) */ /** {@inheritDoc} */ - @Override - public void createControls(ICdmFormElement element, int style) { - text_title = formFactory.createLanguageStringWithLabelElement(element, - "Title", null, style); - selection_artist = formFactory - .createSelectionElement(AgentBase.class, - getConversationHolder(), element, "Artist", null, - EntitySelectionElement.ALL, style); - text_description = formFactory.createLanguageStringWithLabelElement( - element, "Description", null, 100, style); - section_mediaRepresentation = (MediaRepresentationSection) formFactory - .createEntityDetailSection( - EntityDetailType.MEDIAREPRESENTATION, - getConversationHolder(), element, style); - section_mediaRepresentation.setLayoutData(LayoutConstants - .FILL_HORIZONTALLY(2, 1)); + @Override + public void createControls(ICdmFormElement element, int style) { + text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style); + selection_artist = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), element, "Artist", null, EntitySelectionElement.ALL, style); + text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, style); + section_mediaRepresentation = formFactory.createMediaRepresentationSection(getConversationHolder(), element, style); + section_mediaRepresentation.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); } /** {@inheritDoc} */ @@ -110,7 +100,7 @@ public class MediaElement extends AbstractEntityCollectionElement { /* * (non-Javadoc) - * + * * @see * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent * (java.lang.Object) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java index 0bff02bf3..ae2bbb7ba 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.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. */ @@ -24,7 +24,6 @@ import eu.etaxonomy.cdm.model.media.MediaRepresentationPart; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement; @@ -58,7 +57,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< int style) { super(cdmFormFactory, section, element, removeListener, null, style); } - + /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.forms.section.AbstractEntityCollectionElement#createControls(eu.etaxonomy.taxeditor.forms.ICdmFormElement, int) */ @@ -67,7 +66,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< public void createControls(ICdmFormElement element, int style) { text_mimeType = formFactory.createTextWithLabelElement(element, "Mime Type", null, style); text_suffix = formFactory.createTextWithLabelElement(element, "Suffix", null, style); - section_mediaRepresentationPart = (MediaRepresentationPartSection) formFactory.createEntityDetailSection(EntityDetailType.MEDIAREPRESENTATIONPART, getConversationHolder(), element, style); + section_mediaRepresentationPart = formFactory.createMediaRepresentationPartSection(getConversationHolder(), element, style); section_mediaRepresentationPart.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); } @@ -79,7 +78,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< text_mimeType.setText(element.getMimeType()); text_suffix.setText(element.getSuffix()); } - + /* * (non-Javadoc) * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object) @@ -94,15 +93,15 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< getEntity().setSuffix(text_suffix.getText()); } // FIXME HACK automatically set the mime type to the first mediaRepresentationPart's mimetype - else if(eventSource == section_mediaRepresentationPart){ + else if(eventSource == section_mediaRepresentationPart){ firePropertyChangeEvent(this); - + Collection imageFileElements = section_mediaRepresentationPart.getCollection(section_mediaRepresentationPart.getEntity()); - + if(! imageFileElements.iterator().hasNext()){ - return; + return; } - + MediaRepresentationPart mediaRepresentationPart = imageFileElements.iterator().next(); if(mediaRepresentationPart == null || !(mediaRepresentationPart instanceof ImageFile)){ return; @@ -118,7 +117,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< String mimeType = imageInfo.getMimeType(); text_mimeType.setText(mimeType); getEntity().setMimeType(mimeType); - text_suffix.setText(imageInfo.getSuffix()); + text_suffix.setText(imageInfo.getSuffix()); getEntity().setSuffix(imageInfo.getSuffix()); } catch (IOException e) { StoreUtil.error(getClass(), e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java index 1569bc08e..2310b3d33 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java @@ -1,26 +1,25 @@ // $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.ui.forms.widgets.Section; +import org.eclipse.ui.forms.widgets.ExpandableComposite; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.occurrence.PreservationMethod; +import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement; @@ -31,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; *

* DerivedUnitBaseDetailElement class. *

- * + * * @author n.hoffmann * @created Jun 24, 2010 * @version 1.0 @@ -59,7 +58,7 @@ public class DerivedUnitBaseDetailElement extends *

* Constructor for DerivedUnitBaseDetailElement. *

- * + * * @param formFactory * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} * object. @@ -74,57 +73,39 @@ public class DerivedUnitBaseDetailElement extends /** {@inheritDoc} */ @Override - protected void createControls(ICdmFormElement formElement, - DerivedUnitFacade entity, int style) { - // Disable for now - // text_derivedUnitDefinitions = - // formFactory.createTextWithLabelElement(formElement, - // "Specimen Definition", - // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()), - // style); - text_barcode = formFactory.createTextWithLabelElement(formElement, - "Barcode", entity.getBarcode(), style); - text_catalogNumber = formFactory - .createTextWithLabelElement(formElement, "Catalog Number", - entity.getCatalogNumber(), style); - - try { - combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, - formElement, "Preservation Method", - entity.getPreservationMethod(), style); - } catch (MethodNotSupportedByDerivedUnitTypeException e) { - // we ignore this - StoreUtil.info(e.getMessage()); - } - selection_storedUnder = formFactory - .createSelectionElement(TaxonNameBase.class, - getConversationHolder(), formElement, "Stored Under", - entity.getStoredUnder(), EntitySelectionElement.ALL, - style); - - try { - text_exsicatum = formFactory.createTextWithLabelElement( - formElement, "Exsiccatum", entity.getExsiccatum(), style); - } catch (MethodNotSupportedByDerivedUnitTypeException e) { - // we ignore this - StoreUtil.info(e.getMessage()); - } - - section_duplicates = (SpecimenCollectionDetailSection) formFactory - .createEntityDetailSection( - EntityDetailType.SPECIMEN_COLLECTION, - getConversationHolder(), formElement, Section.TWISTIE); - section_duplicates - .setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - section_duplicates.setEntity(entity); - - section_source = (SourceCollectionDetailSection) formFactory - .createEntityDetailSection( - EntityDetailType.IDENTIFIABLE_SOURCE_COLLECTION, - getConversationHolder(), formElement, Section.TWISTIE); - section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - section_source.setEntity(entity); - } + protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { + // Disable for now + // text_derivedUnitDefinitions = + // formFactory.createTextWithLabelElement(formElement, + // "Specimen Definition", + // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()), + // style); + text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style); + text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style); + + try { + combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style); + } catch (MethodNotSupportedByDerivedUnitTypeException e) { + // we ignore this + AbstractUtility.info(e.getMessage()); + } + selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style); + + try { + text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style); + } catch (MethodNotSupportedByDerivedUnitTypeException e) { + // we ignore this + AbstractUtility.info(e.getMessage()); + } + + section_duplicates = formFactory.createSpecimenCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE); + section_duplicates.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + section_duplicates.setEntity(entity); + + section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE); + section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); + section_source.setEntity(entity); + } /** {@inheritDoc} */ @Override @@ -142,7 +123,7 @@ public class DerivedUnitBaseDetailElement extends getEntity().setPreservationMethod( combo_preservationMethod.getSelection()); } catch (MethodNotSupportedByDerivedUnitTypeException e) { - StoreUtil + AbstractUtility .errorDialog( "MethodNotSupportedByDerivedUnitTypeException", this, @@ -155,7 +136,7 @@ public class DerivedUnitBaseDetailElement extends try { getEntity().setExsiccatum(text_exsicatum.getText()); } catch (Exception e) { - StoreUtil.error(this.getClass(), e); + AbstractUtility.error(this.getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailElement.java index 7fdfd02f1..ea4d184a0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailElement.java @@ -1,21 +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.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.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -27,9 +26,9 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; public class DeterminationDetailElement extends AbstractCdmDetailElement { private CurrentDeterminationDetailSection section_currentDetermination; - + private DeterminationHistoryDetailSection section_determinationHistory; - + /** * @param formFactory * @param formElement @@ -45,21 +44,15 @@ public class DeterminationDetailElement extends AbstractCdmDetailElementConstructor for SupplementalDataViewer.

* @@ -89,22 +88,22 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe /** {@inheritDoc} */ @Override protected void showParts() { - - showDebug = PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.SHOW_DEBUG_INFORMATION); - + + showDebug = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_DEBUG_INFORMATION); + Object input; - + if(getInput() instanceof IElementHasDetails){ input = ((IElementHasDetails) getInput()).getData(); }else{ input = getInput(); } - + destroySections(); //1. Headline createHeadlineSection(rootElement); //2. Annotatable entitiy - if(input instanceof AnnotatableEntity){ + if(input instanceof AnnotatableEntity){ createAnnotationSections(rootElement); } //3. Identifiable entity @@ -113,17 +112,17 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe } //4. Identifiable media entity if(input instanceof IdentifiableMediaEntity){ - createIdentifiableMediaSections(rootElement); + createIdentifiableMediaSections(rootElement); } //5. Versionable if(input instanceof VersionableEntity){ createVersionSection(rootElement); - } + } //6. CdmBase if(showDebug){ createCdmBaseSection(rootElement); } - + layout(); } @@ -133,86 +132,80 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe HeadlineSection headlineSection = formFactory.createHeadlineSection(parent); addPart(headlineSection); } - - private void createAnnotationSections(RootElement parent){ - AnnotationSection annotationSection = (AnnotationSection) - formFactory.createEntityDetailSection(EntityDetailType.ANNOTATION, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - MarkerSection markerSection = (MarkerSection) - formFactory.createEntityDetailSection(EntityDetailType.MARKER, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - addPart(annotationSection); - addPart(markerSection); - } - private void createIdentifiableSections(RootElement parent){ - CreditSection creditSection = (CreditSection) - formFactory.createEntityDetailSection(EntityDetailType.CREDIT, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - ExtensionSection extensionSection = (ExtensionSection) - formFactory.createEntityDetailSection(EntityDetailType.EXTENSION, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - RightsSection rightsSection = (RightsSection) - formFactory.createEntityDetailSection(EntityDetailType.RIGHTS, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - SourceSection sourceSection = (SourceSection) - formFactory.createEntityDetailSection(EntityDetailType.SOURCE, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - addPart(creditSection); - addPart(extensionSection); - addPart(rightsSection); - addPart(sourceSection); - - } - - private void createIdentifiableMediaSections(RootElement parent){ - MediaSection mediaSection = (MediaSection) - formFactory.createEntityDetailSection(EntityDetailType.MEDIA, getConversationHolder(), parent, Section.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - addPart(mediaSection); + private void createAnnotationSections(RootElement parent) { + AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + MarkerSection markerSection = formFactory.createMarkerSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + addPart(annotationSection); + addPart(markerSection); + } + + private void createIdentifiableSections(RootElement parent) { + CreditSection creditSection = formFactory.createCreditSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + ExtensionSection extensionSection = formFactory.createExtensionSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + RightsSection rightsSection = formFactory.createRightsSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + SourceSection sourceSection = formFactory.createSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + addPart(creditSection); + addPart(extensionSection); + addPart(rightsSection); + addPart(sourceSection); + } - - private void createVersionSection(RootElement parent){ - VersionSection versionSection = formFactory.createVersionSection(parent, Section.NO_TITLE | Section.EXPANDED); + + private void createIdentifiableMediaSections(RootElement parent) { + MediaSection mediaSection = formFactory.createMediaSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + addPart(mediaSection); + } + + private void createVersionSection(RootElement parent){ + VersionSection versionSection = formFactory.createVersionSection(parent, ExpandableComposite.NO_TITLE | ExpandableComposite.EXPANDED); addPart(versionSection); } - + /** * @param rootElement */ private void createCdmBaseSection(RootElement parent) { - - CdmBaseSection cdmBaseSection = formFactory.createCdmBaseSection(parent, Section.NO_TITLE | Section.EXPANDED); + + CdmBaseSection cdmBaseSection = formFactory.createCdmBaseSection(parent, ExpandableComposite.NO_TITLE | ExpandableComposite.EXPANDED); addPart(cdmBaseSection); } - + /* * (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ /** {@inheritDoc} */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { if(event.getSource() instanceof DetailsViewer){ if(event.getSelection() == CdmFormFactory.EMPTY_SELECTION){ setInput(null); return; } - - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); setInput(selection.getFirstElement()); } }