name="%page.name.48">
</page>
<page
- category="eu.etaxonomy.taxeditor.preferences.name"
+ category="eu.etaxonomy.taxeditor.preferences.namePreferences"
class="eu.etaxonomy.taxeditor.preference.menu.NomenclaturalCodePreferences"
id="eu.etaxonomy.taxeditor.preferences.nomenclatural"
name="%page.name.4">
final Group group = new Group(container, SWT.NONE);
group.setLayout(new GridLayout());
- NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(false);
+ NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode();
// set preferred code as default
configurator.setNomenclaturalCode(preferredCode);
final Group group = new Group(container, SWT.NONE);
group.setLayout(new GridLayout());
- NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode(false);
+ NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode();
// set preferred code as default
configurator.setNomenclaturalCode(preferredCode);
List<NomenclaturalCode> supportedCodes = new ArrayList<NomenclaturalCode>();
for (NomenclaturalCode code : getAllCodes()) {
if (isSupported(code)) {
- if (PreferencesUtil.getPreferredNomenclaturalCode(false).equals(code)){
+ if (PreferencesUtil.getPreferredNomenclaturalCode().equals(code)){
supportedCodes.add(0, code);
}else{
supportedCodes.add(code);
}
- public static NomenclaturalCode getPreferredNomenclaturalCode(){
- if (getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey()))) {
- return getPreferredNomenclaturalCode(true);
- } else{
- return getPreferredNomenclaturalCode(false);
- }
- }
+
/**
* <p>
*
* @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
*/
- public static NomenclaturalCode getPreferredNomenclaturalCode(boolean useLocal) {
+ public static NomenclaturalCode getPreferredNomenclaturalCode() {
+
+ CdmPreference pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode);
- CdmPreference pref = null;
- if (!useLocal){
- pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode);
- }
String preferredCode;
- if(pref == null){
+ if(pref == null || (pref.isAllowOverride() && getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey())))){
preferredCode = getStringValue(
- PREFERRED_NOMENCLATURAL_CODE_KEY, true);
+ PreferencePredicate.NomenclaturalCode.getKey(), true);
}else{
preferredCode = pref.getValue();
*/
public static void checkNomenclaturalCode() {
// First time Editor is opened, no nomenclatural code has been set
- if (PreferencesUtil.getPreferredNomenclaturalCode(true) == null) {
+ if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
PreferencesUtil.setPreferredNomenclaturalCode(getPreferenceKey(NomenclaturalCode.ICNAFP), true);
}
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
PreferencesUtil.setPreferredNomenclaturalCode(null, false);
if (pref.isAllowOverride()) {
addField(new ComboFieldEditor(
- PreferencesUtil.createPreferenceString(IPreferenceKeys.PREFERRED_NOMENCLATURAL_CODE_KEY),
+ PreferencesUtil.createPreferenceString(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NomenclaturalCode.getKey())),
Messages.NomenclaturalCodePreferences_available_codes, getLabelAndValues(),
getFieldEditorParent()));