From 7c3f94c669f75da9498a7a613cf7ddc36e904e2a Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 16 Jun 2014 08:53:12 +0000 Subject: [PATCH] - list "Specimen Details" second in DetailsView (only for campanula, fixes #4235) --- .../taxeditor/view/detail/DetailsViewer.java | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) 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 ff81684c1..fd3f54105 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 @@ -655,24 +655,47 @@ public class DetailsViewer extends AbstractCdmDataViewer { private void createDerivedUnitBaseElementSection(RootElement parent) { destroySections(); - DerivedUnitGeneralDetailSection derivedUnitGeneralDetailSection = formFactory.createDerivedUnitGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + //different order of sections (Specimen Details as second section and expanded) + if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DETERMINATION_ONLY_FOR_FIELD_UNITS)){ + DerivedUnitGeneralDetailSection derivedUnitGeneralDetailSection = formFactory.createDerivedUnitGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + addPart(derivedUnitGeneralDetailSection); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); - GatheringEventDetailSection gatheringEventDetailSection = formFactory.createGatheringEventDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + addPart(derivedUnitBaseDetailSection); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); - FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + GatheringEventDetailSection gatheringEventDetailSection = formFactory.createGatheringEventDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(gatheringEventDetailSection); - formFactory.createHorizontalSeparator(parent, SWT.BORDER); + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(fieldUnitDetailSection); + } + else{ + DerivedUnitGeneralDetailSection derivedUnitGeneralDetailSection = formFactory.createDerivedUnitGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); + addPart(derivedUnitGeneralDetailSection); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + GatheringEventDetailSection gatheringEventDetailSection = formFactory.createGatheringEventDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(gatheringEventDetailSection); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(fieldUnitDetailSection); + + formFactory.createHorizontalSeparator(parent, SWT.BORDER); + + DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); + addPart(derivedUnitBaseDetailSection); + } - DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); - addPart(derivedUnitGeneralDetailSection); - addPart(gatheringEventDetailSection); - addPart(fieldUnitDetailSection); - addPart(derivedUnitBaseDetailSection); if(!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DETERMINATION_ONLY_FOR_FIELD_UNITS)){ formFactory.createHorizontalSeparator(parent, SWT.BORDER); -- 2.34.1