From 3d31b2291d9bbd820b70368729b728d8d6948782 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 26 Aug 2019 15:16:37 +0200 Subject: [PATCH] ref #8385: fix nomenclatural status page --- .../NomenclaturalStatusTypeAdminPreference.java | 8 +++----- .../taxeditor/preference/GeneralTermPreference.java | 5 ++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java index a081e2ffb..661e5fc49 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java @@ -14,14 +14,11 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; -import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.model.metadata.CdmPreference; -import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.persistence.dto.TermDto; import eu.etaxonomy.taxeditor.preference.LocalOrDefaultEnum; import eu.etaxonomy.taxeditor.preference.NomenclaturalStatusTypePreferences; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; -import eu.etaxonomy.taxeditor.store.CdmStore; /** * @author k.luther @@ -45,13 +42,14 @@ public class NomenclaturalStatusTypeAdminPreference extends NomenclaturalStatusT } Object[] checkedElements = treeComposite.getViewer().getCheckedElements(); + List listUIIDChecked = new ArrayList<>(); - List preferredTerms = new ArrayList<>(); + //List preferredTerms = new ArrayList<>(); for (Object o : checkedElements) { if(o instanceof TermDto){ TermDto termDto = (TermDto) o; listUIIDChecked.add(termDto.getUuid()); - preferredTerms.add(CdmStore.getService(ITermService.class).load(termDto.getUuid())); + //preferredTerms.add(CdmStore.getService(ITermService.class).load(termDto.getUuid())); } } String saveCheckedElements = StringUtils.join(listUIIDChecked, ";"); //$NON-NLS-1$ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java index 4dfe02c79..b2399a1e3 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java @@ -232,6 +232,9 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements pref = PreferencesUtil.getPreferenceFromDB(predicate); this.allowOverride = pref!= null?pref.isAllowOverride():true; this.isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(predicate.getKey())); + if (pref == null){ + pref = CdmPreference.NewTaxEditorInstance(predicate, null); + } } /** @@ -261,7 +264,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements @Override protected void performDefaults(){ - rememberCheckedValues(""); + rememberCheckedValues(""); useLocalOrAdmin.select(0); setApply(true); -- 2.34.1