Revision c2a446b0
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java | ||
---|---|---|
93 | 93 |
|
94 | 94 |
Composite title = createComposite(parent); |
95 | 95 |
// nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(!isAdminPreference); |
96 |
if (nameDetailsConfig == null){ |
|
97 |
nameDetailsConfig = new NameDetailsConfigurator(false); |
|
98 |
} |
|
96 |
// |
|
99 | 97 |
|
100 | 98 |
activateCheckButton = createBooleanCombo(title, ENABLE, DISABLE, PreferencePredicate.SimpleDetailsViewActivated, Messages.NameDetailsViewConfiguration_activateSimpleDetailsView, isAdminPreference); |
101 | 99 |
if (isAdminPreference){ |
... | ... | |
119 | 117 |
|
120 | 118 |
// activateCheckButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, true, 1, 1)); |
121 | 119 |
// activateCheckButton.setText(Messages.NameDetailsViewConfiguration_activateSimpleDetailsView); |
122 |
isSimpleDetailsViewActivated = nameDetailsConfig.isSimpleDetailsViewActivated(); |
|
123 |
|
|
120 |
if (nameDetailsConfig != null){ |
|
121 |
isSimpleDetailsViewActivated = nameDetailsConfig.isSimpleDetailsViewActivated(); |
|
122 |
} |
|
123 |
if (nameDetailsConfig == null){ |
|
124 |
nameDetailsConfig = new NameDetailsConfigurator(false); |
|
125 |
} |
|
124 | 126 |
activateCheckButton.addSelectionListener(this); |
125 | 127 |
// new SelectionAdapter(){ |
126 | 128 |
// @Override |
... | ... | |
140 | 142 |
|
141 | 143 |
|
142 | 144 |
dbSettings.setLayout(new GridLayout()); |
143 |
dbSettings.setEnabled(isSimpleDetailsViewActivated); |
|
145 |
if (isSimpleDetailsViewActivated != null){ |
|
146 |
dbSettings.setEnabled(isSimpleDetailsViewActivated); |
|
147 |
}else{ |
|
148 |
dbSettings.setEnabled(false); |
|
149 |
} |
|
144 | 150 |
|
145 | 151 |
|
146 | 152 |
Label separator= new Label(dbSettings, SWT.HORIZONTAL | SWT.SEPARATOR); |
... | ... | |
155 | 161 |
setApply(true); |
156 | 162 |
isShowTaxon = showTaxon.getSelection(); |
157 | 163 |
nameDetailsConfig.setTaxonSectionActivated(isShowTaxon); |
158 |
if (isSimpleDetailsViewActivated){ |
|
164 |
if (isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false){
|
|
159 | 165 |
showSecDetail.setEnabled(isShowTaxon); |
160 | 166 |
secEnabled.setEnabled(isShowTaxon); |
161 | 167 |
} |
... | ... | |
390 | 396 |
nameDetailsConfig.setNameApprobiationActivated(isShowNameApprobiation); |
391 | 397 |
} |
392 | 398 |
}); |
393 |
PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated); |
|
394 |
if (isSimpleDetailsViewActivated){ |
|
399 |
PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false);
|
|
400 |
if (isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false){
|
|
395 | 401 |
showSecDetail.setEnabled(isShowTaxon); |
396 | 402 |
secEnabled.setEnabled(isShowTaxon); |
403 |
}else{ |
|
404 |
showSecDetail.setEnabled(false); |
|
405 |
secEnabled.setEnabled(false); |
|
397 | 406 |
} |
398 | 407 |
setButtonSelections(); |
399 | 408 |
|
... | ... | |
495 | 504 |
isSecEnabled = nameDetailsConfig.isSecEnabled(); |
496 | 505 |
isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated(); |
497 | 506 |
isShowHybrid = nameDetailsConfig.isHybridActivated(); |
498 |
isSimpleDetailsViewActivated = false;
|
|
507 |
isSimpleDetailsViewActivated = null;
|
|
499 | 508 |
this.setButtonSelections(); |
509 |
// activateCheckButton.select(0); |
|
500 | 510 |
super.performDefaults(); |
501 | 511 |
} |
502 | 512 |
|
... | ... | |
505 | 515 |
*/ |
506 | 516 |
@Override |
507 | 517 |
public void widgetSelected(SelectionEvent e) { |
518 |
setApply(true); |
|
508 | 519 |
if (e.getSource().equals(activateCheckButton)){ |
509 | 520 |
String text = activateCheckButton.getText(); |
510 |
if(text.equals(Messages.Preference_Use_Default)){
|
|
521 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
|
511 | 522 |
isSimpleDetailsViewActivated = null; |
512 | 523 |
if (isAdminPreference){ |
513 | 524 |
nameDetailsPref.setAllowOverride(true); |
Also available in: Unified diff
ref #8385: fixes in preferences - getDefaults() for all pages