commit 9b0a1cb82066c8887b97fa504768fe1c9077fa4c
Author: Patrick Plitzner
Date: Wed Apr 24 12:12:41 2019 +0200
ref #8242 Load all supported states with one service call
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
index e586da756..f92f29df4 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
@@ -297,12 +297,12 @@ public class CharacterMatrix extends Composite {
private void fetchSupportedStates(Character character) {
if(character.isSupportsCategoricalData()){
- List supportedStates = new ArrayList<>();
Set> supportedCategoricalEnumerations = character.getSupportedCategoricalEnumerations();
+ List vocUuids = new ArrayList<>();
for (TermVocabulary termVocabulary : supportedCategoricalEnumerations) {
- supportedStates.addAll(CdmStore.getService(IVocabularyService.class).getTerms(termVocabulary.getUuid()));
+ vocUuids.add(termVocabulary.getUuid());
}
-// Collections.sort(supportedStates, (state1, state2)->state1.getLabel().compareTo(state2.getLabel()));
+ List supportedStates = new ArrayList<>(CdmStore.getService(IVocabularyService.class).getTerms(vocUuids));
categoricalFeatureToStateMap.put(character, supportedStates);
}
}