Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MarkerServiceImpl.java
10 10

  
11 11
import eu.etaxonomy.cdm.api.service.pager.Pager;
12 12
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
13
import eu.etaxonomy.cdm.model.common.Annotation;
13 14
import eu.etaxonomy.cdm.model.common.Marker;
14 15
import eu.etaxonomy.cdm.model.common.MarkerType;
16
import eu.etaxonomy.cdm.model.common.User;
15 17
import eu.etaxonomy.cdm.persistence.dao.hibernate.common.MarkerDaoImpl;
16 18
import eu.etaxonomy.cdm.persistence.query.OrderHint;
17 19

  
......
35 37
		return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);
36 38
	}
37 39

  
40
	public Pager<Marker> list(User creator, MarkerType markerType,Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,	List<String> propertyPaths) {
41
        Integer numberOfResults = dao.count(creator,markerType);
42
		
43
		List<Marker> results = new ArrayList<Marker>();
44
		if(numberOfResults > 0) { // no point checking again
45
			results = dao.list(creator,markerType, pageSize, pageNumber, orderHints, propertyPaths);
46
		}
47
		
48
		return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);
49
	}
50

  
51
	public int count(User creator, MarkerType markerType) {
52
        return dao.count(creator,markerType);
53
	}
38 54
}
55

  

Also available in: Unified diff