Author: [log in to unmask]
Date: Thu Nov 13 11:51:07 2014
New Revision: 1506
Log:
Remove a few unused methods and other small changes.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java Thu Nov 13 11:51:07 2014
@@ -237,20 +237,6 @@
}
/**
- * Simple utility method to cast the generic <code>ConditionsManager</code>
- * to this class.
- * @param conditionsManager The <code>ConditionsManager</code>.
- * @return The <code>DatabaseConditionsManager</code> object.
- */
- public static DatabaseConditionsManager castFrom(ConditionsManager conditionsManager) {
- if (conditionsManager instanceof DatabaseConditionsManager) {
- return (DatabaseConditionsManager) conditionsManager;
- } else {
- throw new RuntimeException("The conditionsManager points to an object of the wrong type: " + conditionsManager.getClass().getCanonicalName());
- }
- }
-
- /**
* This method catches changes to the detector name and run number. It is
* actually called every time an lcsim event is created, so it has internal
* logic to figure out if the conditions system actually needs to be
@@ -280,10 +266,12 @@
* @param detectorName the name of the detector
*/
void setup(String detectorName) {
- if (!isConnected())
+ if (!isConnected()) {
+ // FIXME: Probably opening the connection should happen someplace else than here.
openConnection();
- else
+ } else {
logger.config("using existing connection " + connectionParameters.getConnectionString());
+ }
}
/**
@@ -515,14 +503,6 @@
}
}
return foundConditionsRecords;
- }
-
- /**
- * Return true if the connection parameters are valid, e.g. non-null.
- * @return true if connection parameters are non-null
- */
- public boolean hasConnectionParameters() {
- return connectionParameters != null;
}
/**
