Print

---

Author: [log in to unmask]
Date: Thu Jan  1 23:09:33 2015
New Revision: 1821

Log:
Add type arguments to ConditionsSeries.  (Still not final form but better now.)

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsSeries.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsSeries.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsSeries.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsSeries.java	Thu Jan  1 23:09:33 2015
@@ -1,6 +1,7 @@
 package org.hps.conditions.api;
 
 import java.util.ArrayList;
+
 
 /**
  * This class represents a series of collections containing
@@ -9,14 +10,15 @@
  * 
  * @author Jeremy McCormick <[log in to unmask]>
  */
-@SuppressWarnings("rawtypes")
-public class ConditionsSeries extends ArrayList<AbstractConditionsObjectCollection> {
+@SuppressWarnings({ "serial" })
+// FIXME: The CollectionType and ObjectType should possibly not use "extend".
+public class ConditionsSeries<ObjectType extends ConditionsObject, CollectionType extends ConditionsObjectCollection<ObjectType>> extends ArrayList<ConditionsObjectCollection<ObjectType>> {
 
-    public AbstractConditionsObjectCollection findCollection(ConditionsRecord record) {
-        for (AbstractConditionsObjectCollection collection : this) {
-            if (collection.conditionsRecord == record)
-                return collection;
-        }
-        return null;
-    }   
-}
+    Class<CollectionType> collectionType;
+    Class<ObjectType> objectType;
+    
+    public ConditionsSeries(Class<ObjectType> objectType, Class<CollectionType> collectionType) {
+        this.collectionType = collectionType;
+        this.objectType = objectType;
+    }
+}