Fisheye: Tag 1.1.12.2 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/Attic/ImageCommentDAOHibernate.java,v diff -u -r1.3 -r1.3.10.1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java 4 Dec 2008 12:01:36 -0000 1.3 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.3.10.1 @@ -25,25 +25,28 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ImageCommentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO */ -public class ImageCommentDAOHibernate extends BaseDAOHibernate implements ImageCommentDAO { +@Repository +public class ImageCommentDAOHibernate extends LAMSBaseDAO implements ImageCommentDAO { private static final String FIND_BY_UID = "from " + ImageComment.class.getName() + " as r where r.uid = ?"; - public ImageComment getCommentByUid(Long commentUid) { - List list = getHibernateTemplate().find(FIND_BY_UID, commentUid); - if (list == null || list.size() == 0) - return null; - return (ImageComment) list.get(0); - } + public ImageComment getCommentByUid(Long commentUid) { + List list = doFind(FIND_BY_UID, commentUid); + if (list == null || list.size() == 0) + return null; + return (ImageComment) list.get(0); + } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java 15 Aug 2014 09:59:11 -0000 1.1.12.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.1.12.2 @@ -23,28 +23,22 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryConfigItemDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class ImageGalleryConfigItemDAOHibernate extends BaseDAO implements ImageGalleryConfigItemDAO { +@Repository +public class ImageGalleryConfigItemDAOHibernate extends LAMSBaseDAO implements ImageGalleryConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from ImageGalleryConfigItem configuration" + " where configuration.configKey=:key"; - public ImageGalleryConfigItem getConfigItemByKey(final String configKey) { - return (ImageGalleryConfigItem) getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); - } - }); + public ImageGalleryConfigItem getConfigItemByKey(final String configKey) { + return (ImageGalleryConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); + } - } - - public void saveOrUpdate(ImageGalleryConfigItem mdlForumConfigItem) { - this.getHibernateTemplate().saveOrUpdate(mdlForumConfigItem); - this.getHibernateTemplate().flush(); - } + public void saveOrUpdate(ImageGalleryConfigItem mdlForumConfigItem) { + getSession().saveOrUpdate(mdlForumConfigItem); + getSession().flush(); + } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java 11 Oct 2008 12:04:14 -0000 1.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryDAOHibernate.java 29 Nov 2014 20:01:07 -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.imageGallery.dao.ImageGalleryDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; +import org.springframework.stereotype.Repository; /** * * @author Steve.Ni * * @version $Revision$ */ -public class ImageGalleryDAOHibernate extends BaseDAOHibernate implements ImageGalleryDAO{ +@Repository +public class ImageGalleryDAOHibernate extends LAMSBaseDAO implements ImageGalleryDAO{ private static final String GET_RESOURCE_BY_CONTENTID = "from "+ImageGallery.class.getName()+" as r where r.contentId=?"; public ImageGallery 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 (ImageGallery) list.get(0); else @@ -50,7 +53,7 @@ } public void delete(ImageGallery imageGallery) { - this.getHibernateTemplate().delete(imageGallery); + getSession().delete(imageGallery); } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java 8 Nov 2012 18:01:00 -0000 1.3 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.3.2.1 @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; +import org.springframework.stereotype.Repository; -public class ImageGalleryItemDAOHibernate extends BaseDAOHibernate implements ImageGalleryItemDAO { +@Repository +public class ImageGalleryItemDAOHibernate extends LAMSBaseDAO implements ImageGalleryItemDAO { private static final String FIND_AUTHORING_ITEMS = "from " + ImageGalleryItem.class.getName() + " where imageGallery_uid = ? order by create_date asc"; public List getAuthoringItems(Long imageGalleryUid) { - return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, imageGalleryUid); + return this.doFind(FIND_AUTHORING_ITEMS, imageGalleryUid); } @Override Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java,v diff -u -r1.6.2.1 -r1.6.2.2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java 15 Aug 2014 09:30:55 -0000 1.6.2.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.6.2.2 @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemVisitDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; +import org.springframework.stereotype.Repository; -public class ImageGalleryItemVisitDAOHibernate extends BaseDAOHibernate implements ImageGalleryItemVisitDAO { +@Repository +public class ImageGalleryItemVisitDAOHibernate extends LAMSBaseDAO implements ImageGalleryItemVisitDAO { private static final String FIND_BY_ITEM_AND_USER = "from " + ImageGalleryItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.imageGalleryItem.uid=?"; @@ -40,14 +43,14 @@ + ImageGalleryItemVisitLog.class.getName() + " as r where r.sessionId=? and r.user.userId =?"; public ImageGalleryItemVisitLog getImageGalleryItemLog(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 (ImageGalleryItemVisitLog) list.get(0); } public int getUserViewLogCount(Long toolSessionId, Long userUid) { - List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); + List list = doFind(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userUid }); if (list == null || list.size() == 0) return 0; return ((Number) list.get(0)).intValue(); @@ -56,7 +59,7 @@ @SuppressWarnings("unchecked") public List getImageGalleryItemLogBySession(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_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java 15 Aug 2014 09:30:55 -0000 1.1.12.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java 29 Nov 2014 20:01:07 -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.imageGallery.dao.ImageGallerySessionDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession; +import org.springframework.stereotype.Repository; - -public class ImageGallerySessionDAOHibernate extends BaseDAOHibernate implements ImageGallerySessionDAO{ +@Repository +public class ImageGallerySessionDAOHibernate extends LAMSBaseDAO implements ImageGallerySessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + ImageGallerySession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + ImageGallerySession.class.getName() + " as p where p.imageGallery.contentId=?"; public ImageGallerySession 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 (ImageGallerySession) 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(ImageGallerySession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } public void deleteBySessionId(Long toolSessionId) { this.removeObject(ImageGallerySession.class,toolSessionId); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java,v diff -u -r1.3.10.1 -r1.3.10.2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java 15 Aug 2014 09:30:55 -0000 1.3.10.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.3.10.2 @@ -25,10 +25,13 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryUserDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; +import org.springframework.stereotype.Repository; -public class ImageGalleryUserDAOHibernate extends BaseDAOHibernate implements ImageGalleryUserDAO { +@Repository +public class ImageGalleryUserDAOHibernate extends LAMSBaseDAO implements ImageGalleryUserDAO { private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ImageGalleryUser.class.getName() + " as u where u.userId =? and u.imageGallery.contentId=?"; @@ -38,22 +41,22 @@ + " as u where u.session.sessionId=?"; public ImageGalleryUser 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 (ImageGalleryUser) list.get(0); } public ImageGalleryUser 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 (ImageGalleryUser) 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_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/Attic/ImageRatingDAOHibernate.java,v diff -u -r1.2.10.1 -r1.2.10.2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java 15 Aug 2014 09:30:55 -0000 1.2.10.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageRatingDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.2.10.2 @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageRatingDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ImageCommentDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO */ -public class ImageRatingDAOHibernate extends BaseDAOHibernate implements ImageRatingDAO { +@Repository +public class ImageRatingDAOHibernate extends LAMSBaseDAO implements ImageRatingDAO { private static final String FIND_BY_IMAGE_AND_USER = "from " + ImageRating.class.getName() + " as r where r.createBy.userId = ? and r.imageGalleryItem.uid=?"; @@ -43,15 +46,15 @@ + " as r where r.imageGalleryItem.uid=?"; public ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId) { - List list = getHibernateTemplate().find(FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid }); + List list = doFind(FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid }); if (list == null || list.size() == 0) return null; return (ImageRating) list.get(0); } @SuppressWarnings("unchecked") public List getImageRatingsByImageUid(Long imageUid) { - return (List) getHibernateTemplate().find(FIND_BY_IMAGE_UID, imageUid); + return (List) doFind(FIND_BY_IMAGE_UID, imageUid); } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java,v diff -u -r1.1 -r1.1.10.1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java 12 Dec 2008 15:31:28 -0000 1.1 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java 29 Nov 2014 20:01:07 -0000 1.1.10.1 @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageVoteDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ImageVoteDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.tool.imageGallery.dao.ImageVoteDAO */ -public class ImageVoteDAOHibernate extends BaseDAOHibernate implements ImageVoteDAO { +@Repository +public class ImageVoteDAOHibernate extends LAMSBaseDAO implements ImageVoteDAO { private static final String FIND_BY_IMAGE_AND_USER = "from " + ImageVote.class.getName() + " as r where r.createBy.userId = ? and r.imageGalleryItem.uid=?"; @@ -46,7 +49,7 @@ + " as r where r.voted=true and r.imageGalleryItem.uid = ? and r.createBy.session.sessionId=?"; public ImageVote getImageVoteByImageAndUser(Long imageUid, Long userId) { - List list = getHibernateTemplate().find(ImageVoteDAOHibernate.FIND_BY_IMAGE_AND_USER, + List list = doFind(ImageVoteDAOHibernate.FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid }); if ((list == null) || (list.size() == 0)) { return null; @@ -55,15 +58,15 @@ } public int getNumImageVotesByImageUid(Long imageUid, Long sessionId) { - List list = getHibernateTemplate().find(ImageVoteDAOHibernate.FIND_IMAGE_VOTES_COUNT_BY_IMAGE, new Object[] {imageUid, sessionId}); + List list = doFind(ImageVoteDAOHibernate.FIND_IMAGE_VOTES_COUNT_BY_IMAGE, new Object[] {imageUid, sessionId}); if ((list == null) || (list.size() == 0)) { return 0; } return ((Number) list.get(0)).intValue(); } public int getNumImageVotesByUserId(Long userId) { - List list = getHibernateTemplate().find(ImageVoteDAOHibernate.FIND_IMAGE_VOTES_COUNT_BY_USER, userId); + List list = doFind(ImageVoteDAOHibernate.FIND_IMAGE_VOTES_COUNT_BY_USER, userId); if ((list == null) || (list.size() == 0)) { return 0; }