Author: [log in to unmask]
Date: Mon Apr 27 18:39:04 2015
New Revision: 2839

Log:
Change method for getting new collection ID.

Modified:
    java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
    java/branches/HPSJAVA-488/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java

Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
 =============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java	(original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java	Mon Apr 27 18:39:04 2015
@@ -95,13 +95,12 @@
         for (final Entry<Integer, BeamConditions> entry : beamMap.entrySet()) {
             final int run = entry.getKey();
             final BeamConditions beam = entry.getValue();
-            final int collectionId = manager.addCollection("beam", "ImportBeamConditionsEngRun created collection by "
-                    + System.getProperty("user.name"), null);
+            System.out.println(beam);
+            final BeamConditionsCollection collection = new BeamConditionsCollection();
+            final int collectionId = manager.getCollectionId(collection, null);
             final ConditionsRecord record = new ConditionsRecord(collectionId, run, run, "beam", "beam",
                     "imported from HPS_Runs.pdf", "eng_run");
             System.out.println(record);
-            System.out.println(beam);
-            final BeamConditionsCollection collection = new BeamConditionsCollection();
             collection.add(beam);
             manager.insertCollection(collection);
             record.insert();

Modified: java/branches/HPSJAVA-488/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java
 =============================================================================
--- java/branches/HPSJAVA-488/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java	(original)
+++ java/branches/HPSJAVA-488/conditions/src/test/java/org/hps/conditions/database/CollectionIdTest.java	Mon Apr 27 18:39:04 2015
@@ -6,6 +6,8 @@
 import java.sql.SQLException;
 
 import junit.framework.TestCase;
+
+import org.hps.conditions.dummy.DummyConditionsObject.DummyConditionsObjectCollection;
 
 /**
  * Test adding a new collection and getting its unique ID.
@@ -43,10 +45,13 @@
      * @throws SQLException if there is an error executing SQL queries
      */
     public void testCollectionId() throws SQLException {
-        int collectionId = this.manager.addCollection("dummy", "test add", "foo bar baz");
+    	
+    	DummyConditionsObjectCollection collection = manager.newCollection(DummyConditionsObjectCollection.class);
+    	
+        int collectionId = this.manager.getCollectionId(collection, "test add", "foo bar baz");
         System.out.println("created new collection " + collectionId);
 
-        collectionId = this.manager.addCollection("dummy", null, null);
+        collectionId = this.manager.getCollectionId(collection, null, null);
         System.out.println("created new collection " + collectionId);
     }
 }