From cf5e30c30de67182a1b82b8a7db211e575f30cc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 12 Oct 2015 15:07:20 +0200 Subject: [PATCH] Adapt TaxEditor to use vocabulary term type instead of class: #3843. --- .../ui/dialog/selection/NamedAreaSelectionDialog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java index 4444f18f5..c7f7d4a76 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java @@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IVocabularyService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.common.CdmBase; +import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.cdm.model.location.Country; import eu.etaxonomy.cdm.model.location.NamedArea; @@ -65,7 +66,7 @@ public class NamedAreaSelectionDialog extends } } - private Collection> selectedVocabularies; + private Collection selectedVocabularies; private ArrayList preselectedVocabularies; @@ -134,9 +135,8 @@ public class NamedAreaSelectionDialog extends selectedVocabularies = getAvailableVocabularies(); } - private List> getAvailableVocabularies(){ - List> vocabularies = CdmStore.getService(IVocabularyService.class).listByTermClass(NamedArea.class, null, null, null, null); - vocabularies.add(CdmStore.getService(IVocabularyService.class).find(Country.uuidCountryVocabulary)); + private List getAvailableVocabularies(){ + List vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null); return vocabularies; } -- 2.34.1