Project

General

Profile

« Previous | Next » 

Revision 85bd68d3

Added by Katja Luther about 5 years ago

ref #7849: add correct handling for restoreDefaults in DB preference pages

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
362 362

  
363 363
    }
364 364

  
365
    @Override
366
    protected void performDefaults() {
367
        configurator = Abcd206ImportConfigurator.NewInstance(null,null);
368
        preference = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configurator.toString());
369
        preference.setAllowOverride(true);
370
        super.performDefaults();
371
    }
372

  
365 373
//    private void createAbcdImportConfig() {
366 374
//        this.configurator.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS));
367 375
//        this.configurator.setAddMediaAsMediaSpecimen(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN));
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
28 28
 */
29 29
public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGeneralPreference implements IE4AdminPreferencePage {
30 30

  
31
    Composite parent;
32
    CdmPreference areaVocPref = null;
33
    CdmPreference statusPref = null;
31 34

  
32 35
    @Override
33 36
    protected Control createContents(Composite parent) {
37
        this.parent = parent;
34 38
        return super.createContents(parent);
35 39

  
36 40
    }
......
70 74
        pref.setAllowOverride(this.allowOverrideOwnDescriptionForDistributionEditor);
71 75
        service.set(pref);
72 76

  
77
        if (statusPref != null){
78
            service.set(statusPref);
79
        }
80
        if (areaVocPref != null){
81
            service.set(areaVocPref);
82
        }
73 83
        PreferencesUtil.updateDBPreferences();
74 84

  
75 85
        return true;
......
141 151
        setValid(false);
142 152
    }
143 153

  
154
    @Override
155
    protected void performDefaults() {
156
        isEditorActivated = (Boolean)PreferencePredicate.DistributionEditorActivated.getDefaultValue();
157
        activateCheckButton.setSelection(isEditorActivated);
158

  
159
        displayArea = ((TermDisplayEnum)PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue()).getKey();
160
        TermDisplayEnum areaDisplay;
161
        try{
162
            if (displayArea != null){
163
                areaDisplay  = TermDisplayEnum.byKey(displayArea);
164
            }else{
165
                areaDisplay = TermDisplayEnum.Title;
166
            }
167
        }catch(IllegalArgumentException e){
168
            areaDisplay = TermDisplayEnum.Title;
169
        }
170
        int index = 0;
171
        for (String itemLabel : areaDisplaySelectionCombo.getItems()){
172
            if (itemLabel.equalsIgnoreCase(areaDisplay.getLabel())){
173
                areaDisplaySelectionCombo.select(index);
174
                break;
175
            }
176
            index++;
177
        }
178

  
179
        displayStatus = ((TermDisplayEnum)PreferencePredicate.DisplayOfStatus.getDefaultValue()).getKey();
180
        TermDisplayEnum statusDisplay;
181
        try{
182
            if (displayStatus != null){
183
                statusDisplay  = TermDisplayEnum.byKey(displayStatus);
184
            }else{
185
                statusDisplay = TermDisplayEnum.Title;
186
            }
187
        }catch(IllegalArgumentException e){
188
            statusDisplay = TermDisplayEnum.Title;
189
        }
190
        index = 0;
191
        for (String itemLabel : statusDisplaySelectionCombo.getItems()){
192
            if (itemLabel.equalsIgnoreCase(statusDisplay.getLabel())){
193
                statusDisplaySelectionCombo.select(index);
194
                break;
195
            }
196
            index++;
197
        }
198

  
199

  
200

  
201
        orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();
202
        index = 0;
203
        if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null){
204
            TermOrder areaOrder;
205
            try{
206
                if (orderAreas != null){
207
                    areaOrder  = TermOrder.valueOf(orderAreas);
208
                }else{
209
                    areaOrder = TermOrder.IdInVoc;
210
                }
211
            }catch(IllegalArgumentException e){
212
                areaOrder = TermOrder.IdInVoc;
213
            }
214
            for (String itemLabel : areaOrderSelectionCombo.getItems()){
215
                if (itemLabel.equalsIgnoreCase(areaOrder.getLabel())){
216
                    areaOrderSelectionCombo.select(index);
217
                    break;
218
                }
219
                index++;
220
            }
221
        }
222

  
223

  
224
        isShowRank = Boolean.valueOf(PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());
225
        activateRankButton.setSelection(isShowRank);
