working on #2376
authorn.hoffmann <n.hoffmann@localhost>
Thu, 12 May 2011 10:09:46 +0000 (10:09 +0000)
committern.hoffmann <n.hoffmann@localhost>
Thu, 12 May 2011 10:09:46 +0000 (10:09 +0000)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java

index 28fa0bb8ddca42f91bb012c1d9b6d161c7e105ec..4324ca89176e84e1e3d232b3f36e4785d4b0de36 100644 (file)
@@ -94,7 +94,7 @@ public class DeterminationEventDetailElement extends
                                .createTermComboElement(TermComboType.DETERMINATION_MODIFIER,
                                                element, "Determination Modifier", null, style);
 //             checkbox_preferredFlag = formFactory.createCheckbox(element,
                                .createTermComboElement(TermComboType.DETERMINATION_MODIFIER,
                                                element, "Determination Modifier", null, style);
 //             checkbox_preferredFlag = formFactory.createCheckbox(element,
-//                             "Current", false, style);
+//                                     "Current", false, style);
                selection_taxon = (TaxonSelectionElement) formFactory
                                .createSelectionElement(SelectionType.TAXON,
                                                getConversationHolder(), element, "Taxon", null,
                selection_taxon = (TaxonSelectionElement) formFactory
                                .createSelectionElement(SelectionType.TAXON,
                                                getConversationHolder(), element, "Taxon", null,
index 5e1dec347c1685e45755000eceb537f5a01204b8..48ad93b9e3e633dee34c6bf0ed1e2dfcb5fc17f7 100644 (file)
@@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
+import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
@@ -67,6 +68,7 @@ import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.name.ProtologueSection;
 import eu.etaxonomy.taxeditor.ui.section.name.TypeDesignationSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.name.ProtologueSection;
 import eu.etaxonomy.taxeditor.ui.section.name.TypeDesignationSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DeterminationDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailSection;
@@ -596,11 +598,26 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = (DerivedUnitBaseDetailSection) formFactory
                                .createCdmDetailSection(DetailType.DERIVED_UNIT,
                                                getConversationHolder(), parent, this, Section.TWISTIE);
                DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = (DerivedUnitBaseDetailSection) formFactory
                                .createCdmDetailSection(DetailType.DERIVED_UNIT,
                                                getConversationHolder(), parent, this, Section.TWISTIE);
+               
+               boolean showExperimentalFeatures = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES);
+               
+               // TODO remove experimental check once this is fully implemented. see #2376
+               DeterminationDetailSection determinationDetailSection = null;
+               if(showExperimentalFeatures){
+                       formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+                       
+                       determinationDetailSection = (DeterminationDetailSection) formFactory
+                                       .createCdmDetailSection(DetailType.DETERMINATION, 
+                                                       getConversationHolder(), parent, this, Section.TWISTIE);
+               }
 
                addPart(generalDetailSection);
                addPart(gatheringEventDetailSection);
                addPart(fieldObservationDetailSection);
                addPart(derivedUnitBaseDetailSection);
 
                addPart(generalDetailSection);
                addPart(gatheringEventDetailSection);
                addPart(fieldObservationDetailSection);
                addPart(derivedUnitBaseDetailSection);
+               if(showExperimentalFeatures){
+                       addPart(determinationDetailSection);
+               }
        }
 
        /**
        }
 
        /**