Author: [log in to unmask] Date: Wed Sep 9 11:37:45 2015 New Revision: 3562 Log: Use RunManager to get DAO factory (fix compilation). Modified: java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java Modified: java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java ============================================================================= --- java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java (original) +++ java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java Wed Sep 9 11:37:45 2015 @@ -424,7 +424,7 @@ // Create factory for interfacing to run database. RunManager runManager = new RunManager(); runManager.setConnection(connection); - final RunDatabaseDaoFactory dbFactory = runManager.getDaoFactory(); + final RunDatabaseDaoFactory dbFactory = runManager.createDaoFactory(); // Create object for updating run info in the database. final RunSummaryDao runSummaryDao = dbFactory.createRunSummaryDao(); Modified: java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java ============================================================================= --- java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java (original) +++ java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java Wed Sep 9 11:37:45 2015 @@ -66,6 +66,21 @@ * The {@link RunSummary} for the current run. */ private RunSummary runSummary = null; + + /** + * Class constructor. + * + * @param connection the database connection + */ + public RunManager(Connection connection) { + this.connection = connection; + } + + /** + * Class constructor. + */ + public RunManager() { + } /** * Close the database connection. @@ -190,7 +205,7 @@ * * @return the database connection */ - public RunDatabaseDaoFactory getDaoFactory() { + public RunDatabaseDaoFactory createDaoFactory() { openConnection(); return new RunDatabaseDaoFactory(this.connection); } Modified: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java ============================================================================= --- java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java (original) +++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java Wed Sep 9 11:37:45 2015 @@ -18,6 +18,7 @@ import org.hps.run.database.EpicsVariable; import org.hps.run.database.EpicsVariableDao; import org.hps.run.database.RunDatabaseDaoFactory; +import org.hps.run.database.RunManager; /** * Setup session state for JSP that shows a run's EPICS data. @@ -54,7 +55,7 @@ try { connection = dataSource.getConnection(); - final RunDatabaseDaoFactory dbFactory = new RunDatabaseDaoFactory(connection); + final RunDatabaseDaoFactory dbFactory = new RunManager(connection).createDaoFactory(); epicsDataDao = dbFactory.createEpicsDataDao(); epicsDataList = epicsDataDao.getEpicsData(epicsType, run); Modified: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java ============================================================================= --- java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java (original) +++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java Wed Sep 9 11:37:45 2015 @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; -import org.hps.run.database.RunDatabaseDaoFactory; +import org.hps.run.database.RunManager; import org.hps.run.database.RunSummary; import org.hps.run.database.RunSummaryDao; @@ -72,7 +72,7 @@ Connection connection = null; try { connection = this.dataSource.getConnection(); - final RunSummaryDao runSummaryDao = new RunDatabaseDaoFactory(connection).createRunSummaryDao(); + final RunSummaryDao runSummaryDao = new RunManager(connection).createDaoFactory().createRunSummaryDao(); // This does a shallow read of all run summaries but does not load their complex state. runSummaries = runSummaryDao.getRunSummaries(); Modified: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java ============================================================================= --- java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java (original) +++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java Wed Sep 9 11:37:45 2015 @@ -13,6 +13,7 @@ import org.hps.record.scalers.ScalerData; import org.hps.run.database.RunDatabaseDaoFactory; +import org.hps.run.database.RunManager; import org.hps.run.database.ScalerDataDao; /** @@ -59,7 +60,7 @@ final Integer run = Integer.parseInt(request.getParameterValues("run")[0]); List<ScalerData> scalerDataList = null; try (Connection connection = this.dataSource.getConnection()) { - final ScalerDataDao scalarDataDao = new RunDatabaseDaoFactory(connection).createScalerDataDao(); + final ScalerDataDao scalarDataDao = new RunManager(connection).createDaoFactory().createScalerDataDao(); scalerDataList = scalarDataDao.getScalerData(run); } catch (final Exception e) { throw new RuntimeException(e);