226

  
227
        ownDescriptionForDistributionEditor = Boolean.valueOf(PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString());
228

  
229
        allowOverrideActivated = true;
230
        allowOverrideActivatedButton.setSelection(allowOverrideActivated);
231
        allowOverrideAreaDisplay = true;
232
        allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
233
        allowOverrideStatusDisplay = true;
234
        allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
235
        allowOverrideOrderAreas = true;
236
        allowOverrideOrderAreasButton.setSelection(allowOverrideOrderAreas);
237
        allowOverrideRank = true;
238
        allowOverrideRankButton.setSelection(allowOverrideRank);
239
        allowOverrideOwnDescriptionForDistributionEditor = true;
240
        createContents(parent);
241

  
242
        this.statusPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, null);
243
        this.areaVocPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
244
        super.performDefaults();
245
    }
246

  
144 247
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
107 107

  
108 108
    }
109 109

  
110
    @Override
111
    protected void performDefaults() {
112
        isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
113
        showIOMenuButton.setSelection(isShowIOMenu);
114
        isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
115
        showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
116
        isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
117
        showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
118
        isAllowOverrideShowIOMenu = true;
119
        allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
120
        isAllowOverrideShowCheckListPerspective = true;
121
        allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
122
        isAllowOverrideShowTaxonNodeWizard = true;
123
        allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
124
        super.performDefaults();
125
    }
126

  
110 127
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
90 90

  
91 91
    }
92 92

  
93
    @Override
94
    protected void performDefaults() {
95
        nameDetailsConfig = new NameDetailsConfigurator(false);
96
        isShowAppendedPhrase = nameDetailsConfig.isAppendedPhraseActivated();
97
        isShowEpithets = nameDetailsConfig.isAtomisedEpithetsActivated();
98
        isShowAuthorship = nameDetailsConfig.isAuthorshipSectionActivated();
99
        isShowAuthorCache = nameDetailsConfig.isAuthorCacheActivated();
100
        isShowLSID = nameDetailsConfig.isLSIDActivated();
101
        isShowNameApprobiation = nameDetailsConfig.isNameApprobiationActivated();
102
        isShowNameCache = nameDetailsConfig.isNameCacheActivated();
103
        isShowNameRelationship = nameDetailsConfig.isNameRelationsSectionActivated();
104
        isShowNomenclaturalCode = nameDetailsConfig.isNomenclaturalCodeActived();
105
        isShowNomenclaturalStatus = nameDetailsConfig.isNomenclaturalStatusSectionActivated();
106
        isShowNomenclaturalRef = nameDetailsConfig.isNomenclaturalReferenceSectionActivated();
107
        isShowProtologue = nameDetailsConfig.isProtologueActivated();
108
        isShowRank = nameDetailsConfig.isRankActivated();
109
        isShowTaxon = nameDetailsConfig.isTaxonSectionActivated();
110
        isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
111
        isSecEnabled = nameDetailsConfig.isSecEnabled();
112
        isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
113
        isShowHybrid = nameDetailsConfig.isHybridActivated();
114
        super.performDefaults();
115
    }
116

  
93 117

  
94 118
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java
49 49
    Map<String, String>  labelAndValues;
50 50
    Map<String, Integer> keyAndIndex;
51 51
    Combo nomenclaturalCode;
52

  
52
    Button allowOverrideButton;
53 53
    boolean allowOverride;
54 54

  
55 55

  
......
155 155

  
156 156
	@Override
157 157
	 public boolean performOk() {
158

  
159 158
	    if (actualCode != null){
160 159
	        CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.NomenclaturalCode, actualCode);
161 160
	        pref.setAllowOverride(allowOverride);
162 161
	        PreferencesUtil.setPreferredNomenclaturalCode(pref);
163 162
	    }
164

  
165 163
        return true;
166 164
    }
167 165

  
166
	@Override
167
	protected void performDefaults() {
168
	    actualCode = PreferencePredicate.NomenclaturalCode.getDefaultValue().toString();
169
	    allowOverride = true;
170
	    Integer index = keyAndIndex.get(actualCode);
171
        if(index!=null){
172
            nomenclaturalCode.select(index);
173
        }
174
        allowOverrideButton.setSelection(allowOverride);
175
	    super.performDefaults();
176
	}
