lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- ObjectToClusterWrapper.java	2 Jan 2006 21:17:50 -0000	1.1
+++ ObjectToClusterWrapper.java	16 Jan 2006 21:01:22 -0000	1.2
@@ -1,6 +1,7 @@

 package org.lcsim.recon.cluster.util;
 
 import java.util.List;

+import java.util.Collection;

 import org.lcsim.event.Cluster;
 
 /**

@@ -9,7 +10,7 @@

   * into a list of clusters). If it can't handle an object, it throws
   * an UnwrappableObjectException.
   *

-  * @version $Id: ObjectToClusterWrapper.java,v 1.1 2006/01/02 21:17:50 mcharles Exp $

+  * @version $Id: ObjectToClusterWrapper.java,v 1.2 2006/01/16 21:01:22 mcharles Exp $

   */
 
 public interface ObjectToClusterWrapper

@@ -22,13 +23,13 @@

     /**
       * Wrap a list of objects into a list of clusters.
       */

-    public List<Cluster> wrapListOfObjects(List inputList) throws UnwrappableObjectException;

+    public List<Cluster> wrapListOfObjects(Collection inputList) throws UnwrappableObjectException;

 
     /**
       * Wrap a list of objects into a list of clusters, allowing user to 
       * specify the empty list (outputList) which will hold the clusters.
       */

-    public List<Cluster> wrapListOfObjects(List inputList, List<Cluster> outputList) throws UnwrappableObjectException;

+    public List<Cluster> wrapListOfObjects(Collection inputList, List<Cluster> outputList) throws UnwrappableObjectException;

 
 }
 

lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- BasicObjectToClusterWrapper.java	2 Jan 2006 21:17:50 -0000	1.1
+++ BasicObjectToClusterWrapper.java	16 Jan 2006 21:01:22 -0000	1.2
@@ -1,5 +1,6 @@

 package org.lcsim.recon.cluster.util;
 

+import java.util.Collection;

 import java.util.List;
 import java.util.ArrayList;
 

@@ -14,7 +15,7 @@

   * an UnwrappableObjectException. In this implementation, the
   * input objects must be instances of Cluster or CalorimeterHit.
   *

-  * @version $Id: BasicObjectToClusterWrapper.java,v 1.1 2006/01/02 21:17:50 mcharles Exp $

+  * @version $Id: BasicObjectToClusterWrapper.java,v 1.2 2006/01/16 21:01:22 mcharles Exp $

   */
 
 public class BasicObjectToClusterWrapper implements ObjectToClusterWrapper

@@ -45,7 +46,7 @@

       * Wrap a list of objects (Cluster or CalorimeterHit) into a newly
       * created list of Clusters.
       */

-    public List<Cluster> wrapListOfObjects(List inputList) throws UnwrappableObjectException {

+    public List<Cluster> wrapListOfObjects(Collection inputList) throws UnwrappableObjectException {

       List<Cluster> emptyList = new ArrayList<Cluster>();
       try {
         return wrapListOfObjects(inputList, emptyList);

@@ -58,7 +59,7 @@

       * Wrap a list of objects into a list of clusters, allowing user to
       * specify the empty list (outputList) which will hold the clusters.
       */

-    public List<Cluster> wrapListOfObjects(List inputList, List<Cluster> outputList) throws UnwrappableObjectException {

+    public List<Cluster> wrapListOfObjects(Collection inputList, List<Cluster> outputList) throws UnwrappableObjectException {

       outputList.clear();
       if (!outputList.isEmpty()) { throw new AssertionError("Non-empty output list at start of method."); }
       for (Object obj : inputList) {