Fisheye: Tag 1.1.12.2 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java 4 Jul 2008 07:40:28 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetDAOHibernate.java 29 Nov 2014 21:43:20 -0000 1.1.12.1 @@ -25,20 +25,23 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; +import org.springframework.stereotype.Repository; /** * * @author Steve.Ni * * @version $Revision$ */ -public class SpreadsheetDAOHibernate extends BaseDAOHibernate implements SpreadsheetDAO{ +@Repository +public class SpreadsheetDAOHibernate extends LAMSBaseDAO implements SpreadsheetDAO{ private static final String GET_RESOURCE_BY_CONTENTID = "from "+Spreadsheet.class.getName()+" as r where r.contentId=?"; public Spreadsheet 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 (Spreadsheet) list.get(0); else @@ -50,7 +53,7 @@ } public void delete(Spreadsheet spreadsheet) { - this.getHibernateTemplate().delete(spreadsheet); + getSession().delete(spreadsheet); } } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetMarkDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetMarkDAOHibernate.java,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetMarkDAOHibernate.java 11 Jul 2008 08:19:57 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetMarkDAOHibernate.java 29 Nov 2014 21:43:20 -0000 1.1.12.1 @@ -23,10 +23,12 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetMarkDAO; -import org.lamsfoundation.lams.tool.spreadsheet.dao.UserModifiedSpreadsheetDAO; +import org.springframework.stereotype.Repository; -public class SpreadsheetMarkDAOHibernate extends BaseDAOHibernate implements SpreadsheetMarkDAO{ +@Repository +public class SpreadsheetMarkDAOHibernate extends LAMSBaseDAO implements SpreadsheetMarkDAO{ } \ No newline at end of file Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java 15 Aug 2014 09:31:09 -0000 1.1.12.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetSessionDAOHibernate.java 29 Nov 2014 21:43:20 -0000 1.1.12.2 @@ -25,28 +25,30 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetSessionDAO; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession; +import org.springframework.stereotype.Repository; - -public class SpreadsheetSessionDAOHibernate extends BaseDAOHibernate implements SpreadsheetSessionDAO{ +@Repository +public class SpreadsheetSessionDAOHibernate extends LAMSBaseDAO implements SpreadsheetSessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + SpreadsheetSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + SpreadsheetSession.class.getName() + " as p where p.spreadsheet.contentId=?"; public SpreadsheetSession 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 (SpreadsheetSession) list.get(0); } @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId); + return (List) doFind(FIND_BY_CONTENT_ID,toolContentId); } public void delete(SpreadsheetSession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } public void deleteBySessionId(Long toolSessionId) { this.removeObject(SpreadsheetSession.class,toolSessionId); Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java 15 Aug 2014 09:31:09 -0000 1.1.12.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java 29 Nov 2014 21:43:20 -0000 1.1.12.2 @@ -25,33 +25,35 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetUserDAO; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; +import org.springframework.stereotype.Repository; - -public class SpreadsheetUserDAOHibernate extends BaseDAOHibernate implements SpreadsheetUserDAO{ +@Repository +public class SpreadsheetUserDAOHibernate extends LAMSBaseDAO implements SpreadsheetUserDAO{ private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + SpreadsheetUser.class.getName() + " as u where u.userId =? and u.spreadsheet.contentId=?"; private static final String FIND_BY_USER_ID_SESSION_ID = "from " + SpreadsheetUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?"; private static final String FIND_BY_SESSION_ID = "from " + SpreadsheetUser.class.getName() + " as u where u.session.sessionId=?"; public SpreadsheetUser 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 (SpreadsheetUser) list.get(0); } public SpreadsheetUser 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 (SpreadsheetUser) list.get(0); } @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); } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/UserModifiedSpreadsheetDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/UserModifiedSpreadsheetDAOHibernate.java,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/UserModifiedSpreadsheetDAOHibernate.java 11 Jul 2008 08:19:57 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/UserModifiedSpreadsheetDAOHibernate.java 29 Nov 2014 21:43:20 -0000 1.1.12.1 @@ -23,13 +23,11 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.dao.hibernate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.UserModifiedSpreadsheetDAO; +import org.springframework.stereotype.Repository; -public class UserModifiedSpreadsheetDAOHibernate extends BaseDAOHibernate implements UserModifiedSpreadsheetDAO{ +@Repository +public class UserModifiedSpreadsheetDAOHibernate extends LAMSBaseDAO implements UserModifiedSpreadsheetDAO{ }