Project

General

Profile

« Previous | Next » 

Revision 2fbc5869

Added by Andreas Kohlbecker over 6 years ago

fix #7194 fixing page index calulation in CdmFilterablePagingProvider

View differences:

src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProvider.java
12 12
import java.util.Arrays;
13 13
import java.util.List;
14 14

  
15
import org.apache.log4j.Logger;
15 16
import org.hibernate.criterion.Criterion;
16 17
import org.vaadin.viritin.fields.LazyComboBox.FilterableCountProvider;
17 18
import org.vaadin.viritin.fields.LazyComboBox.FilterablePagingProvider;
......
29 30
 */
30 31
public class CdmFilterablePagingProvider<T extends IdentifiableEntity, V extends T> implements FilterablePagingProvider<V>, FilterableCountProvider {
31 32

  
32
    /**
33
     *
34
     */
33

  
35 34
    private static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList("$");
36 35

  
36
    private static final Logger logger = Logger.getLogger(CdmFilterablePagingProvider.class);
37

  
37 38
    private int pageSize = 20;
38 39

  
39 40
    private IIdentifiableEntityService<T> service;
......
114 115
    @Override
115 116
    public List<V> findEntities(int firstRow, String filter) {
116 117

  
118
        Integer pageIndex = firstRow / pageSize;
117 119
        Pager<V> page = (Pager<V>) service.findByTitle(
118 120
                type,
119 121
                filter,
120 122
                matchMode,
121 123
                criteria,
122 124
                pageSize,
123
                firstRow,
125
                pageIndex ,
124 126
                orderHints,
125 127
                initStrategy
126 128
              );
129
        if(logger.isTraceEnabled()){
130
            logger.trace("findEntities() - page: " + page.getCurrentIndex() + "/" + page.getPagesAvailable() + " totalRecords: " + page.getCount() + "\n" + page.getRecords());
131
        }
127 132
        return page.getRecords();
128 133
    }
129 134

  
......
143 148
                null,
144 149
                null
145 150
              );
151
        if(logger.isTraceEnabled()){
152
            logger.trace("size() -  count: " + page.getCount().intValue());
153
        }
146 154
        return page.getCount().intValue();
147 155
    }
148 156

  

Also available in: Unified diff