Revision f5b88527
Added by Fabian Reimeier over 6 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/container/NamedAreaContainer.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
import com.vaadin.data.util.BeanItemContainer; |
| 9 | 9 |
|
| 10 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
|
| 11 |
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary; |
|
| 10 | 12 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 11 | 13 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 12 | 14 |
import eu.etaxonomy.cdm.vaadin.util.TermCacher; |
| ... | ... | |
| 18 | 20 |
public NamedAreaContainer(TermVocabulary<NamedArea> vocabulary) |
| 19 | 21 |
throws IllegalArgumentException {
|
| 20 | 22 |
super(NamedArea.class); |
| 21 |
List<NamedArea> namedAreas = new ArrayList<>(vocabulary.getTerms()); |
|
| 22 |
Collections.sort(namedAreas, new AlphabeticallyAscendingNamedAreaComparator()); |
|
| 23 |
List<NamedArea> namedAreas; |
|
| 24 |
if (vocabulary.isInstanceOf(OrderedTermVocabulary.class)) {
|
|
| 25 |
OrderedTermVocabulary orderedVoc = CdmBase.deproxy(vocabulary, OrderedTermVocabulary.class); |
|
| 26 |
namedAreas = new ArrayList<>(orderedVoc.getOrderedTerms()); |
|
| 27 |
Collections.reverse(namedAreas); |
|
| 28 |
}else {
|
|
| 29 |
namedAreas = new ArrayList<>(vocabulary.getTerms()); |
|
| 30 |
Collections.sort(namedAreas, new AlphabeticallyAscendingNamedAreaComparator()); |
|
| 31 |
} |
|
| 32 |
|
|
| 23 | 33 |
TermCacher termCacher = TermCacher.getInstance(); |
| 24 | 34 |
for (NamedArea namedArea: namedAreas) {
|
| 25 | 35 |
termCacher.addNamedArea(namedArea); |
Also available in: Unified diff
ref #6903 reworked distribution area sorting