Fisheye: Tag 4227424058633c04349f03d61622e6ba22f5826c refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java (.../TaskListConditionDAOHibernate.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java (.../TaskListConditionDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -23,15 +23,18 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.taskList.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListConditionDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO */ -public class TaskListConditionDAOHibernate extends BaseDAOHibernate implements TaskListConditionDAO{ +@Repository +public class TaskListConditionDAOHibernate extends LAMSBaseDAO implements TaskListConditionDAO{ } \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java =================================================================== diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -25,8 +25,10 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskList; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListDAO. @@ -35,14 +37,15 @@ * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO */ -public class TaskListDAOHibernate extends BaseDAOHibernate implements TaskListDAO{ +@Repository +public class TaskListDAOHibernate extends LAMSBaseDAO implements TaskListDAO{ private static final String GET_RESOURCE_BY_CONTENTID = "from "+TaskList.class.getName()+" as r where r.contentId=?"; /** * {@inheritDoc} */ public TaskList getByContentId(Long contentId) { - List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID,contentId); + List list = doFind(GET_RESOURCE_BY_CONTENTID,contentId); if(list.size() > 0) return (TaskList) list.get(0); else @@ -60,7 +63,7 @@ * {@inheritDoc} */ public void delete(TaskList taskList) { - this.getHibernateTemplate().delete(taskList); + getSession().delete(taskList); } } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java =================================================================== diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java (.../TaskListItemAttachmentDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java (.../TaskListItemAttachmentDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -23,15 +23,18 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.taskList.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListItemAttachmentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO */ -public class TaskListItemAttachmentDAOHibernate extends BaseDAOHibernate implements TaskListItemAttachmentDAO{ +@Repository +public class TaskListItemAttachmentDAOHibernate extends LAMSBaseDAO implements TaskListItemAttachmentDAO{ } \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java =================================================================== diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java (.../TaskListItemCommentDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java (.../TaskListItemCommentDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -23,15 +23,18 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.taskList.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemCommentDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListItemCommentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemCommentDAO */ -public class TaskListItemCommentDAOHibernate extends BaseDAOHibernate implements TaskListItemCommentDAO{ +@Repository +public class TaskListItemCommentDAOHibernate extends LAMSBaseDAO implements TaskListItemCommentDAO{ } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java =================================================================== diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -25,24 +25,27 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListItem; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListItemDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemDAO */ -public class TaskListItemDAOHibernate extends BaseDAOHibernate implements TaskListItemDAO{ +@Repository +public class TaskListItemDAOHibernate extends LAMSBaseDAO implements TaskListItemDAO{ private static final String FIND_AUTHORING_ITEMS = "from " + TaskListItem.class.getName() + " where taskList_uid = ? order by sequence_Id asc"; /** * {@inheritDoc} */ public List getAuthoringItems(Long taskListUid) { - return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS,taskListUid); + return this.doFind(FIND_AUTHORING_ITEMS,taskListUid); } /** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListItemVisitDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO */ -public class TaskListItemVisitDAOHibernate extends BaseDAOHibernate implements TaskListItemVisitDAO{ +@Repository +public class TaskListItemVisitDAOHibernate extends LAMSBaseDAO implements TaskListItemVisitDAO{ private static final String FIND_BY_ITEM_AND_USER = "from " + TaskListItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.taskListItem.uid=?"; @@ -58,7 +61,7 @@ * {@inheritDoc} */ public TaskListItemVisitLog getTaskListItemLog(Long itemUid,Long userId){ - List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid}); + List list = doFind(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid}); if(list == null || list.size() ==0) return null; return (TaskListItemVisitLog) list.get(0); @@ -68,7 +71,7 @@ * {@inheritDoc} */ public int getTasksCompletedCountByUser(Long toolSessionId ,Long userUid) { - List list = getHibernateTemplate().find(FIND_TASKS_COMPLETED_COUNT_BY_USER, new Object[]{toolSessionId, userUid}); + List list = doFind(FIND_TASKS_COMPLETED_COUNT_BY_USER, new Object[]{toolSessionId, userUid}); if(list == null || list.size() ==0) return 0; return ((Number) list.get(0)).intValue(); @@ -77,7 +80,7 @@ // public Map getSummary(Long contentId) { // // // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long -// List result = getHibernateTemplate().find(FIND_SUMMARY,contentId); +// List result = doFind(FIND_SUMMARY,contentId); // Map summaryList = new HashMap (result.size()); // for(Object[] list : result){ // if ( list[1] != null ) { @@ -94,7 +97,7 @@ @SuppressWarnings("unchecked") public List getTaskListItemLogBySession(Long sessionId, Long itemUid) { - return (List) getHibernateTemplate().find(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid}); + return (List) doFind(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid}); } } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListSession; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListSessionDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO */ -public class TaskListSessionDAOHibernate extends BaseDAOHibernate implements TaskListSessionDAO{ +@Repository +public class TaskListSessionDAOHibernate extends LAMSBaseDAO implements TaskListSessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + TaskListSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + TaskListSession.class.getName() + " as p where p.taskList.contentId=?"; @@ -43,7 +46,7 @@ * {@inheritDoc} */ public TaskListSession getSessionBySessionId(Long sessionId) { - List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); + List list = doFind(FIND_BY_SESSION_ID,sessionId); if(list == null || list.size() == 0) return null; return (TaskListSession) list.get(0); @@ -54,14 +57,14 @@ */ @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId); + return (List) doFind(FIND_BY_CONTENT_ID,toolContentId); } /** * {@inheritDoc} */ public void delete(TaskListSession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } /** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r4227424058633c04349f03d61622e6ba22f5826c --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 4227424058633c04349f03d61622e6ba22f5826c) @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListUser; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of TaskListUserDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO */ -public class TaskListUserDAOHibernate extends BaseDAOHibernate implements TaskListUserDAO{ +@Repository +public class TaskListUserDAOHibernate extends LAMSBaseDAO implements TaskListUserDAO{ private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + TaskListUser.class.getName() + " as u where u.userId =? and u.taskList.contentId=?"; private static final String FIND_BY_USER_ID_SESSION_ID = "from " + TaskListUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?"; @@ -44,7 +47,7 @@ * {@inheritDoc} */ public TaskListUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId}); + List list = this.doFind(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId}); if(list == null || list.size() == 0) return null; return (TaskListUser) list.get(0); @@ -54,7 +57,7 @@ * {@inheritDoc} */ public TaskListUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId}); + List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId}); if(list == null || list.size() == 0) return null; return (TaskListUser) list.get(0); @@ -65,7 +68,7 @@ */ @SuppressWarnings("unchecked") public List getBySessionID(Long sessionId) { - return (List) this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); + return (List) this.doFind(FIND_BY_SESSION_ID,sessionId); } }