177

  
168 178
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
12 12
import eu.etaxonomy.cdm.api.service.IPreferenceService;
13 13
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
14 14
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
15
import eu.etaxonomy.cdm.model.metadata.PublishEnum;
15 16
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
16
import eu.etaxonomy.taxeditor.preference.PublishEnum;
17 17
import eu.etaxonomy.taxeditor.preference.PublishFlagLocalPreference;
18 18
import eu.etaxonomy.taxeditor.store.CdmStore;
19 19

  
......
67 67
        isAdminPreference = true;
68 68
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
69 69
        if (pref == null){
70
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue().toString());
70
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, ((PublishEnum)PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue()).getKey());
71 71
        }
72 72
        allowOverride = pref.isAllowOverride();
73
        publishBehaviour = PublishEnum.valueOf(pref.getValue().toString());
73
        publishBehaviour = PublishEnum.valueOf(pref.getValue());
74 74
    }
75 75

  
76
    @Override
77
    protected void performDefaults() {
78
        publishBehaviour = (PublishEnum)PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue();
79
        allowOverride = true;
80
        int index = 0;
81
        for (String itemLabel : publishFlagBehaviour.getItems()){
82
            if (itemLabel.equalsIgnoreCase(publishBehaviour.getLabel())){
83
                publishFlagBehaviour.select(index);
84
                break;
85
            }
86
            index++;
87
        }
88

  
89
        super.performDefaults();
90
    }
76 91

  
77 92

  
78 93

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
134 134
        return true;
135 135
    }
136 136

  
137
    @Override
138
    protected void performDefaults() {
139
        isShowSpecimenRelatedIssues = (Boolean)PreferencePredicate.ShowSpecimen.getDefaultValue();
140
        showSpecimenButton.setSelection(isShowSpecimenRelatedIssues);
141

  
142
        allowOverrideShowSpecimenRelatedIssues = true;
143
        allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
144

  
145
        isShowCollectingAreaInGeneralSection = (Boolean)PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();
146
        showCollectingAreaInGeneralSectionButton.setSelection(isShowCollectingAreaInGeneralSection);
147

  
148
        allowOverrideShowCollectingAreaInGeneralSection = true;
149
        allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
150

  
151
        isDeterminationOnlyForFieldUnits = (Boolean) PreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue();
152
        determinationOnlyForFieldUnitsButton.setSelection(isDeterminationOnlyForFieldUnits);
153

  
154
        allowOverrideDeterminationOnlyForFieldUnits = true;
155
        allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
156

  
157
        isShowTaxonAssociation = (Boolean) PreferencePredicate.ShowTaxonAssociations.getDefaultValue();
158
        showTaxonAssociationButton.setSelection(isShowTaxonAssociation);
159

  
160
        allowOverrideShowTaxonAssociation = true;
161
        allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
162

  
163
        isShowLifeForm = (Boolean) PreferencePredicate.ShowLifeForm.getDefaultValue();
164
        showLifeFormButton.setSelection(isShowLifeForm);
165

  
166
        allowOverrideShowLifeForm = true;
167
        allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
168

  
169
        super.performDefaults();
170
    }
171

  
137 172
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
76 76
        if (pref == null){
77 77
            return true;
78 78
        }
79

  
79
        PreferencesUtil.setPreferenceToDB(pref);
80 80
        PreferencesUtil.updateDBPreferences();
81 81

  
82 82
        return true;
83 83

  
84 84
    }
85 85

  
86
    @Override
87
    protected void performDefaults() {
88
        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, null);
89
        pref.setAllowOverride(true);
86 90

  
91
        super.performDefaults();
92
    }
87 93
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
60 60
    protected boolean overrideStatusDisplay;
61 61

  
62 62
    protected boolean allowOverrideStatus;
63
    Combo areaOrderSelectionCombo;
64
    Combo statusDisplaySelectionCombo;
65
    Combo areaDisplaySelectionCombo;
66

  
63
    protected Combo areaOrderSelectionCombo;
64
    protected Button allowOverrideOrderAreasButton;
65
    protected Combo statusDisplaySelectionCombo;
66
    protected Button allowOverrideStatusDisplayButton;
67
    protected Combo areaDisplaySelectionCombo;
68
    protected Button allowOverrideAreaDisplayButton;
67 69
    protected String commandHandlerString;
68 70
    protected String commandHandlerStringStatus;
69 71

  
......
73 75
    Composite child ;
74 76
    protected boolean isAllowOverride;
75 77

  
78
    protected Button activateCheckButton;
