Project

General

Profile

« Previous | Next » 

Revision 5e3a2c94

Added by Patrick Plitzner over 5 years ago

ref #7849 Set override flag to true if no pref was found

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
44 44
    private Combo nomenclaturalCodeSelectionCombo;
45 45

  
46 46
    private boolean allowOverride = true;
47
    CdmPreference preference = null;
47
    private CdmPreference preference = null;
48 48

  
49
    /**
50
     * {@inheritDoc}
51
     */
52 49
    @Override
53 50
    protected Control createContents(Composite parent) {
54 51
        final Composite composite = new Composite(parent, SWT.NULL);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportProvider.java
29 29
 */
30 30
public class AbcdImportProvider extends CdmPreferencePage implements IE4AdminPreferencePage{
31 31

  
32
    ListComponent biocaseProviderList;
32
    private ListComponent biocaseProviderList;
33 33

  
34
    /**
35
     * {@inheritDoc}
36
     */
37 34
    @Override
38 35
    protected Control createContents(Composite parent) {
39 36
        final Composite composite = new Composite(parent, SWT.NULL);
......
46 43
        gridLayout.horizontalSpacing= 10;
47 44
        gridLayout.makeColumnsEqualWidth = true;
48 45

  
49

  
50 46
        composite.setLayout(gridLayout);
51 47
        biocaseProviderList = new ListComponent(composite, SWT.SCROLL_LINE);
52 48

  
53 49
        return composite;
54 50
    }
55 51

  
56
    public ListComponent getBiocaseProviderList() {
57
        return biocaseProviderList;
58
    }
59

  
60

  
61 52
    @Override
62 53
    public boolean performOk() {
63 54
        String providerList = null;
......
73 64
            }
74 65
            IPreferenceService service = controller.getPreferenceService();
75 66
            service.set(pref);
76

  
77 67
        }
78 68

  
79 69
        return true;
80 70
    }
81 71

  
82

  
83

  
84

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

  
38
    boolean isEditorActivated;
39
    boolean allowOverride;
40
    boolean isShowRank;
41
    boolean isSortByVocabularyOrder;
42
    boolean isShowSymbol;
43
    boolean isShowIdInVocabulary;
44
    boolean isShowSymbol1;
45
    boolean isShowSymbol2;
46
    boolean isShowTitle;
47
    String displayString;
48
    Composite child ;
49
    CdmPreference distributionPref = null;
38
    private boolean isEditorActivated;
39
    private boolean allowOverride;
40
    private boolean isShowRank;
41
    private boolean isSortByVocabularyOrder;
42
    private boolean isShowSymbol;
43
    private boolean isShowIdInVocabulary;
44
    private boolean isShowSymbol1;
45
    private boolean isShowSymbol2;
46
    private boolean isShowTitle;
47
    private String displayString;
48
    private Composite child ;
49
    private CdmPreference distributionPref = null;
50 50

  
51 51
    @Override
52 52
    protected Control createContents(Composite parent) {
......
60 60
        }else{
61 61
            distributionPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, "false");
62 62
            isEditorActivated = false;
63
            allowOverride = true;
63 64
        }
64 65

  
65 66
        final Button activateCheckButton = new Button(composite, SWT.CHECK);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java
31 31
 */
32 32
public class DistributionAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
33 33

  
34
    boolean allowOverride;
35
    CdmPreference pref = null;
34
    private boolean allowOverrideAreas;
35
    private boolean allowOverrideStatus;
36
    private CdmPreference prefAreas = null;
37
    private CdmPreference prefStatus = null;
36 38

  
37 39
    @Override
38 40
    protected Control createContents(Composite parent) {
......
40 42
        composite.setLayout(new GridLayout());
41 43

  
42 44

  
43
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
44
        if (pref != null){
45
            allowOverride = pref.isAllowOverride();
46
        }
45
        prefAreas = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
46
        allowOverrideAreas = prefAreas != null?prefAreas.isAllowOverride():true;
47 47

  
48 48

  
49 49

  
......
54 54
                "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardAdminHandler");
55 55

  
56 56
        button_openWizard.setText(Messages.ChecklistEditorGeneralPreference_open_distribution_selection);
57
        final Button allowOverrideCheckButton = new Button(composite, SWT.CHECK);
58
        allowOverrideCheckButton.setText(Messages.ChecklistEditorGeneralPreference_allowOverride);
59
        allowOverrideCheckButton.setSelection(allowOverride);
