Revision 5e1dc099
Added by Katja Luther almost 5 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditor.java | ||
|---|---|---|
| 75 | 75 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 76 | 76 |
import eu.etaxonomy.cdm.api.service.dto.TaxonDescriptionDTO; |
| 77 | 77 |
import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO; |
| 78 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
| 79 | 78 |
import eu.etaxonomy.cdm.model.common.Language; |
| 79 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
|
| 80 |
import eu.etaxonomy.cdm.model.description.Distribution; |
|
| 81 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
|
| 82 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
|
| 83 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 84 |
import eu.etaxonomy.cdm.model.reference.Reference; |
|
| 85 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
| 80 | 86 |
import eu.etaxonomy.cdm.model.term.OrderedTermBase; |
| 81 | 87 |
import eu.etaxonomy.cdm.model.term.OrderedTermComparator; |
| 82 | 88 |
import eu.etaxonomy.cdm.model.term.Representation; |
| ... | ... | |
| 84 | 90 |
import eu.etaxonomy.cdm.model.term.TermLanguageComparator; |
| 85 | 91 |
import eu.etaxonomy.cdm.model.term.TermType; |
| 86 | 92 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
| 87 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
|
| 88 |
import eu.etaxonomy.cdm.model.description.Distribution; |
|
| 89 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
|
| 90 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
|
| 91 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 92 |
import eu.etaxonomy.cdm.model.reference.Reference; |
|
| 93 | 93 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 94 | 94 |
import eu.etaxonomy.taxeditor.editor.l10n.Messages; |
| 95 | 95 |
import eu.etaxonomy.taxeditor.model.AbstractUtility; |
| ... | ... | |
| 619 | 619 |
private SortedSet<DefinedTermBase> loadNamedAreas() {
|
| 620 | 620 |
//IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore(); |
| 621 | 621 |
|
| 622 |
String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey()); |
|
| 622 |
String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(), true);
|
|
| 623 | 623 |
String values = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey()); |
| 624 | 624 |
Set<UUID> uuidList = new HashSet<UUID>(); |
| 625 | 625 |
String[] split; |
| ... | ... | |
| 646 | 646 |
}else{
|
| 647 | 647 |
vocs= service.find(uuidList); |
| 648 | 648 |
} |
| 649 |
split = valuesAreas.split(";"); //$NON-NLS-1$
|
|
| 650 |
listValue = Arrays.asList(split); |
|
| 651 | 649 |
for (TermVocabulary voc: vocs){
|
| 652 | 650 |
termlist.addAll(service.getTerms(voc, null, null, null, null).getRecords()); |
| 653 | 651 |
} |
| 654 | 652 |
List<DefinedTermBase> filteredList = new ArrayList(); |
| 655 |
for (DefinedTermBase area: termlist){
|
|
| 656 |
if (listValue.contains(area.getUuid().toString())) {
|
|
| 657 |
filteredList.add(area); |
|
| 658 |
} |
|
| 653 |
if (valuesAreas != null && valuesAreas != "") {
|
|
| 654 |
split = valuesAreas.split(";"); //$NON-NLS-1$
|
|
| 655 |
listValue = Arrays.asList(split); |
|
| 659 | 656 |
|
| 657 |
for (DefinedTermBase area: termlist){
|
|
| 658 |
if (listValue.contains(area.getUuid().toString())) {
|
|
| 659 |
filteredList.add(area); |
|
| 660 |
} |
|
| 661 |
|
|
| 662 |
} |
|
| 663 |
}else{
|
|
| 664 |
filteredList.addAll(termlist); |
|
| 660 | 665 |
} |
| 666 |
|
|
| 667 |
|
|
| 661 | 668 |
String sortOrder = PreferencesUtil.getSortNamedAreasInDistributionEditor(); |
| 662 | 669 |
if (sortOrder.equals(TermOrder.Natural.getKey())){
|
| 663 | 670 |
areas = getTermsOrderedByVocabularyOrder(filteredList); |
Also available in: Unified diff
ref #7920: add area specific status preference in distribution editor