X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Ftasks%2FMergedLists.java;h=e1740e6594766e1b3fdca508f1a629791e441241;hb=f13697a39e4e56f0d99632307f5531b1f07d7f45;hp=ab6f59efc960fd4a737c14c5c130acd1b4738a6a;hpb=a9b97cc33383ded70277f49aa287f84903334e70;p=gpl%2Fargeo-slc.git 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 ab6f59efc..e1740e659 100644 --- 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> { private List> lists = new ArrayList>(); public void setLists(List> lists) { this.lists = lists; } - public Object getObject() throws Exception { + public List getObject() throws Exception { List merged = new ArrayList(); for (List lst : lists) { merged.addAll(lst);