Commit in java/trunk/conditions/src on MAIN
main/java/org/hps/conditions/HpsConditionsDriver.java+2-21036 -> 1037
                            /TestRunConditionsDriver.java+2-21036 -> 1037
test/java/org/hps/conditions/ConditionsDriverTest.java+2-21036 -> 1037
test/java/org/hps/conditions/beam/BeamCurrentTest.java+2-31036 -> 1037
test/java/org/hps/conditions/ecal/PhysicalToGainTest.java+1-21036 -> 1037
+9-11
5 modified files
Change the name of the abstract class ConditionsDriver to AbstractConditionsDriver.
java/trunk/conditions/src/main/java/org/hps/conditions
HpsConditionsDriver.java 1036 -> 1037
--- java/trunk/conditions/src/main/java/org/hps/conditions/HpsConditionsDriver.java	2014-09-17 18:01:56 UTC (rev 1036)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/HpsConditionsDriver.java	2014-09-17 18:15:57 UTC (rev 1037)
@@ -1,14 +1,14 @@

 package org.hps.conditions;
 
 /**

- * This {@link org.lcsim.util.Driver} is a subclass of {@link ConditionsDriver}

+ * This {@link org.lcsim.util.Driver} is a subclass of {@link AbstractConditionsDriver}

  * and specifies the database connection parameters and configuration for the
  * development database. 
  * 
  * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>
  */

-public class HpsConditionsDriver extends ConditionsDriver {

+public class HpsConditionsDriver extends AbstractConditionsDriver {

 
     // Default conditions system XML config, which is for the Test Run 2012 database.
     static final String DB_CONFIG = "/org/hps/conditions/config/conditions_dev.xml";
java/trunk/conditions/src/main/java/org/hps/conditions
TestRunConditionsDriver.java 1036 -> 1037
--- java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java	2014-09-17 18:01:56 UTC (rev 1036)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java	2014-09-17 18:15:57 UTC (rev 1037)
@@ -1,14 +1,14 @@

 package org.hps.conditions;
 
 /**

- * This {@link org.lcsim.util.Driver} is a subclass of {@link ConditionsDriver}

+ * This {@link org.lcsim.util.Driver} is a subclass of {@link AbstractConditionsDriver}

  * and specifies the database connection parameters and configuration for the
  * test run database. 
  * 
  * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>
  */

-public class TestRunConditionsDriver extends ConditionsDriver {

+public class TestRunConditionsDriver extends AbstractConditionsDriver {

 
 	// Default conditions system XML config, which is for the Test Run 2012 database.
     static final String TEST_RUN_CONFIG = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
java/trunk/conditions/src/test/java/org/hps/conditions
ConditionsDriverTest.java 1036 -> 1037
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-17 18:01:56 UTC (rev 1036)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java	2014-09-17 18:15:57 UTC (rev 1037)
@@ -15,7 +15,7 @@

 import org.lcsim.util.loop.LCSimLoop;
 
 /**

- * This class tests that {@link org.lcsim.hps.conditions.ConditionsDriver} works correctly

+ * This class tests that {@link org.lcsim.hps.conditions.TestRunConditionsDriver} works correctly

  * by checking the number of runs it processes.
  * @author Jeremy McCormick <[log in to unmask]>
  */

@@ -42,7 +42,7 @@

 
         // Configure the loop.
         loop.setLCIORecordSource(testFile);

-        ConditionsDriver conditionsDriver = new TestRunConditionsDriver();

+        TestRunConditionsDriver conditionsDriver = new TestRunConditionsDriver();

         conditionsDriver.setLoadSvtConditions(false);
         loop.add(conditionsDriver);
         RunNumberDriver runNumberDriver = new RunNumberDriver();
java/trunk/conditions/src/test/java/org/hps/conditions/beam
BeamCurrentTest.java 1036 -> 1037
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-17 18:01:56 UTC (rev 1036)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java	2014-09-17 18:15:57 UTC (rev 1037)
@@ -9,8 +9,7 @@

 
 import junit.framework.TestCase;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TestRunConditionsDriver; 

+import org.hps.conditions.TestRunConditionsDriver;

 import org.hps.conditions.beam.BeamCurrent.BeamCurrentCollection;
 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.event.EventHeader;

@@ -58,7 +57,7 @@

 
         // Configure and run the loop.
         loop.setLCIORecordSource(testFile);

-        ConditionsDriver conditionsDriver = new TestRunConditionsDriver();

+        TestRunConditionsDriver conditionsDriver = new TestRunConditionsDriver();

         conditionsDriver.setLoadSvtConditions(false);
         loop.add(conditionsDriver);
         loop.add(new BeamCurrentChecker());
java/trunk/conditions/src/test/java/org/hps/conditions/ecal
PhysicalToGainTest.java 1036 -> 1037
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-17 18:01:56 UTC (rev 1036)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/PhysicalToGainTest.java	2014-09-17 18:15:57 UTC (rev 1037)
@@ -6,7 +6,6 @@

 
 import junit.framework.TestCase;
 

-import org.hps.conditions.ConditionsDriver;

 import org.hps.conditions.TableConstants;
 import org.hps.conditions.TestRunConditionsDriver;
 import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;

@@ -44,7 +43,7 @@

 
         // Configure the loop.
         loop.setLCIORecordSource(testFile);

-        ConditionsDriver conditionsDriver = new TestRunConditionsDriver();

+        TestRunConditionsDriver conditionsDriver = new TestRunConditionsDriver();

         conditionsDriver.setLoadSvtConditions(false);
         loop.add(conditionsDriver);
         loop.add(new PhysicalToGainDriver());
SVNspam 0.1