From: Patrick Plitzner
Date: Thu, 6 Jul 2017 13:06:08 +0000 (+0200)
Subject: Add hybrid section configurator flag
X-Git-Tag: 4.8.0^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b6ed970f27f3948965167247e44f6d2f62c2d247
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 06d5dd99c..1cd019c46 100755
--- 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.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));
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 f10078301..47f698129 100644
--- 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 isHybridActivated = true;
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(";");
+ result.append("hybrid");
+ result.append(":");
+ result.append(this.isHybridActivated());
return result.toString();
}
+ /**
+ * @return
+ */
+ public Object isHybridActivated() {
+
+ return isHybridActivated;
+ }
+
+ public void setHybridActivated(boolean isHybrid) {
+
+ this.isHybridActivated= isHybrid;
+ }
+
/**
* @return the isAuthorCacheActivated
*/