Add hybrid section configurator flag

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java
index 06d5dd99c7eb1f81542c8e682d2ad3c384f241c3..1cd019c46070667b9eb941d8fec876602e42bc84 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java
@@ -290,7 +290,6 @@ public class NameDetailsViewComposite extends Composite {
       config.setNomenclaturalReferenceSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE));
       config.setProtologueActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE));
       config.setRankActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK));
       config.setNomenclaturalReferenceSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE));
       config.setProtologueActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE));
       config.setRankActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK));

-      config.setSimpleDetailsViewActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION));

       config.setTaxonSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON));
       config.setTypeDesignationSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION));
       config.setHybridActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID));
       config.setTaxonSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON));
       config.setTypeDesignationSectionActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION));
       config.setHybridActivated(doGetPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID));

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsConfigurator.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsConfigurator.java
index f100783019f8989d33b6ebd8761fdc09d3ef0a06..47f698129d0f63cec97eb0d42c02bfbf9352342d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsConfigurator.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsConfigurator.java
@@ -31,6 +31,7 @@ public class NameDetailsConfigurator {
     private boolean isTypeDesignationSectionActivated = true;
     private boolean isNameRelationsSectionActivated = true;
     private boolean isProtologueActivated = true;
     private boolean isTypeDesignationSectionActivated = true;
     private boolean isNameRelationsSectionActivated = true;
     private boolean isProtologueActivated = true;

+    private boolean isHybridActivated = true;

 
     public NameDetailsConfigurator(boolean isSimpleDetailsViewActivated){
         this.isSimpleDetailsViewActivated = isSimpleDetailsViewActivated;
 
     public NameDetailsConfigurator(boolean isSimpleDetailsViewActivated){
         this.isSimpleDetailsViewActivated = isSimpleDetailsViewActivated;


@@ -212,10 +213,27 @@ public class NameDetailsConfigurator {
         result.append("nameRelation");
         result.append(":");
         result.append(this.isNameRelationsSectionActivated());
         result.append("nameRelation");
         result.append(":");
         result.append(this.isNameRelationsSectionActivated());

+        result.append(";");
+        result.append("hybrid");
+        result.append(":");
+        result.append(this.isHybridActivated());

 
       return result.toString();
     }
 
 
       return result.toString();
     }
 

+    /**
+     * @return
+     */
+    public Object isHybridActivated() {
+
+        return isHybridActivated;
+    }
+
+    public void setHybridActivated(boolean isHybrid) {
+
+        this.isHybridActivated= isHybrid;
+    }
+

     /**
      * @return the isAuthorCacheActivated
      */
     /**
      * @return the isAuthorCacheActivated
      */