Project

General

Profile

« Previous | Next » 

Revision 12d75812

Added by Katja Luther over 5 years ago

ref #7849: remove OVERRIDE constants from IPreferenceKeys and handle it by method

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
34 34
 * @created 16.09.2008
35 35
 */
36 36
public class NomenclaturalCodePreferences extends FieldEditorPreferencePageE4 {
37

  
37
    CdmPreference pref;
38 38
	@Override
39 39
	protected void createFieldEditors() {
40 40
	    PreferencesUtil.setPreferredNomenclaturalCode(null, false);
41
	    if (PreferencesUtil.getBooleanValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
41
	    if (pref.isAllowOverride()) {
42 42
	        addField(new ComboFieldEditor(
43 43
	                PreferencesUtil.createPreferenceString(IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY),
44 44
				"Available Codes", getLabelAndValues(),
45 45
				getFieldEditorParent()));
46 46

  
47 47
            addField(new BooleanFieldEditor(
48
                    PreferencesUtil.createPreferenceString(IPreferenceKeys.OVERRIDE_NOMENCLATURAL_CODE_KEY),
48
                    PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NomenclaturalCode.getKey()),
49 49
                    "Use local nomenclatural code",
50 50
                    getFieldEditorParent()));
51 51
        } else {
......
85 85
          if (controller != null){
86 86
              IPreferenceService service = controller.getPreferenceService();
87 87
              PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode);
88
              CdmPreference pref = service.find(key);
89
              getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, pref == null? true : pref.isAllowOverride());
88
              pref = service.find(key);
89
              //getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, pref == null? true : pref.isAllowOverride());
90 90
          }
91 91

  
92
	    if (PreferencesUtil.getBooleanValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
92
	    if (pref.isAllowOverride()) {
93 93
	        setDescription("Choose which nomenclatural code you would like to use in your local application for scientific names unless otherwise specified.");
94 94
	    }else{
95 95
	        setDescription("The CDM settings don't allow to set the nomenclatural code locally. If you need to make local settings, please ask an administrator.");

Also available in: Unified diff