Project

General

Profile

« Previous | Next » 

Revision a784f00f

Added by Katja Luther about 14 years ago

merge cate-development2 branch with trunk

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
19 19
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
20 20
import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
21 21
import eu.etaxonomy.cdm.model.common.Annotation;
22
import eu.etaxonomy.cdm.model.common.Marker;
22 23
import eu.etaxonomy.cdm.model.common.MarkerType;
23 24
import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao;
24 25
import eu.etaxonomy.cdm.persistence.query.OrderHint;
......
36 37
		
37 38
		return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);
38 39
	}
40
	
41
	@Transactional(readOnly = true)
42
    public Pager<Marker> getMarkers(T annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
43
        Integer numberOfResults = dao.countMarkers(annotatableEntity, technical);
44
		
45
		List<Marker> results = new ArrayList<Marker>();
46
		if(numberOfResults > 0) { // no point checking again
47
			results = dao.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
48
		}
49
		
50
		return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);
51
    }
52
	
53

  
54
	@Transactional(readOnly = true)
55
	public List<Object[]> groupMarkers(Class<? extends T> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
56
		return dao.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
57
	}
58

  
59
	@Transactional(readOnly = true)
60
	public int countMarkers(Class<? extends T> clazz, Boolean technical) {
61
		return dao.countMarkers(clazz, technical);
62
	}
39 63
}

Also available in: Unified diff