Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 2 Nov 2015 11:50:52 +0000 (12:50 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 2 Nov 2015 13:11:21 +0000 (14:11 +0100)
Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java

1  2 
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java

index faa81f5be68f328953feac82d3f435ce82b5b3bc,51af3ddba7437d16e0fb8b2c22044c82ecc4d48a..ec73e3044249d9213fe8f10bcbe8411632524d53
@@@ -127,6 -127,8 +127,8 @@@ public interface IPreferenceKeys 
  
        public static final String SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS = "eu.etaxonomy.taxeditor.navigation.search.openResultInSeparateWindows";
  
+       public static final String DISABLE_SERVICES_API_TIMESTAMP_CHECK = "eu.etaxonomy.taxeditor.cdmlib.remoting.disableServicesApiTimestampCheck";
        public static final String ADD_TYPES_TO_ALL_NAMES = "eu.etaxonomy.taxeditor.store.addTypeToAllNames";
  
      public static final String DETERMINATION_ONLY_FOR_FIELD_UNITS = "eu.etaxonomy.taxeditor.specimen.determinationOnlyOnFieldUnitLevel";
  
      public static final String SHOW_ADVANCED_MEDIA_SECTION = "eu.etaxonomy.taxeditor.media.showAdvancedMedia";
  
 -    public static final String ALWAYS_OPEN_SPECIMEN_IN_EDITOR = "eu.etaxonomy.taxeditor.specimen.alwaysOpenSpecimenInEditor";
 -
      public static final String PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR = "eu.etaxonomy.taxeditor.specimen.promptForOpenSpecimenInEditor";
  
      // TODO RL
index 5908ab91e92db921f6b6fcf5991d089c43ae1182,6a0dab25f8ac9b57a3da8a371495f890d70fed8a..8618277b452902f3adb4b24a438903e79817a655
@@@ -90,7 -90,6 +90,7 @@@ import eu.etaxonomy.taxeditor.ui.sectio
  import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitGeneralDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
 +import eu.etaxonomy.taxeditor.ui.section.occurrence.association.DerivedUnitTypeDesignationSection;
  import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaQualityDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSampleGeneralDetailSection;
@@@ -578,26 -577,23 +578,27 @@@ public class DetailsViewer extends Abst
              FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
              addPart(fieldUnitDetailSection);
          }
+         else{
  
+             if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS)){
+                 formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+                 TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+                 addPart(taxonAssociationDetailSection);
+             }
+             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+             IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
+             addPart(identifierDetailSection);
+         }
          if(!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DETERMINATION_ONLY_FOR_FIELD_UNITS)){
              formFactory.createHorizontalSeparator(parent, SWT.BORDER);
              DeterminationDetailSection determinationDetailSection = formFactory.createDeterminationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
              addPart(determinationDetailSection);
          }
-         if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS)){
-             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-             TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-             addPart(taxonAssociationDetailSection);
-         }
  
-         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-         IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
-         addPart(identifierDetailSection);
 +        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 +        DerivedUnitTypeDesignationSection derivedUnitTypeDesignationSection = formFactory.createDerivedUnitTypeDesignationSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 +        addPart(derivedUnitTypeDesignationSection);
 +
      }
  
      private void createFieldUnitSection(RootElement parent) {