Adapt to changes in Spring and OSGi (mostly generics)

[gpl/argeo-slc.git] / org.argeo.slc.core / src / org / argeo / slc / core / execution / tasks / MergedLists.java

diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/execution/tasks/MergedLists.java b/org.argeo.slc.core/src/org/argeo/slc/core/execution/tasks/MergedLists.java
index ab6f59efc960fd4a737c14c5c130acd1b4738a6a..e1740e6594766e1b3fdca508f1a629791e441241 100644 (file)
--- a/org.argeo.slc.core/src/org/argeo/slc/core/execution/tasks/MergedLists.java
+++ b/org.argeo.slc.core/src/org/argeo/slc/core/execution/tasks/MergedLists.java
@@ -21,14 +21,14 @@ import java.util.List;
 import org.springframework.beans.factory.FactoryBean;
 
 /** Merge the provided lists in one single list, in the order provided. */
-public class MergedLists implements FactoryBean {
+public class MergedLists implements FactoryBean<List<Object>> {
        private List<List<Object>> lists = new ArrayList<List<Object>>();
 
        public void setLists(List<List<Object>> lists) {
                this.lists = lists;
        }
 
-       public Object getObject() throws Exception {
+       public List<Object> getObject() throws Exception {
                List<Object> merged = new ArrayList<Object>();
                for (List<Object> lst : lists) {
                        merged.addAll(lst);