Revision 79bd864f
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java | ||
---|---|---|
234 | 234 |
if (text.startsWith(Messages.Preference_Use_Default)){ |
235 | 235 |
isOverrideShowIOMenu = false; |
236 | 236 |
isShowIOMenu = null; |
237 |
isAllowOverrideShowIOMenu = true; |
|
237 |
|
|
238 | 238 |
}else if (text.equals(SHOW)){ |
239 | 239 |
isShowIOMenu = true; |
240 | 240 |
isOverrideShowIOMenu = true; |
... | ... | |
249 | 249 |
if (text.startsWith(Messages.Preference_Use_Default)){ |
250 | 250 |
isOverrideShowCheckListPerspective = false; |
251 | 251 |
isShowCheckListPerspective = null; |
252 |
isAllowOverrideShowCheckListPerspective = true; |
|
252 |
|
|
253 | 253 |
}else if (text.equals(SHOW)){ |
254 | 254 |
isShowCheckListPerspective = true; |
255 | 255 |
isOverrideShowCheckListPerspective = true; |
... | ... | |
263 | 263 |
if (text.startsWith(Messages.Preference_Use_Default)){ |
264 | 264 |
isOverrideShowTaxonNodeWizard = false; |
265 | 265 |
isShowTaxonNodeWizard = null; |
266 |
isAllowOverrideShowTaxonNodeWizard = true; |
|
266 |
|
|
267 | 267 |
}else if (text.equals(SHOW)){ |
268 | 268 |
isShowTaxonNodeWizard = true; |
269 | 269 |
isOverrideShowTaxonNodeWizard = true; |
... | ... | |
306 | 306 |
protected void setSelections(){ |
307 | 307 |
if (isShowIOMenu == null || (!isOverrideShowIOMenu && !isAdminPreference)){ |
308 | 308 |
showIOMenuButton.select(0); |
309 |
if (isAdminPreference){ |
|
310 |
allowOverrideShowIOMenuButton.setEnabled(false); |
|
311 |
} |
|
309 |
// if (isAdminPreference){
|
|
310 |
// allowOverrideShowIOMenuButton.setEnabled(false);
|
|
311 |
// }
|
|
312 | 312 |
}else{ |
313 |
if (isAdminPreference){ |
|
314 |
allowOverrideShowIOMenuButton.setEnabled(true); |
|
315 |
} |
|
313 |
// if (isAdminPreference){
|
|
314 |
// allowOverrideShowIOMenuButton.setEnabled(true);
|
|
315 |
// }
|
|
316 | 316 |
if (isShowIOMenu){ |
317 | 317 |
showIOMenuButton.select(1); |
318 | 318 |
}else{ |
... | ... | |
322 | 322 |
|
323 | 323 |
if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){ |
324 | 324 |
showChecklistPerspectiveButton.select(0); |
325 |
if (isAdminPreference){ |
|
326 |
allowOverrideShowChecklistButton.setEnabled(false); |
|
327 |
} |
|
325 |
// if (isAdminPreference){
|
|
326 |
// allowOverrideShowChecklistButton.setEnabled(false);
|
|
327 |
// }
|
|
328 | 328 |
}else{ |
329 |
if (isAdminPreference){ |
|
330 |
allowOverrideShowChecklistButton.setEnabled(true); |
|
331 |
} |
|
329 |
// if (isAdminPreference){
|
|
330 |
// allowOverrideShowChecklistButton.setEnabled(true);
|
|
331 |
// }
|
|
332 | 332 |
if (isShowCheckListPerspective){ |
333 | 333 |
showChecklistPerspectiveButton.select(1); |
334 | 334 |
}else{ |
... | ... | |
338 | 338 |
|
339 | 339 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){ |
340 | 340 |
showTaxonNodeWizardButton.select(0); |
341 |
if (isAdminPreference){ |
|
342 |
allowOverrideShowTaxonNodeWizardButton.setEnabled(false); |
|
343 |
} |
|
341 |
// if (isAdminPreference){
|
|
342 |
// allowOverrideShowTaxonNodeWizardButton.setEnabled(false);
|
|
343 |
// }
|
|
344 | 344 |
}else{ |
345 |
if (isAdminPreference){ |
|
346 |
allowOverrideShowTaxonNodeWizardButton.setEnabled(true); |
|
347 |
} |
|
345 |
// if (isAdminPreference){
|
|
346 |
// allowOverrideShowTaxonNodeWizardButton.setEnabled(true);
|
|
347 |
// }
|
|
348 | 348 |
if (isShowTaxonNodeWizard){ |
349 | 349 |
showTaxonNodeWizardButton.select(1); |
350 | 350 |
}else{ |
Also available in: Unified diff
ref #8389: revert disabling of allowOverride for default selection