Print

---

Author: [log in to unmask]
Date: Fri Aug 28 13:05:23 2015
New Revision: 3441

Log:
Revert addition of RunManager to JobManager; not sure I want these to be coupled.

Modified:
    java/trunk/record-util/src/main/java/org/hps/job/JobManager.java

Modified: java/trunk/record-util/src/main/java/org/hps/job/JobManager.java
 =============================================================================
--- java/trunk/record-util/src/main/java/org/hps/job/JobManager.java	(original)
+++ java/trunk/record-util/src/main/java/org/hps/job/JobManager.java	Fri Aug 28 13:05:23 2015
@@ -2,7 +2,6 @@
 
 import org.hps.conditions.ConditionsDriver;
 import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.rundb.RunManager;
 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 
@@ -25,11 +24,6 @@
     }
 
     /**
-     * Flag to enable the run database in a job (disabled by default).
-     */
-    private boolean enableRunDatabase = false;
-
-    /**
      * Class constructor.
      */
     public JobManager() {
@@ -43,7 +37,6 @@
         }
 
         // Always want to reset the conditions system before starting the job.
-        // FIXME: Should this happen in the run method instead?
         DatabaseConditionsManager.resetInstance();
     }
 
@@ -58,12 +51,6 @@
         // Setup the conditions if there is a ConditionsDriver present.
         this.setupConditions();
 
-        // Is usage of run database enabled?
-        if (this.enableRunDatabase) {
-            // Enable the run database.
-            this.setupRunManager();
-        }
-
         // Run the job.
         final boolean result = super.run();
 
@@ -71,15 +58,6 @@
         DatabaseConditionsManager.getInstance().closeConnection();
 
         return result;
-    }
-
-    /**
-     * Enable the run database.
-     *
-     * @param enableRunDatabase <code>true</code> to enable run database
-     */
-    public void setEnableRunDatabase(final boolean enableRunDatabase) {
-        this.enableRunDatabase = enableRunDatabase;
     }
 
     /**
@@ -99,12 +77,4 @@
             conditionsDriver.initialize();
         }
     }
-
-    /**
-     * Set the {@link org.hps.rundb.RunManager} for accessing the run database.
-     */
-    private void setupRunManager() {
-        final RunManager runManager = RunManager.getRunManager();
-        DatabaseConditionsManager.getInstance().addConditionsListener(runManager);
-    }
 }