Project

General

Profile

« Previous | Next » 

Revision 83e3c490

Added by Fabian Reimeier about 6 years ago

ref #6804 sort available distributions

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/container/PresenceAbsenceTermContainer.java
2 2

  
3 3
import java.util.Arrays;
4 4
import java.util.Collection;
5
import java.util.Comparator;
5 6
import java.util.HashSet;
6 7
import java.util.List;
7 8
import java.util.Set;
8 9
import java.util.UUID;
10
import java.util.stream.Collectors;
9 11

  
10 12
import com.vaadin.data.util.BeanItemContainer;
11 13
import com.vaadin.server.VaadinSession;
......
25 27

  
26 28
	private static Collection<PresenceAbsenceTerm> defaultDistributionStatus;
27 29

  
30
    static class PresenceAbsenceTermComparator implements Comparator<PresenceAbsenceTerm> {
31
        @Override
32
        public int compare(PresenceAbsenceTerm pa1, PresenceAbsenceTerm pa2) {
33
            return pa1.compareTo(pa2);
34
        }
35

  
36
    }
37

  
28 38
	private PresenceAbsenceTermContainer()
29 39
			throws IllegalArgumentException {
30 40
		super(PresenceAbsenceTerm.class);
......
56 66

  
57 67
    public static List<PresenceAbsenceTerm> getDistributionStatusList(List<String> propertyPath){
58 68
        CdmPreference statusPref = CdmSpringContextHelper.getPreferenceService().findVaadin(PreferencePredicate.AvailableDistributionStatus);
69
        List<PresenceAbsenceTerm> paList;
59 70
        if (statusPref != null){
60 71
            List<UUID> uuidList = statusPref.getValueUuidList();
61
            return (List)CdmSpringContextHelper.getTermService().load(uuidList, propertyPath);
72
            paList = CdmSpringContextHelper.getTermService().load(uuidList, propertyPath).stream().map(db -> (PresenceAbsenceTerm)db).collect(Collectors.toList());
73
            paList.sort(new PresenceAbsenceTermComparator());
74
            return paList;
62 75
        }else{
63
            return TermCacher.getInstance().getDistributionStatusTermList();
76
            paList = TermCacher.getInstance().getDistributionStatusTermList();
77
            paList.sort(new PresenceAbsenceTermComparator());
78
            return paList;
64 79
        }
65 80
    }
66 81

  
......
68 83
            "$",
69 84
            "representations",
70 85
    });
71

  
72 86
}

Also available in: Unified diff