79
    protected Button allowOverrideActivatedButton;
80

  
81
    protected Button activateRankButton;
82
    protected Button allowOverrideRankButton;
83

  
76 84
    @Override
77 85
    protected Control createContents(Composite parent) {
78 86
        getValues();
......
88 96
            GridData sepGrid = createTextGridData();
89 97
            separator.setLayoutData(sepGrid);
90 98
            separator.setVisible(false);
91
            final Button activateCheckButton = new Button(activateComp, SWT.CHECK);
99
            activateCheckButton = new Button(activateComp, SWT.CHECK);
92 100
            activateCheckButton.setText(Messages.ChecklistEditorGeneralPreference_enable);
93 101
            activateCheckButton.setSelection(isEditorActivated);
94 102
            activateCheckButton.addSelectionListener(new SelectionAdapter(){
......
107 115

  
108 116
                }
109 117
            });
110
            Button allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
118
            allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
111 119
            if (isAdminPreference){
112 120
                allowOverrideActivatedButton.setSelection(allowOverrideActivated);
113 121
                allowOverrideActivatedButton.addSelectionListener(new SelectionAdapter(){
......
142 150
            separator.setLayoutData(sepGrid);
143 151

  
144 152

  
145
            final Button activateRankButton = new Button(child, SWT.CHECK);
153
            activateRankButton = new Button(child, SWT.CHECK);
146 154
            activateRankButton.setText(Messages.ChecklistEditorGeneralPreference_show_rank);
147 155
            activateRankButton.setSelection(isShowRank);
148 156
            activateRankButton.addSelectionListener(new SelectionAdapter(){
......
152 160
                    isShowRank = activateRankButton.getSelection();
153 161
                }
154 162
            });
155
            Button allowOverrideRankButton = createAllowOverrideButton(child);
163
            allowOverrideRankButton = createAllowOverrideButton(child);
156 164
            if (isAdminPreference){
157 165
                allowOverrideRankButton.setSelection(allowOverrideRank);
158 166
                allowOverrideRankButton.addSelectionListener(new SelectionAdapter(){
......
221 229
//                    isSortByVocabularyOrder = sortNamedAreaByVocabularyOrder.getSelection();
222 230
//                 }
223 231
//            });
224
            Button allowOverrideOrderAreasButton = createAllowOverrideButton(child);
232
            allowOverrideOrderAreasButton = createAllowOverrideButton(child);
225 233
            if (isAdminPreference){
226 234
                allowOverrideOrderAreasButton.setSelection(allowOverrideOrderAreas);
227 235
                allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter(){
......
321 329
                }
322 330
            }
323 331
            areaDisplaySelectionCombo.addSelectionListener(this);
324
            Button allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
332
            allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
325 333
            if (isAdminPreference){
326 334
                allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
327 335
                allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
......
371 379
            }
372 380

  
373 381
            statusDisplaySelectionCombo.addSelectionListener(this);
374
            Button allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
382
            allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
375 383
            if (isAdminPreference){
376 384
                allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
377 385
                allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
43 43
    protected boolean isOverrideShowCheckListPerspective;
44 44
    protected boolean isOverrideShowTaxonNodeWizard;
45 45

  
46
    protected Button showIOMenuButton;
47
    protected Button allowOverrideShowIOMenuButton;
48
    protected Button showChecklistPerspectiveButton;
49
    protected Button allowOverrideShowChecklistButton;
50
    protected Button showTaxonNodeWizardButton;
51
    protected Button allowOverrideShowTaxonNodeWizardButton;
46 52
    /**
47 53
     * {@inheritDoc}
48 54
     */
......
56 62
        Label separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
57 63
        separator.setLayoutData(gridData);
58 64
        separator.setVisible(false);
59
        final Button showIOMenuButton = new Button(composite, SWT.CHECK);
65
        showIOMenuButton = new Button(composite, SWT.CHECK);
60 66
        showIOMenuButton.setText(Messages.DatabasePreferncesPage_Show_IOMenu);
61 67
        showIOMenuButton.setSelection(isShowIOMenu);
62 68
        showIOMenuButton.addSelectionListener(new SelectionAdapter(){
......
66 72
                 setApply(true);
67 73
              }
68 74
         });
69
        Button allowOverrideShowIOMenuButton = createAllowOverrideButton(composite);
75
        allowOverrideShowIOMenuButton = createAllowOverrideButton(composite);
70 76
        if (isAdminPreference){
71 77
            allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
72 78
            allowOverrideShowIOMenuButton.addSelectionListener(new SelectionAdapter(){
......
124 130
//            }
125 131
//        }
126 132

  
127
        final Button showChecklistPerspectiveButton = new Button(composite, SWT.CHECK);
133
        showChecklistPerspectiveButton = new Button(composite, SWT.CHECK);
128 134
        showChecklistPerspectiveButton.setText(Messages.DatabasePreferncesPage_Show_ChecklistPerspective);
129 135
        showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
130 136
        showChecklistPerspectiveButton.addSelectionListener(new SelectionAdapter(){
......
135 141
              }
136 142
         });
137 143

  
138
        Button allowOverrideShowChecklistButton = createAllowOverrideButton(composite);
144
        allowOverrideShowChecklistButton = createAllowOverrideButton(composite);
139 145
        if (isAdminPreference){
140 146
            allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
141 147
            allowOverrideShowChecklistButton.addSelectionListener(new SelectionAdapter(){
......
160 166
            }
161 167
        }
162 168

  
163
        final Button showTaxonNodeWizardButton = new Button(composite, SWT.CHECK);
169
        showTaxonNodeWizardButton = new Button(composite, SWT.CHECK);
164 170
        showTaxonNodeWizardButton.setText(Messages.DatabasePreferncesPage_Show_TaxonNodeWizard);
165 171
        showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
166 172
        showTaxonNodeWizardButton.addSelectionListener(new SelectionAdapter(){
......
171 177
              }
172 178
         });
173 179

  
174
        Button allowOverrideShowTaxonNodeWizardButton = createAllowOverrideButton(composite);
180
        allowOverrideShowTaxonNodeWizardButton = createAllowOverrideButton(composite);
175 181
        if (isAdminPreference){
176 182
            allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
177 183
            allowOverrideShowTaxonNodeWizardButton.addSelectionListener(new SelectionAdapter(){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
151 151
//	public static final String SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE = "eu.etaxonomy.taxeditor.name.showNameAppendedPhrase";
152 152
//	public static final String SHOW_NAME_DETAILS_SECTION_CACHE = "eu.etaxonomy.taxeditor.name.showNameCache";
153 153
//    public static final String SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE = "eu.etaxonomy.taxeditor.name.showAuthorCache";
154
    public static final String ALLOW_OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.allowOverride";
154
   // public static final String ALLOW_OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.allowOverride";
155 155
    public static final String OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.override";
156 156

  
157 157
    public static final String PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR = "eu.etaxonomy.taxeditor.specimen.promptForOpenSpecimenInEditor";
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
389 389

  
390 390
    @Override
391 391
    public void getValues(){
392
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
393
        isAdminPreference = false;
394
        isAllowOverride = true;
395
        if (nameDetailsPref != null){
396
            isAllowOverride = nameDetailsPref.isAllowOverride();
392
        if (nameDetailsConfig == null){
393
            CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
394
            isAdminPreference = false;
395
            isAllowOverride = true;
396
            if (nameDetailsPref != null){
397
                isAllowOverride = nameDetailsPref.isAllowOverride();
397 398

  
399
            }
400
            isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()));
401
            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(true);
398 402
        }
399
        isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()));
400
        nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(true);
401 403
    }
402 404

  
403 405
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
857 857
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowNamespaceInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowNamespaceInSource.getDefaultValue().toString()));
858 858
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowIdInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowIdInSource.getDefaultValue().toString()));
859 859
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(PreferencePredicate.DisableMultiClassification.getDefaultValue().toString()));
860
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowImportExportMenu.getKey()), Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString()));
860 861

  
861 862
	}
