From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 2 Nov 2015 11:50:52 +0000 (+0100)
Subject: Merge branch 'develop' into unify_derivative_views
X-Git-Tag: 3.12.0^2~62^2~7^2~16
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b99ebb39bf728e9c6803fc8844d194dc5a677af8

Merge branch 'develop' into unify_derivative_views

Conflicts:
	eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
---

b99ebb39bf728e9c6803fc8844d194dc5a677af8
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 5908ab91e,6a0dab25f..8618277b4
--- 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
@@@ -584,20 -593,7 +594,11 @@@ public class DetailsViewer extends Abst
              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);
 +        DerivedUnitTypeDesignationSection derivedUnitTypeDesignationSection = formFactory.createDerivedUnitTypeDesignationSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 +        addPart(derivedUnitTypeDesignationSection);
 +
-         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-         IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
-         addPart(identifierDetailSection);
- 
      }
  
      private void createFieldUnitSection(RootElement parent) {