5 modified files
java/trunk/conditions/src/main/java/org/hps/conditions
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java 2014-05-23 22:54:05 UTC (rev 632)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java 2014-05-23 23:01:37 UTC (rev 633)
@@ -86,9 +86,11 @@
/**
* This method updates a new detector with SVT and ECal conditions data.
*/
+ // FIXME: Add here a check on the run number and if it is invalid then
+ // set a default before trying to load the conditions.
public void detectorChanged(Detector detector) {
// Load conditions onto the detector.
- loadSvtConditions(detector);
+ loadSvtConditions(detector);
loadEcalConditions(detector);
}
java/trunk/conditions/src/main/java/org/hps/conditions
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java 2014-05-23 22:54:05 UTC (rev 632)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectCollection.java 2014-05-23 23:01:37 UTC (rev 633)
@@ -6,8 +6,6 @@
import java.util.Iterator;
import java.util.List;
-// TODO: This class should have a reference to its ConditionsRecord.
-// TODO: Collections with a mix of different collection IDs on their objects should always be read only.
public class ConditionsObjectCollection<ObjectType extends ConditionsObject> implements Iterable<ObjectType> {
protected List<ObjectType> objects = new ArrayList<ObjectType>();
java/trunk/conditions/src/main/java/org/hps/conditions
--- java/trunk/conditions/src/main/java/org/hps/conditions/TableConstants.java 2014-05-23 22:54:05 UTC (rev 632)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/TableConstants.java 2014-05-23 23:01:37 UTC (rev 633)
@@ -12,6 +12,8 @@
* but usually they are the same value.
* </p>
*/
+// FIXME: This should really be called something like "ConditionsKeys" as the table names
+// are found in the XML configuration only.
public final class TableConstants {
private TableConstants() {
java/trunk/conditions/src/test/java/org/hps/conditions
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java 2014-05-23 22:54:05 UTC (rev 632)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java 2014-05-23 23:01:37 UTC (rev 633)
@@ -6,7 +6,6 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import java.util.logging.Level;
import junit.framework.TestCase;
java/trunk/conditions/src/test/java/org/hps/conditions
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java 2014-05-23 22:54:05 UTC (rev 632)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsObjectTest.java 2014-05-23 23:01:37 UTC (rev 633)
@@ -15,17 +15,17 @@
// TODO: Add test of collection operations similar to the one for individual objects.
public class ConditionsObjectTest extends TestCase {
- DatabaseConditionsManager _conditionsManager;
+ DatabaseConditionsManager conditionsManager;
public void setUp() {
- _conditionsManager = new DefaultTestSetup().configure().setup();
+ conditionsManager = new DefaultTestSetup().configure().setup();
}
public void testBasicOperations() throws ConditionsObjectException {
// Create a new collection, setting its table meta data and collection ID.
- TableMetaData tableMetaData = _conditionsManager.findTableMetaData(TableConstants.SVT_GAINS);
- int collectionId = _conditionsManager.getNextCollectionId(tableMetaData.getTableName());
+ TableMetaData tableMetaData = conditionsManager.findTableMetaData(TableConstants.SVT_GAINS);
+ int collectionId = conditionsManager.getNextCollectionId(tableMetaData.getTableName());
SvtGainCollection collection = new SvtGainCollection();
collection.setTableMetaData(tableMetaData);
try {
SVNspam 0.1