60
        allowOverrideCheckButton.addSelectionListener(new SelectionAdapter(){
57
        final Button allowOverrideAreasCheckButton = new Button(composite, SWT.CHECK);
58
        allowOverrideAreasCheckButton.setText(Messages.ChecklistEditorGeneralPreference_allowOverride);
59
        allowOverrideAreasCheckButton.setSelection(allowOverrideAreas);
60
        allowOverrideAreasCheckButton.addSelectionListener(new SelectionAdapter(){
61 61
            @Override
62 62
            public void widgetSelected(SelectionEvent e) {
63
                allowOverride = allowOverrideCheckButton.getSelection();
63
                allowOverrideAreas = allowOverrideAreasCheckButton.getSelection();
64 64

  
65 65
            }
66 66
        });
67 67

  
68 68

  
69
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionStatus);
69
        prefStatus = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionStatus);
70 70

  
71
        if (pref != null){
72
            allowOverride = pref.isAllowOverride();
73
        }
71
        allowOverrideStatus = prefStatus != null?prefStatus.isAllowOverride():true;
74 72

  
75 73
        final CLabel labelStatus = new CLabel(composite, SWT.NULL);
76 74
        labelStatus.setText("Select the status which should be available for distribution data.");
......
81 79
        button_openStatusWizard.setText(Messages.Distribution_status_selection);
82 80
        final Button allowOverrideStatusCheckButton = new Button(composite, SWT.CHECK);
83 81
        allowOverrideStatusCheckButton.setText(Messages.ChecklistEditorGeneralPreference_allowOverride);
84
        allowOverrideStatusCheckButton.setSelection(allowOverride);
82
        allowOverrideStatusCheckButton.setSelection(allowOverrideStatus);
85 83
        allowOverrideStatusCheckButton.addSelectionListener(new SelectionAdapter(){
86 84
            @Override
87 85
            public void widgetSelected(SelectionEvent e) {
88
                allowOverride = allowOverrideStatusCheckButton.getSelection();
86
                allowOverrideStatus = allowOverrideStatusCheckButton.getSelection();
89 87

  
90 88
            }
91 89
        });
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
46 46
    boolean isShowLifeForm;
47 47
    boolean isUseLocalPreference;
48 48
    Composite composite;
49
    CdmPreference isShowSpecimenPref = null;
49
    CdmPreference showSpecimenPref = null;
50 50

  
51 51
    @Override
52 52
    protected Control createContents(Composite parent) {
......
161 161
        if (controller != null){
162 162
            IPreferenceService service = controller.getPreferenceService();
163 163
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen);
164
            isShowSpecimenPref = service.find(key);
165
            if (isShowSpecimenPref != null){
166
                this.isShowSpecimenRelatedIssues = Boolean.valueOf(isShowSpecimenPref.getValue());
164
            showSpecimenPref = service.find(key);
165
            if (showSpecimenPref != null){
166
                this.isShowSpecimenRelatedIssues = Boolean.valueOf(showSpecimenPref.getValue());
167
                this.isUseLocalPreference = showSpecimenPref.isAllowOverride();
167 168
            }else{
168
                isShowSpecimenPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(true));
169
                showSpecimenPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(true));
169 170
                this.isShowSpecimenRelatedIssues = true;
171
                this.isUseLocalPreference = true;
170 172
            }
171 173

  
172 174
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);
......
197 199

  
198 200
    @Override
199 201
     public boolean performOk() {
200
        if (isShowSpecimenPref == null){
202
        if (showSpecimenPref == null){
201 203
            return true;
202 204
        }
203 205
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
45 45

  
46 46
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
47 47

  
48
        if (pref != null){
49
            allowOverride = pref.isAllowOverride();
50
        }
51 48

  
52 49
        final CLabel commonNameAreaLabel = new CLabel(composite, SWT.NULL);
53 50
        commonNameAreaLabel.setText(Messages.VokabularyAdminPreferences_SELECT_VOCABULARY_TEXT);
......
58 55
        button_opencommonNameAreaWizard.setText(Messages.GeneralPreference_open_common_name_area_selection);
59 56
        final Button allowOverrideCommonNameAreaCheckButton = new Button(composite, SWT.CHECK);
60 57
        allowOverrideCommonNameAreaCheckButton.setText(Messages.ChecklistEditorGeneralPreference_allowOverride);
61
        allowOverrideCommonNameAreaCheckButton.setSelection(allowOverride);
58

  
59
        if (pref != null){
60
            allowOverride = pref.isAllowOverride();
61
            allowOverrideCommonNameAreaCheckButton.setSelection(allowOverride);
62
        }
63
        else{
64
            allowOverrideCommonNameAreaCheckButton.setSelection(true);
65
        }
66

  
62 67
        allowOverrideCommonNameAreaCheckButton.addSelectionListener(new SelectionAdapter(){
63 68
            @Override
64 69
            public void widgetSelected(SelectionEvent e) {
......
82 87

  
83 88
            CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
84 89
            if(pref==null){
85
                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, ""); //$NON-NLS-1$
90
                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, "");
86 91
            }
87 92
            pref.setAllowOverride(allowOverride);
88 93
            service.set(pref);

Also available in: Unified diff