From b7bfcde74b204668fbe1c7e9f527460d488a7c87 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 1 Nov 2016 12:41:18 +0100 Subject: [PATCH] ref #5971: minor --- .../preference/AdminNomenclaturalCode.java | 2 ++ .../preference/NomenclaturalCodePreferences.java | 16 ++++++++++------ .../taxeditor/preference/PreferencesUtil.java | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java index d87a9d84b..4c8b0d1f2 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AdminNomenclaturalCode.java @@ -84,7 +84,9 @@ public class AdminNomenclaturalCode extends FieldEditorPreferencePage implements boolean result = super.performOk(); if (result){ String value = getPreferenceStore().getString(IPreferenceKeys.CDM_NOMENCLATURAL_CODE_KEY); + String allowOverride = getPreferenceStore().getString(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY); CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.NomenclaturalCode, value); + pref.setAllowOverride(Boolean.getBoolean(allowOverride)); ICdmApplicationConfiguration controller = CdmStore.getCurrentApplicationConfiguration(); if (controller == null){ return false; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java index 126909a5b..657a40dc4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java @@ -41,15 +41,19 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage */ @Override protected void createFieldEditors() { - - addField(new ComboFieldEditor( + if (getPreferenceStore().getBoolean(IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY)) { + addField(new ComboFieldEditor( IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY, "Available Codes", getLabelAndValues(), getFieldEditorParent())); - addField(new BooleanFieldEditor( - IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY, - "Use local nomenclatural code", - getFieldEditorParent())); + + addField(new BooleanFieldEditor( + IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY, + "Use local nomenclatural code", + getFieldEditorParent())); + } else { + setDescription("The CDM settings don't allow to set the nomenclatural code locally. If you need to make local settings, please ask an administrator."); + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java index f4f32c9b2..44662fe16 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java @@ -175,6 +175,7 @@ public class PreferencesUtil implements IPreferenceKeys { if(pref == null){ preferredCode = getPreferenceStore().getString( PREFERRED_NOMENCLATURAL_CODE_KEY); + }else{ preferredCode = pref.getValue(); } -- 2.34.1