Author: [log in to unmask]
Date: Thu Mar 5 20:15:37 2015
New Revision: 2285
Log:
Use conditions record for collection ID if set.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/api/AbstractConditionsObjectCollection.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/AbstractConditionsObjectCollection.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/AbstractConditionsObjectCollection.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/AbstractConditionsObjectCollection.java Thu Mar 5 20:15:37 2015
@@ -99,10 +99,14 @@
/**
* Get the collection ID.
- * @return
+ * @return
*/
public int getCollectionId() {
- return collectionId;
+ if (conditionsRecord != null) {
+ return conditionsRecord.getCollectionId();
+ } else {
+ return collectionId;
+ }
}
/**
@@ -126,11 +130,9 @@
this.collectionId = collectionId;
}
- public void insert() throws ConditionsObjectException, SQLException {
-
+ public void insert() throws ConditionsObjectException, SQLException {
// TODO: First check here if conditions record and/or collection ID is assigned already,
- // in which case an error should be thrown as this is not a new collection.
-
+ // in which case an error should be thrown as this is not a new collection.
DatabaseConditionsManager.getInstance().insertCollection(this);
}
|