merging delete functionality into trunk

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / IMarkerService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java
index d09b6709d3558ed1aa813871d5a271ebf1742d97..e25ffe03610e6c8a019469d6ae386f861490072a 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java
@@ -5,7 +5,8 @@ import java.util.List;
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.persistence.dao.BeanInitializer;\r
+import eu.etaxonomy.cdm.model.common.User;\r
+import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 \r
 public interface IMarkerService extends IVersionableService<Marker> {\r
@@ -17,9 +18,29 @@ public interface IMarkerService extends IVersionableService<Marker> {
         * @param pageSize The maximum number of markers returned (can be null for all markers)\r
         * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
         * @param orderHints may be null\r
-        * @param propertyPaths properties to initialize - see {@link BeanInitializer#initialize(Object, List)}\r
+        * @param propertyPaths properties to initialize - see {@link IBeanInitializer#initialize(Object, List)}\r
         * @return\r
         */\r
        public Pager<Marker> page(MarkerType markerType, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);\r
+       \r
+       /**\r
+        * \r
+        * @param creator the person who created those markers\r
+        * @param markerType the markerType of those markers (can be null)\r
+        * @param pageSize The maximum number of markers returned (can be null for all markers)\r
+        * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
+        * @param orderHints Properties to order by\r
+        * @param propertyPaths Properties to initialize in the returned entities, following the syntax described in {@link IBeanInitializer#initialize(Object, List)}\r
+        * @return a paged list of Marker instances\r
+        */\r
+    public Pager<Marker> list(User creator, MarkerType markerType, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);\r
+    \r
+    /**\r
+     * \r
+     * @param creator the person who created those markers\r
+     * @param markerType the markerType of those markers (can be null)\r
+     * @return\r
+     */\r
+    public int count(User creator, MarkerType markerType);\r
 \r
 }\r