862 863

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnum.java
1
/**
2
* Copyright (C) 2018 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.taxeditor.preference;
10

  
11
import eu.etaxonomy.taxeditor.l10n.Messages;
12

  
13
/**
14
 * @author k.luther
15
 * @since 19.11.2018
16
 *
17
 */
18
public enum PublishEnum {
19

  
20
    Publish("Publish", Messages.PublishEnum_publish),
21
    NotPublish("NotPublish", Messages.PublishFlagPreference_do_not_set),
22
    InheritFromParent("InheritFromParent", Messages.PublishFlagPreference_inherit);
23

  
24

  
25
    String label;
26
    String key;
27

  
28
    private PublishEnum(String key, String label){
29
        this.label = label;
30
        this.key = key;
31
    }
32

  
33
    public String getLabel(){
34
        return label;
35
    }
36

  
37
    public String getKey(){
38
        return key;
39
    }
40
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnumX.java
1
/**
2
* Copyright (C) 2018 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.taxeditor.preference;
10

  
11
import eu.etaxonomy.taxeditor.l10n.Messages;
12

  
13
/**
14
 * @author k.luther
15
 * @since 19.11.2018
16
 *
17
 */
18
public enum PublishEnumX {
19

  
20
    Publish("Publish", Messages.PublishEnum_publish),
21
    NotPublish("NotPublish", Messages.PublishFlagPreference_do_not_set),
22
    InheritFromParent("InheritFromParent", Messages.PublishFlagPreference_inherit);
23

  
24

  
25
    String label;
26
    String key;
27

  
28
    private PublishEnumX(String key, String label){
29
        this.label = label;
30
        this.key = key;
31
    }
32

  
33
    public String getLabel(){
34
        return label;
35
    }
36

  
37
    public String getKey(){
38
        return key;
39
    }
40
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
20 20

  
21 21
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
22 22
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
23
import eu.etaxonomy.cdm.model.metadata.PublishEnum;
23 24
import eu.etaxonomy.taxeditor.l10n.Messages;
24 25
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
25 26

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
50 50
    protected boolean overrideShowLifeForm;
51 51
    Composite composite;
52 52

  
53
    protected Button showSpecimenButton;
54
    protected Button allowOverrideIsShowSpecimenRelatedIssuesButton;
55
    protected Button showCollectingAreaInGeneralSectionButton;
56
    protected Button allowOverrideShowCollectingAreaButton;
57
    protected Button determinationOnlyForFieldUnitsButton;
58
    protected Button allowOverridesDeterminationOnlyForFieldUnitsButton;
59
    protected Button showTaxonAssociationButton;
60
    protected Button allowOverrideIsShowTaxonAssociationButton;
61
    protected Button allowOverrideShowLifeFormButton;
62
    protected Button showLifeFormButton;
63

  
53 64

  
54 65
    @Override
55 66
    public void init() {
......
91 102
        Label separator= new Label(titleComp, SWT.HORIZONTAL | SWT.SEPARATOR);
92 103
        separator.setLayoutData(gridData);
93 104
        separator.setVisible(false);
94
        final Button showSpecimenButton = new Button(titleComp, SWT.CHECK);
105
        showSpecimenButton = new Button(titleComp, SWT.CHECK);
95 106

  
96 107
        showSpecimenButton.setText(Messages.DatabasePreferncesPage_Show_Specimen);
97 108

  
......
110 121
//                 }
111 122
              }
112 123
         });
