Project

General

Profile

« Previous | Next » 

Revision 63732a7c

Added by Katja Luther almost 5 years ago

ref #8045: further implementation for default/explicit value selection preference pages

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
15 15
import eu.etaxonomy.cdm.api.service.IPreferenceService;
16 16
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
17 17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
18
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
19
import eu.etaxonomy.cdm.model.metadata.TermOrder;
18
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
19
import eu.etaxonomy.taxeditor.l10n.Messages;
20 20
import eu.etaxonomy.taxeditor.preference.ChecklistEditorGeneralPreference;
21 21
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
22 22
import eu.etaxonomy.taxeditor.store.CdmStore;
......
40 40

  
41 41
    @Override
42 42
    public boolean performOk() {
43
        if (distributionEditorPref == null){
43
        if (!isApply()){
44 44
            return true;
45 45
        }
46 46
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
......
48 48
            return false;
49 49
        }
50 50
        IPreferenceService service = controller.getPreferenceService();
51
        CdmPreference pref;
52
        if (isEditorActivated == null){
53
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DistributionEditorActivated));
54
        }else{
55
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
56
            pref.setAllowOverride(allowOverrideActivatedButton.getSelection());
57
            service.set(pref);
58
        }
59
        if(displayArea.equals(Messages.Preference_Use_Default)){
60
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfAreasInDistributionEditor));
61
        }else{
62
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea);
63
            pref.setAllowOverride(allowOverrideAreaDisplayButton.getSelection());
64
            service.set(pref);
65
        }
51 66

  
52
        CdmPreference pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
53
        pref.setAllowOverride(this.distributionEditorPref.isAllowOverride());
54
        service.set(pref);
55

  
56
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea);
57
        pref.setAllowOverride(prefAreaDisplay.isAllowOverride());
58
        service.set(pref);
59

  
60
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, this.displayStatus);
61
        pref.setAllowOverride(prefStatusDisplay.isAllowOverride());
62
        service.set(pref);
63

  
64
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
65
        pref.setAllowOverride(prefRank.isAllowOverride());
66
        service.set(pref);
67

  
68
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
69
        pref.setAllowOverride(prefAreaSort.isAllowOverride());
70
        service.set(pref);
67
        if (displayStatus.equals(Messages.Preference_Use_Default)){
68
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatus));
69
        }else{
70
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, this.displayStatus);
71
            pref.setAllowOverride(allowOverrideStatusDisplayButton.getSelection());
72
            service.set(pref);
73
        }
71 74

  
72
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
73
        pref.setAllowOverride(prefOwnDescription.isAllowOverride());
74
        service.set(pref);
75
        if (isShowRank == null){
76
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowRankInDistributionEditor));
77
        }else{
78
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
79
            pref.setAllowOverride(allowOverrideRankButton.getSelection());
80
            service.set(pref);
81
        }
82
        if (orderAreas.equals(Messages.Preference_Use_Default)){
83
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AreasSortedInDistributionEditor));
84
        }else{
85
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
86
            pref.setAllowOverride(allowOverrideOrderAreasButton.getSelection());
87
            service.set(pref);
88
        }
75 89

  
90
        if (ownDescriptionForDistributionEditor == null){
91
            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.OwnDescriptionForDistributionEditor));
92
        }else{
93
            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
94
            pref.setAllowOverride(prefOwnDescription.isAllowOverride());
95
            service.set(pref);
96
        }
76 97
//        if (statusPref != null){
77 98
//            service.set(statusPref);
78 99
//        }
......
87 108
    @Override
88 109
    public void getValues() {
89 110
        super.getValues();
90
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
91
        if (distributionEditorPref == null){
92
            distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString());
111
        //distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
112
        if (distributionEditorPref != null){
113
            isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
93 114
        }
94
        isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
95
//        allowOverrideActivated = distributionEditorPref.isAllowOverride();
115

  
116

  
96 117
        isAdminPreference = true;
97 118

  
98 119
        if (prefAreaDisplay != null){
99 120
            this.displayArea = prefAreaDisplay.getValue();
100 121
        }else{
101
            this.displayArea = ((TermDisplayEnum)PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue()).getKey();
122
            this.displayArea = Messages.Preference_Use_Default;
102 123
        }
103 124

  
104 125

  
105 126
        if (prefStatusDisplay != null){
106 127
            this.displayStatus = prefStatusDisplay.getValue();
107 128
        }else{
108
            this.displayStatus = ((TermDisplayEnum)PreferencePredicate.DisplayOfStatus.getDefaultValue()).getKey();
129
            this.displayStatus = Messages.Preference_Use_Default;
109 130
        }
110 131

  
111 132
        if (prefAreaSort != null){
112 133
            if (prefAreaSort.getValue() != null){
113 134
                this.orderAreas = prefAreaSort.getValue().toString();
114 135
            }else{
115
                this.orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();
136
                this.orderAreas = Messages.Preference_Use_Default;
116 137
            }
117 138

  
118 139
        }else{
119
            this.orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();
140
            this.orderAreas = Messages.Preference_Use_Default;
120 141

  
121 142
        }
122 143

  
......
125 146
            this.isShowRank = Boolean.valueOf(prefRank.getValue().toString());
126 147

  
127 148
        }else{
128
            this.isShowRank = Boolean.valueOf(PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());
149
            this.isShowRank = null;
129 150
        }
130 151

  
131 152

  

Also available in: Unified diff