Project

General

Profile

« Previous | Next » 

Revision 46418777

Added by Andreas Müller over 3 years ago

ref #8547 make ReferenceType.inReferenceContraints() a list (adapt vaadin)

View differences:

src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java
11 11
import java.util.ArrayList;
12 12
import java.util.Arrays;
13 13
import java.util.List;
14
import java.util.Set;
15 14

  
16 15
import org.springframework.beans.factory.annotation.Autowired;
17 16
import org.springframework.beans.factory.annotation.Qualifier;
......
58 57
     */
59 58
    public CdmFilterablePagingProvider<Reference, Reference> inReferencePagingProvider(ReferenceType subReferenceType,
60 59
            boolean includeUnspecificTypes) {
61
        List<OrderHint> referenceOrderHints = new ArrayList<OrderHint>();
60
        List<OrderHint> referenceOrderHints = new ArrayList<>();
62 61
        referenceOrderHints.add(OrderHint.ORDER_BY_TITLE_CACHE);
63 62
        referenceOrderHints.add(new OrderHint("issn", SortOrder.ASCENDING));
64 63
        referenceOrderHints.add(new OrderHint("isbn", SortOrder.ASCENDING));
65 64
        CdmFilterablePagingProvider<Reference, Reference> pagingProvider = new CdmFilterablePagingProvider<Reference, Reference>(
66 65
                repo.getReferenceService(), MatchMode.BEGINNING, referenceOrderHints);
67 66

  
68
        Set<ReferenceType> inRefTypes = subReferenceType.inReferenceContraints(subReferenceType);
67
        List<ReferenceType> inRefTypes = ReferenceType.inReferenceContraints(subReferenceType);
69 68

  
70 69
        if (!inRefTypes.isEmpty()) {
71 70
            if (includeUnspecificTypes) {

Also available in: Unified diff