[gee-svn] SF.net SVN: gabel: [181] trunk/gee/src/java/edu/indiana/psych/gee
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [181] trunk/gee/src/java/edu/indiana/psych/gee
|
From: <al...@us...> - 2006-05-18 05:44:06
|
Revision: 181 Author: alllee Date: 2006-05-17 22:43:53 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=181&view=rev Log Message: ----------- package refactoring, adding a dao subpackage. Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentService.java Added Paths: ----------- trunk/gee/src/java/edu/indiana/psych/gee/dao/ trunk/gee/src/java/edu/indiana/psych/gee/dao/ConsentFormDao.java trunk/gee/src/java/edu/indiana/psych/gee/dao/ExperimentConfigurationDao.java trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateConsentFormDao.java trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateExperimentConfigurationDao.java Removed Paths: ------------- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationDao.java trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateExperimentConfigurationDao.java Copied: trunk/gee/src/java/edu/indiana/psych/gee/dao/ConsentFormDao.java (from rev 180, trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/dao/ConsentFormDao.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/dao/ConsentFormDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -0,0 +1,23 @@ +package edu.indiana.psych.gee.dao; + +import org.springframework.transaction.annotation.Transactional; + +import edu.indiana.psych.gee.bean.ConsentForm; + +/** + * $Id: Exp$ + * + * Data access object for consent forms. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision: $ + */ + +@Transactional +public interface ConsentFormDao { + + public ConsentForm find(Integer id); + + public void persist(ConsentForm consentForm); + +} Copied: trunk/gee/src/java/edu/indiana/psych/gee/dao/ExperimentConfigurationDao.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationDao.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/dao/ExperimentConfigurationDao.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/dao/ExperimentConfigurationDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -0,0 +1,26 @@ +package edu.indiana.psych.gee.dao; + +import org.springframework.transaction.annotation.Transactional; + +import edu.indiana.psych.gee.ExperimentConfiguration; + +/** + * $Id$ + * + * Data access object for persisting experiment configurations, should also + * take care of experiment round parameters. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision$ + */ + +@Transactional +public interface ExperimentConfigurationDao { + + public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id); + + public <E extends ExperimentConfiguration> E find(final Class<E> configurationClass, final String experimentName); + + public void persist(ExperimentConfiguration configuration); + +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/dao/ExperimentConfigurationDao.java ___________________________________________________________________ Name: svn:keywords + Date Revision Id Copied: trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateConsentFormDao.java (from rev 180, trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateConsentFormDao.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateConsentFormDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -0,0 +1,26 @@ +package edu.indiana.psych.gee.dao; + +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +import edu.indiana.psych.gee.bean.ConsentForm; + +/** + * $Id$ + * + * Hibernate data access object for consent forms. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision$ + */ + +public class HibernateConsentFormDao extends HibernateDaoSupport implements ConsentFormDao { + + public ConsentForm find(Integer id) { + return (ConsentForm) getHibernateTemplate().get(ConsentForm.class, id); + } + + public void persist(ConsentForm consentForm) { + getHibernateTemplate().saveOrUpdate(consentForm); + } + +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateConsentFormDao.java ___________________________________________________________________ Name: svn:keywords + Date Revision Id Copied: trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateExperimentConfigurationDao.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateExperimentConfigurationDao.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateExperimentConfigurationDao.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/dao/HibernateExperimentConfigurationDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -0,0 +1,48 @@ +package edu.indiana.psych.gee.dao; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.criterion.Restrictions; +import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +import edu.indiana.psych.gee.ExperimentConfiguration; + +/** + * $Id: Exp $ + * + * Data access object for persisting experiment configurations, should also + * take care of experiment round parameters. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision: $ + */ + +public class HibernateExperimentConfigurationDao extends HibernateDaoSupport implements ExperimentConfigurationDao { + + private final Log logger = LogFactory.getLog(getClass()); + + public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id) { + return configurationClass.cast(getHibernateTemplate().get(configurationClass, id)); + } + + public <E extends ExperimentConfiguration> E find(final Class<E> configurationClass, final String experimentName) { + return configurationClass.cast( + getHibernateTemplate().execute(new HibernateCallback() { + public Object doInHibernate(Session session) throws HibernateException { + logger.warn("doInHibernate session is: " + session.hashCode()); + Criteria criteria = session.createCriteria(configurationClass); + criteria.add(Restrictions.eq("experimentName", experimentName)); + return criteria.uniqueResult(); + } + })); + } + + public void persist(ExperimentConfiguration configuration) { + getHibernateTemplate().saveOrUpdate(configuration); + } + +} Deleted: trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -1,23 +0,0 @@ -package edu.indiana.psych.gee.service; - -import org.springframework.transaction.annotation.Transactional; - -import edu.indiana.psych.gee.bean.ConsentForm; - -/** - * $Id: Exp$ - * - * Data access object for consent forms. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision: $ - */ - -@Transactional -public interface ConsentFormDao { - - public ConsentForm find(Integer id); - - public void persist(ConsentForm consentForm); - -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java 2006-05-18 05:43:53 UTC (rev 181) @@ -3,6 +3,7 @@ import java.util.List; import edu.indiana.psych.gee.bean.ConsentForm; +import edu.indiana.psych.gee.dao.ConsentFormDao; /** * $Id: Exp $ Deleted: trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationDao.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -1,26 +0,0 @@ -package edu.indiana.psych.gee.service; - -import org.springframework.transaction.annotation.Transactional; - -import edu.indiana.psych.gee.ExperimentConfiguration; - -/** - * $Id$ - * - * Data access object for persisting experiment configurations, should also - * take care of experiment round parameters. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision$ - */ - -@Transactional -public interface ExperimentConfigurationDao { - - public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id); - - public <E extends ExperimentConfiguration> E find(final Class<E> configurationClass, final String experimentName); - - public void persist(ExperimentConfiguration configuration); - -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java 2006-05-18 05:43:53 UTC (rev 181) @@ -1,8 +1,7 @@ package edu.indiana.psych.gee.service; -import java.io.InputStream; - import edu.indiana.psych.gee.ExperimentConfiguration; +import edu.indiana.psych.gee.dao.ExperimentConfigurationDao; /** * $Id: Exp $ @@ -18,7 +17,7 @@ public class ExperimentConfigurationService { private ExperimentConfigurationDao experimentConfigurationDao; - private ConsentFormDao consentFormDao; +// private ConsentFormDao consentFormDao; public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id) { return experimentConfigurationDao.find(configurationClass, id); @@ -47,8 +46,8 @@ this.experimentConfigurationDao = experimentConfigurationDao; } - public void setConsentFormDao(ConsentFormDao consentFormDao) { - this.consentFormDao = consentFormDao; - } +// public void setConsentFormDao(ConsentFormDao consentFormDao) { +// this.consentFormDao = consentFormDao; +// } } Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentService.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentService.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentService.java 2006-05-18 05:43:53 UTC (rev 181) @@ -20,6 +20,7 @@ */ public class ExperimentService { + @SuppressWarnings("serial") private final Map<String, Experiment> allExperiments = new HashMap<String, Experiment>() { public Experiment get(String key) { Deleted: trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -1,26 +0,0 @@ -package edu.indiana.psych.gee.service; - -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import edu.indiana.psych.gee.bean.ConsentForm; - -/** - * $Id$ - * - * Hibernate data access object for consent forms. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision$ - */ - -public class HibernateConsentFormDao extends HibernateDaoSupport implements ConsentFormDao { - - public ConsentForm find(Integer id) { - return (ConsentForm) getHibernateTemplate().get(ConsentForm.class, id); - } - - public void persist(ConsentForm consentForm) { - getHibernateTemplate().saveOrUpdate(consentForm); - } - -} Deleted: trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateExperimentConfigurationDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateExperimentConfigurationDao.java 2006-05-18 05:18:18 UTC (rev 180) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateExperimentConfigurationDao.java 2006-05-18 05:43:53 UTC (rev 181) @@ -1,48 +0,0 @@ -package edu.indiana.psych.gee.service; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import edu.indiana.psych.gee.ExperimentConfiguration; - -/** - * $Id: Exp $ - * - * Data access object for persisting experiment configurations, should also - * take care of experiment round parameters. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision: $ - */ - -public class HibernateExperimentConfigurationDao extends HibernateDaoSupport implements ExperimentConfigurationDao { - - private final Log logger = LogFactory.getLog(getClass()); - - public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id) { - return configurationClass.cast(getHibernateTemplate().get(configurationClass, id)); - } - - public <E extends ExperimentConfiguration> E find(final Class<E> configurationClass, final String experimentName) { - return configurationClass.cast( - getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - logger.warn("doInHibernate session is: " + session.hashCode()); - Criteria criteria = session.createCriteria(configurationClass); - criteria.add(Restrictions.eq("experimentName", experimentName)); - return criteria.uniqueResult(); - } - })); - } - - public void persist(ExperimentConfiguration configuration) { - getHibernateTemplate().saveOrUpdate(configuration); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
