Author: [log in to unmask]
Date: Wed Nov 5 18:30:22 2014
New Revision: 1445
Log:
Remove unused ConditionsRecord fields from API and database HPSJAVA-296
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecord.java
java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml
java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecord.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecord.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecord.java Wed Nov 5 18:30:22 2014
@@ -65,22 +65,6 @@
}
/**
- * Get the starting valid time.
- * @return The starting valid time.
- */
- public Date getValidFrom() {
- return getFieldValue("valid_from");
- }
-
- /**
- * Get the ending valid time.
- * @return The ending valid time.
- */
- public Date getValidTo() {
- return getFieldValue("valid_to");
- }
-
- /**
* Get the name of the user who created this record.
* @return The name of the person who created the record.
*/
@@ -103,14 +87,6 @@
*/
public String getName() {
return getFieldValue("name");
- }
-
- /**
- * Get the version of the format these conditions are stored in.
- * @return The conditions version.
- */
- public String getFormatVersion() {
- return getFieldValue("format_version");
}
/**
@@ -151,11 +127,8 @@
buff.append("collectionId: " + getCollectionId() + '\n');
buff.append("updated: " + getUpdated() + '\n');
buff.append("created: " + getCreated() + '\n');
- buff.append("validFrom: " + getValidFrom() + '\n');
- buff.append("validTo: " + getValidTo() + '\n');
buff.append("tag: " + getTag() + '\n');
buff.append("createdBy: " + getCreatedBy() + '\n');
- buff.append("formatVersion: " + getFormatVersion() + '\n');
buff.append("notes: " + getNotes() + '\n');
return buff.toString();
}
Modified: java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml
=============================================================================
--- java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml (original)
+++ java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml Wed Nov 5 18:30:22 2014
@@ -39,12 +39,9 @@
<field name="run_end" />
<field name="updated" />
<field name="created" />
- <field name="valid_from" />
- <field name="valid_to" />
<field name="created_by" />
<field name="notes" />
<field name="name" />
- <field name="format_version" />
<field name="table_name" />
<field name="collection_id" />
</fields>
Modified: java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml
=============================================================================
--- java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml (original)
+++ java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml Wed Nov 5 18:30:22 2014
@@ -42,13 +42,10 @@
<field name="run_end" />
<field name="updated" />
<field name="created" />
- <field name="valid_from" />
- <field name="valid_to" />
<field name="tag" />
<field name="created_by" />
<field name="notes" />
<field name="name" />
- <field name="format_version" />
<field name="table_name" />
<field name="collection_id" />
</fields>
|