Author: [log in to unmask]
Date: Mon Dec 15 22:42:31 2014
New Revision: 1746
Log:
Simplify ConditionsSeries API so it extends a Java collection type.
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 Mon Dec 15 22:42:31 2014
@@ -1,7 +1,6 @@
package org.hps.conditions.api;
import java.util.ArrayList;
-import java.util.List;
/**
* This class represents a series of collections containing
@@ -11,34 +10,13 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
@SuppressWarnings("rawtypes")
-public class ConditionsSeries {
-
- List<AbstractConditionsObjectCollection> collections = new ArrayList<AbstractConditionsObjectCollection>();
-
- public AbstractConditionsObjectCollection getCollection(int series) {
- return collections.get(series);
- }
-
- public int addCollection(AbstractConditionsObjectCollection collection) {
- if (collections.contains(collection))
- throw new IllegalArgumentException("The collection is already registered with this object.");
- collections.add(collection);
- return collections.indexOf(collection);
- }
-
- public int getNumberOfCollections() {
- return collections.size();
- }
+public class ConditionsSeries extends ArrayList<AbstractConditionsObjectCollection> {
public AbstractConditionsObjectCollection findCollection(ConditionsRecord record) {
- for (AbstractConditionsObjectCollection collection : collections) {
+ for (AbstractConditionsObjectCollection collection : this) {
if (collection.conditionsRecord == record)
return collection;
}
return null;
- }
-
- public List<AbstractConditionsObjectCollection> getCollections() {
- return collections;
- }
+ }
}
|