From 9d8df0cfdba64469012377d83bdb36fc99496a45 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 1 Nov 2016 13:03:05 +0100 Subject: [PATCH] ref #5971: don't allow to edit local nomenclatural code if allowOverride is false --- .../preference/AdminNomenclaturalCode.java | 2 +- .../preference/NomenclaturalCodePreferences.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 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 4c8b0d1f2..40ec6fbfa 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 @@ -86,7 +86,7 @@ public class AdminNomenclaturalCode extends FieldEditorPreferencePage implements 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)); + pref.setAllowOverride(Boolean.parseBoolean(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 657a40dc4..521a6a304 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,7 +41,7 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage */ @Override protected void createFieldEditors() { - if (getPreferenceStore().getBoolean(IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY)) { + if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) { addField(new ComboFieldEditor( IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY, "Available Codes", getLabelAndValues(), @@ -80,10 +80,17 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage */ @Override public void init(IWorkbench workbench) { - setPreferenceStore(TaxeditorStorePlugin.getDefault() + + setPreferenceStore(TaxeditorStorePlugin.getDefault() .getPreferenceStore()); - setDescription("Choose which nomenclatural code you would like to use in your local application for scientific names unless otherwise specified."); - //PreferencesUtil.setPreferredNomenclaturalCode(null, true); + + if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) { + setDescription("Choose which nomenclatural code you would like to use in your local application for scientific names unless otherwise specified."); + }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."); + + //PreferencesUtil.setPreferredNomenclaturalCode(null, true); + } } @Override -- 2.34.1