113
        Button allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
124
        allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
114 125

  
115 126

  
116 127
        if (isAdminPreference){
......
143 154
        separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
144 155
        separator.setLayoutData(gridData);
145 156

  
146
        final Button showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
157
        showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
147 158

  
148 159
        showCollectingAreaInGeneralSectionButton.setText(Messages.DatabasePreferncesPage_Show_Collecting_Areas_in_general_section);
149 160

  
......
156 167

  
157 168
              }
158 169
         });
159
        Button allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
170
        allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
160 171
        if (isAdminPreference){
161 172
            allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
162 173
            allowOverrideShowCollectingAreaButton.addSelectionListener(new SelectionAdapter(){
......
181 192
            }
182 193
        }
183 194

  
184
        final Button determinationOnlyForFieldUnitsButton = new Button(composite, SWT.CHECK);
195
        determinationOnlyForFieldUnitsButton = new Button(composite, SWT.CHECK);
185 196
        determinationOnlyForFieldUnitsButton.setText(Messages.DatabasePreferncesPage_Determination_only_for_field_unnits);
186 197
        determinationOnlyForFieldUnitsButton.setSelection(isDeterminationOnlyForFieldUnits);
187 198
        determinationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
......
192 203
             }
193 204
         });
194 205

  
195
        Button allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
206
        allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
196 207
        if (isAdminPreference){
197 208
            allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
198 209
            allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
......
217 228
            }
218 229
        }
219 230

  
220
        final Button showTaxonAssociationButton = new Button(composite, SWT.CHECK);
231
        showTaxonAssociationButton = new Button(composite, SWT.CHECK);
