Author: [log in to unmask]
Date: Fri Apr 24 12:51:15 2015
New Revision: 2807
Log:
Miscellaneous changes to conditions dev branch.
Modified:
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/TableRegistry.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java Fri Apr 24 12:51:15 2015
@@ -290,8 +290,7 @@
/**
*
*/
- @Override
- public void setCollectionId(final int collectionId) throws ConditionsObjectException {
+ void setCollectionId(final int collectionId) throws ConditionsObjectException {
if (this.getCollectionId() != UNSET_COLLECTION_ID) {
throw new ConditionsObjectException("The collection ID is already set on this object.");
}
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java Fri Apr 24 12:51:15 2015
@@ -56,7 +56,8 @@
} else {
try {
// Set the collection ID on the object.
- object.setCollectionId(this.collectionId);
+ // FIXME: Uses concrete type instead of interface.
+ ((BaseConditionsObject) object).setCollectionId(this.collectionId);
} catch (final ConditionsObjectException e) {
throw new RuntimeException("Error assigning collection ID " + this.collectionId + " to object.", e);
}
@@ -296,7 +297,8 @@
throw new ConditionsObjectException("The collection ID on the object does not match.");
}
if (!object.hasValidCollection()) {
- object.setCollectionId(this.collectionId);
+ // FIXME: Uses concrete type instead of interface.
+ ((BaseConditionsObject) object).setCollectionId(this.collectionId);
}
}
}
@@ -327,7 +329,7 @@
}
@Override
- // FIXME: This method should execute a prepared statement in a transaction.
+ // FIXME: This method should execute a prepared statement in a transaction instead of performing individual updates.
public boolean update() throws DatabaseObjectException, SQLException {
boolean updated = false;
for (final ObjectType object : this.objects) {
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java Fri Apr 24 12:51:15 2015
@@ -25,12 +25,6 @@
<T> T getFieldValue(final String name);
- /**
- * @param collectionId
- * @throws ConditionsObjectException
- */
- void setCollectionId(int collectionId) throws ConditionsObjectException;
-
void setFieldValues(FieldValues fieldValues);
/**
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java Fri Apr 24 12:51:15 2015
@@ -11,13 +11,15 @@
int getCollectionId();
- // FIXME: Perhaps should not be part of interface.
+ // FIXME: Perhaps this should not be in the interface.
void setCollectionId(int id);
int size();
+ // FIXME: It might be better if this was external to this interface.
void sort(final Comparator<ObjectType> comparator);
+ // FIXME: It might be better if this was external to this interface.
ConditionsObjectCollection<ObjectType> sorted(final Comparator<ObjectType> comparator);
boolean contains(Object object);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/TableRegistry.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/TableRegistry.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/TableRegistry.java Fri Apr 24 12:51:15 2015
@@ -63,7 +63,7 @@
*
* @return the meta data registry
*/
- public static TableRegistry create() {
+ private static TableRegistry create() {
final TableRegistry registry = new TableRegistry();
for (final Class<? extends ConditionsObject> objectType : ConditionsObjectUtilities.findConditionsObjectTypes()) {
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Fri Apr 24 12:51:15 2015
@@ -256,7 +256,7 @@
/**
* Create the global registry of table meta data.
*/
- private final TableRegistry tableRegistry = TableRegistry.create();
+ private final TableRegistry tableRegistry = TableRegistry.getTableRegistry();
/**
* The currently active conditions tag.
