Print

Print


Author: [log in to unmask]
Date: Thu Nov 13 11:54:13 2014
New Revision: 1509

Log:
Remove usage of method deleted from DatabaseConditionsManager.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectConverter.java
    java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectConverter.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectConverter.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObjectConverter.java	Thu Nov 13 11:54:13 2014
@@ -42,9 +42,8 @@
 
         // System.out.println("finding conditions for key " + name + " ...");
 
-        // Get the DatabaseConditionsManager which is required for using this
-        // converter.
-        DatabaseConditionsManager databaseConditionsManager = DatabaseConditionsManager.castFrom(conditionsManager);
+        // Get the DatabaseConditionsManager which is required for using this converter.
+        DatabaseConditionsManager databaseConditionsManager = DatabaseConditionsManager.getInstance();
 
         // Get the table meta data from the key given by the caller.
         TableMetaData tableMetaData = databaseConditionsManager.findTableMetaData(name);

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsRecordConverter.java	Thu Nov 13 11:54:13 2014
@@ -24,7 +24,7 @@
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public ConditionsRecordCollection getData(ConditionsManager manager, String name) {
 
-        DatabaseConditionsManager databaseConditionsManager = DatabaseConditionsManager.castFrom(manager);
+        DatabaseConditionsManager databaseConditionsManager = DatabaseConditionsManager.getInstance();
         TableMetaData tableMetaData = databaseConditionsManager.findTableMetaData(name);
 
         if (tableMetaData == null)