Revision 00e51d7a
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/plugin.xml | ||
|---|---|---|
| 438 | 438 |
name="%page.name.48"> |
| 439 | 439 |
</page> |
| 440 | 440 |
<page |
| 441 |
category="eu.etaxonomy.taxeditor.preferences.name" |
|
| 441 |
category="eu.etaxonomy.taxeditor.preferences.namePreferences"
|
|
| 442 | 442 |
class="eu.etaxonomy.taxeditor.preference.menu.NomenclaturalCodePreferences" |
| 443 | 443 |
id="eu.etaxonomy.taxeditor.preferences.nomenclatural" |
| 444 | 444 |
name="%page.name.4"> |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/NomenclaturalCodeWizardPageE4.java | ||
|---|---|---|
| 58 | 58 |
final Group group = new Group(container, SWT.NONE); |
| 59 | 59 |
group.setLayout(new GridLayout()); |
| 60 | 60 |
|
| 61 |
NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(false);
|
|
| 61 |
NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(); |
|
| 62 | 62 |
|
| 63 | 63 |
// set preferred code as default |
| 64 | 64 |
configurator.setNomenclaturalCode(preferredCode); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java | ||
|---|---|---|
| 72 | 72 |
final Group group = new Group(container, SWT.NONE); |
| 73 | 73 |
group.setLayout(new GridLayout()); |
| 74 | 74 |
|
| 75 |
NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(false);
|
|
| 75 |
NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(); |
|
| 76 | 76 |
|
| 77 | 77 |
// set preferred code as default |
| 78 | 78 |
configurator.setNomenclaturalCode(preferredCode); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java | ||
|---|---|---|
| 44 | 44 |
List<NomenclaturalCode> supportedCodes = new ArrayList<NomenclaturalCode>(); |
| 45 | 45 |
for (NomenclaturalCode code : getAllCodes()) {
|
| 46 | 46 |
if (isSupported(code)) {
|
| 47 |
if (PreferencesUtil.getPreferredNomenclaturalCode(false).equals(code)){
|
|
| 47 |
if (PreferencesUtil.getPreferredNomenclaturalCode().equals(code)){
|
|
| 48 | 48 |
supportedCodes.add(0, code); |
| 49 | 49 |
}else{
|
| 50 | 50 |
supportedCodes.add(code); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java | ||
|---|---|---|
| 445 | 445 |
} |
| 446 | 446 |
|
| 447 | 447 |
|
| 448 |
public static NomenclaturalCode getPreferredNomenclaturalCode(){
|
|
| 449 |
if (getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey()))) {
|
|
| 450 |
return getPreferredNomenclaturalCode(true); |
|
| 451 |
} else{
|
|
| 452 |
return getPreferredNomenclaturalCode(false); |
|
| 453 |
} |
|
| 454 |
} |
|
| 448 |
|
|
| 455 | 449 |
|
| 456 | 450 |
/** |
| 457 | 451 |
* <p> |
| ... | ... | |
| 460 | 454 |
* |
| 461 | 455 |
* @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
|
| 462 | 456 |
*/ |
| 463 |
public static NomenclaturalCode getPreferredNomenclaturalCode(boolean useLocal) {
|
|
| 457 |
public static NomenclaturalCode getPreferredNomenclaturalCode() {
|
|
| 458 |
|
|
| 459 |
CdmPreference pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode); |
|
| 464 | 460 |
|
| 465 |
CdmPreference pref = null; |
|
| 466 |
if (!useLocal){
|
|
| 467 |
pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode); |
|
| 468 |
} |
|
| 469 | 461 |
|
| 470 | 462 |
String preferredCode; |
| 471 |
if(pref == null){
|
|
| 463 |
if(pref == null || (pref.isAllowOverride() && getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey())))){
|
|
| 472 | 464 |
preferredCode = getStringValue( |
| 473 |
PREFERRED_NOMENCLATURAL_CODE_KEY, true);
|
|
| 465 |
PreferencePredicate.NomenclaturalCode.getKey(), true);
|
|
| 474 | 466 |
|
| 475 | 467 |
}else{
|
| 476 | 468 |
preferredCode = pref.getValue(); |
| ... | ... | |
| 872 | 864 |
*/ |
| 873 | 865 |
public static void checkNomenclaturalCode() {
|
| 874 | 866 |
// First time Editor is opened, no nomenclatural code has been set |
| 875 |
if (PreferencesUtil.getPreferredNomenclaturalCode(true) == null) {
|
|
| 867 |
if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
|
|
| 876 | 868 |
PreferencesUtil.setPreferredNomenclaturalCode(getPreferenceKey(NomenclaturalCode.ICNAFP), true); |
| 877 | 869 |
} |
| 878 | 870 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java | ||
|---|---|---|
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| 23 | 23 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 24 | 24 |
import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper; |
| 25 |
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; |
|
| 26 | 25 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
| 27 | 26 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 28 | 27 |
|
| ... | ... | |
| 41 | 40 |
PreferencesUtil.setPreferredNomenclaturalCode(null, false); |
| 42 | 41 |
if (pref.isAllowOverride()) {
|
| 43 | 42 |
addField(new ComboFieldEditor( |
| 44 |
PreferencesUtil.createPreferenceString(IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY),
|
|
| 43 |
PreferencesUtil.createPreferenceString(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NomenclaturalCode.getKey())),
|
|
| 45 | 44 |
Messages.NomenclaturalCodePreferences_available_codes, getLabelAndValues(), |
| 46 | 45 |
getFieldEditorParent())); |
| 47 | 46 |
|
Also available in: Unified diff
ref #7849: fix problems with nomenclatural code preference