Project

General

Profile

« Previous | Next » 

Revision 1d76231c

Added by Katja Luther over 5 years ago

ref #7063: better handling of preferences for distribution editor and other places

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
36 36
public class ChecklistEditorGeneralPreference extends CdmPreferencePage implements IE4AdminPreferencePage {
37 37

  
38 38
    boolean isEditorActivated;
39
    boolean allowOverride;
39 40
    boolean isShowRank;
40 41
    boolean isSortByVocabularyOrder;
41 42
    boolean isShowSymbol;
......
50 51
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
51 52
        if (pref != null){
52 53
            isEditorActivated = Boolean.valueOf(pref.getValue());
54
            allowOverride = pref.isAllowOverride();
53 55
        }else{
54 56
            isEditorActivated = false;
55 57
        }
58

  
56 59
        final Button activateCheckButton = new Button(composite, SWT.CHECK);
57 60
        activateCheckButton.setText(Messages.ChecklistEditorGeneralPreference_enable);
58 61
        activateCheckButton.setSelection(isEditorActivated);
......
71 74

  
72 75
            }
73 76
        });
77
        final Button allowOverrideCheckButton = new Button(composite, SWT.CHECK);
78
        allowOverrideCheckButton.setText(Messages.ChecklistEditorGeneralPreference_allowOverride);
79
        allowOverrideCheckButton.setSelection(allowOverride);
80
        allowOverrideCheckButton.addSelectionListener(new SelectionAdapter(){
81
            @Override
82
            public void widgetSelected(SelectionEvent e) {
83
                allowOverride = allowOverrideCheckButton.getSelection();
84

  
85
            }
86
        });
74 87

  
75 88
        child  = new Composite(composite, SWT.NULL);
76 89
        child.setLayout(new GridLayout());
......
84 97

  
85 98

  
86 99
        final CommandHandlerButton button_openWizard = new CommandHandlerButton(child, SWT.PUSH,
87
                Messages.ChecklistEditorGeneralPreference_3);
100
                "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardAdminHandler");
88 101

  
89 102
        button_openWizard.setText(Messages.ChecklistEditorGeneralPreference_open_distribution_selection);
90 103

  
......
177 190

  
178 191
        CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
179 192
        //ToDo
180
        pref.setAllowOverride(false);
193
        pref.setAllowOverride(allowOverride);
181 194
        service.set(pref);
182 195

  
183 196
        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowIdInVocabulary, Boolean.toString(isShowIdInVocabulary));
184 197
        //ToDo
185
        pref.setAllowOverride(false);
198
        pref.setAllowOverride(true);
186 199
        service.set(pref);
187 200

  
188 201
        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowSymbol, Boolean.toString(isShowSymbol));
189 202
        //ToDo
190
        pref.setAllowOverride(false);
203
        pref.setAllowOverride(true);
191 204
        service.set(pref);
192 205

  
193 206
        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
194 207
        //ToDo
195
        pref.setAllowOverride(false);
208
        pref.setAllowOverride(true);
196 209
        service.set(pref);
197 210
        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.AreasSortedByIdInVocabulary, Boolean.toString(isSortByVocabularyOrder));
198 211
        //ToDo
199
        pref.setAllowOverride(false);
212
        pref.setAllowOverride(true);
200 213
        service.set(pref);
201 214

  
202 215
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, isEditorActivated);

Also available in: Unified diff