221 232

  
222 233
        showTaxonAssociationButton.setText(Messages.DatabasePreferncesPage_Taxon_Associations);
223 234

  
......
230 241

  
231 242
              }
232 243
         });
233
        Button allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
244
        allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
234 245
        if (isAdminPreference){
235 246
            allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
236 247
            allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
......
255 266
            }
256 267
        }
257 268

  
258
        final Button showLifeFormButton = new Button(composite, SWT.CHECK);
269
        showLifeFormButton = new Button(composite, SWT.CHECK);
259 270
        showLifeFormButton.setText(Messages.DatabasePreferncesPage_Life_Form);
260 271
        showLifeFormButton.setSelection(isShowLifeForm);
261 272
        showLifeFormButton.addSelectionListener(new SelectionAdapter(){
......
267 278
              }
268 279
         });
269 280

  
270
        Button allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
281
        allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
271 282
        if (isAdminPreference){
272 283
            allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
273 284
            allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
134 134

  
135 135

  
136 136

  
137

  
138

  
137 139
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
101 101
            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(checked);
102 102
            treeComposite.setCheckedElements(termsFromStringValues.toArray());
103 103

  
104
        }else{
105
            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
106
            treeComposite.setCheckedElements(termsFromStringValues.toArray());
104 107
        }
105 108
    }
106 109

  
107 110
    protected List<AbstractTermDto> getTermsFromStringValues(List<String> listValue) {
108 111
        List<AbstractTermDto> termlist = new ArrayList<>();
112
        ITermService termService = CdmStore.getService(ITermService.class);
109 113
        for (String s : listValue) {
110 114
            if (!StringUtils.isBlank(s)){
111 115
                UUID uuid = UUID.fromString(s);
112
                ITermService termService = CdmStore.getService(ITermService.class);
116

  
113 117
                DefinedTermBase definedTermBase = termService.load(uuid);
114 118
                if(definedTermBase != null){
115 119
                    termlist.add(TermDto.fromTerm(definedTermBase, true));
......
122 126
                }
123 127
            }
124 128
        }
129
        if (listValue.isEmpty()){
130
            List<DefinedTermBase> terms = CdmStore.getTermManager().getPreferredTerms(type);
131
            for (DefinedTermBase term: terms){
132
                termlist.add(TermDto.fromTerm(term, true));
133
            }
134
        }
125 135

  
126 136
        return termlist;
127 137
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java
24 24
import eu.etaxonomy.cdm.model.common.TermType;
25 25
import eu.etaxonomy.cdm.model.common.TermVocabulary;
26 26
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
27
import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
27 28
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
28 29
import eu.etaxonomy.taxeditor.l10n.Messages;
29 30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
59 60
    }
60 61

  
61 62
    @Override
63
    protected void rememberCheckedValues(String checkedValues) {
64
        initialiseVocabularies();
65

  
66
        treeComposite.getViewer().setInput(getVocabularies());
67

  
68
        if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
69
            String[] listChecked = checkedValues.split(";"); //$NON-NLS-1$
70
            String[] listCheckedComma = checkedValues.split(","); //$NON-NLS-1$
71
            List<String> checked = new ArrayList<>();
72
            if (listChecked != null ){
73
                checked = Arrays.asList(listChecked);
74
            }
75
            if (listCheckedComma != null && checkedValues.contains(",")){ //$NON-NLS-1$
76
                checked = Arrays.asList(listCheckedComma);
77
            }
78
            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(checked);
79
            treeComposite.setCheckedElements(termsFromStringValues.toArray());
80
        }
81

  
82
    }
83

  
84
    @Override
62 85
    public void dispose() {
63 86
       // CdmStore.getCurrentSessionManager().dispose(this);
64 87
        super.dispose();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
21 21
import eu.etaxonomy.cdm.model.common.LanguageString;
22 22
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
23 23
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
24
import eu.etaxonomy.cdm.model.metadata.PublishEnum;
24 25
import eu.etaxonomy.cdm.model.name.TaxonName;
25 26
import eu.etaxonomy.cdm.model.reference.Reference;
26 27
import eu.etaxonomy.cdm.model.taxon.Classification;
......
28 29
import eu.etaxonomy.cdm.model.taxon.Taxon;
29 30
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
30 31
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
31
import eu.etaxonomy.taxeditor.preference.PublishEnum;
32 32
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
33 33
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
34 34
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;

Also available in: Unified diff