Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java (.../DAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/DAO.java (.../DAO.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -35,16 +35,6 @@ public interface DAO { /** - * Generic method used to get all objects of a particular type. This - * is the same as lookup up all rows in a table. - * - * @param clazz - * the type of objects (a.k.a. while table) to get data from - * @return List of populated objects - */ - public List getObjects(Class clazz); - - /** * Generic method to get an object based on class and identifier. An * ObjectRetrievalFailureException Runtime Exception is thrown if * nothing is found. Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemDAO.java (.../ImageGalleryItemDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemDAO.java (.../ImageGalleryItemDAO.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -35,7 +35,7 @@ * @param imageGalleryUid * @return */ - List getAuthoringItems(Long imageGalleryUid); + List getAuthoringItems(Long imageGalleryUid); ImageGalleryItem getByUid(Long imageGalleryItemUid); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -35,8 +35,8 @@ @Override public ImageGalleryConfigItem getConfigItemByKey(final String configKey) { - return (ImageGalleryConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) - .uniqueResult(); + return getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY, ImageGalleryConfigItem.class) + .setParameter("key", configKey).uniqueResult(); } @Override Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java (.../ImageGalleryItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemDAOHibernate.java (.../ImageGalleryItemDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -37,8 +37,8 @@ + " where imageGallery_uid = ? order by create_date asc"; @Override - public List getAuthoringItems(Long imageGalleryUid) { - return this.doFind(FIND_AUTHORING_ITEMS, imageGalleryUid); + public List getAuthoringItems(Long imageGalleryUid) { + return (List) this.doFind(FIND_AUTHORING_ITEMS, imageGalleryUid); } @Override Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -63,7 +63,6 @@ @Override @SuppressWarnings("unchecked") public List getImageGalleryItemLogBySession(Long sessionId, Long 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 =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java (.../ImageGallerySessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGallerySessionDAOHibernate.java (.../ImageGallerySessionDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -40,7 +40,7 @@ @Override public ImageGallerySession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFind(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java (.../ImageGalleryUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryUserDAOHibernate.java (.../ImageGalleryUserDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -42,7 +42,7 @@ @Override public ImageGalleryUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.doFind(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; } @@ -51,7 +51,7 @@ @Override public ImageGalleryUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.doFind(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; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java (.../ImageVoteDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageVoteDAOHibernate.java (.../ImageVoteDAOHibernate.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -38,7 +38,6 @@ */ @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=?"; @@ -50,7 +49,7 @@ @Override public ImageVote getImageVoteByImageAndUser(Long imageUid, Long userId) { - List list = doFind(ImageVoteDAOHibernate.FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid }); + List list = (List) doFind(ImageVoteDAOHibernate.FIND_BY_IMAGE_AND_USER, new Object[] { userId, imageUid }); if ((list == null) || (list.size() == 0)) { return null; } @@ -59,7 +58,7 @@ @Override public int getNumImageVotesByImageUid(Long imageUid, Long sessionId) { - List list = doFind(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; } @@ -68,7 +67,7 @@ @Override public int getNumImageVotesByUserId(Long userId) { - List list = doFind(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; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ImageGalleryAttachment.java =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ImageGalleryAttachment.java (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ImageGalleryAttachment.java (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.tool.imageGallery.dto; + +/** + * A Wrapper class for uploaded files. Used for learning design export/import functionality, namely, for export/import + * of the uploaded images. + * + * @author Andrey Balan + */ +public class ImageGalleryAttachment implements Cloneable { + + private Long fileUuid; + private Long fileVersionId; + private String fileType; + private String fileName; + + // ********************************************************** + // get/set methods + // ********************************************************** + + public Long getFileVersionId() { + return fileVersionId; + } + + public void setFileVersionId(Long version) { + this.fileVersionId = version; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String type) { + this.fileType = type; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String name) { + this.fileName = name; + } + + public Long getFileUuid() { + return fileUuid; + } + + public void setFileUuid(Long uuid) { + this.fileUuid = uuid; + } +} Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -27,74 +27,112 @@ import java.util.HashSet; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; /** * ImageGallery - * */ +@Entity +@Table(name = "tl_laimag10_imagegallery") public class ImageGallery implements Cloneable { - private static final Logger log = Logger.getLogger(ImageGallery.class); - // key + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - // tool contentID + @Column(name = "content_id") private Long contentId; + @Column private String title; + @Column private String instructions; + @Column(name = "next_image_title") private Long nextImageTitle; // advance + @Column(name = "allow_vote") private boolean allowVote; + @Column(name = "allow_share_images") private boolean allowShareImages; + @Column(name = "lock_on_finished") private boolean lockWhenFinished; + @Column(name = "define_later") private boolean defineLater; - + + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "allow_rank") private boolean allowRank; + @Column(name = "maximum_rates") private int maximumRates; + @Column(name = "minimum_rates") private int minimumRates; + + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("order_id ASC") + @JoinColumn(name = "tool_content_id") + private Set ratingCriterias = new HashSet<>(); - private Set ratingCriterias; + @Column(name = "reflect_on_activity") + private boolean reflectOnActivity; - // general infomation + @Column(name = "reflect_instructions") + private String reflectInstructions; + + @Column(name = "image_submit_notify") + private boolean notifyTeachersOnImageSumbit; + + // general information + + @Column(name = "create_date") private Date created; + @Column(name = "update_date") private Date updated; + @ManyToOne + @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) + @JoinColumn(name = "create_by") private ImageGalleryUser createdBy; - // imageGallery Items - private Set imageGalleryItems; + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("create_date DESC") + @JoinColumn(name = "imageGallery_uid") + private Set imageGalleryItems = new HashSet<>(); - private boolean reflectOnActivity; - - private String reflectInstructions; - - private boolean notifyTeachersOnImageSumbit; - /** - * Default contruction method. - * + * Default contructor */ public ImageGallery() { - nextImageTitle = new Long(1); - imageGalleryItems = new HashSet(); + nextImageTitle = 1L; } // ********************************************************** @@ -135,8 +173,8 @@ // clone imageGalleryItems as well if (imageGalleryItems != null) { - Set newItems = new HashSet(); - for (ImageGalleryItem item : (Set) imageGalleryItems) { + Set newItems = new HashSet<>(); + for (ImageGalleryItem item : imageGalleryItems) { ImageGalleryItem newItem = (ImageGalleryItem) item.clone(); // just clone old file without duplicate it in repository newItems.add(newItem); @@ -151,7 +189,7 @@ // clone ratingCriterias as well if (ratingCriterias != null) { - Set newCriterias = new HashSet(); + Set newCriterias = new HashSet<>(); for (LearnerItemRatingCriteria criteria : ratingCriterias) { LearnerItemRatingCriteria newCriteria = (LearnerItemRatingCriteria) criteria.clone(); // just clone old file without duplicate it in repository @@ -256,8 +294,6 @@ this.createdBy = createdBy; } - /** - */ public Long getUid() { return uid; } @@ -320,21 +356,14 @@ this.nextImageTitle = nextImageTitle; } - /** - * - * @return - */ - public Set getImageGalleryItems() { + public Set getImageGalleryItems() { return imageGalleryItems; } - public void setImageGalleryItems(Set imageGalleryItems) { + public void setImageGalleryItems(Set imageGalleryItems) { this.imageGalleryItems = imageGalleryItems; } - /** - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -343,9 +372,6 @@ this.contentInUse = contentInUse; } - /** - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -354,9 +380,6 @@ this.defineLater = defineLater; } - /** - * @return - */ public Long getContentId() { return contentId; } @@ -365,9 +388,6 @@ this.contentId = contentId; } - /** - * @return - */ public boolean isAllowShareImages() { return allowShareImages; } @@ -376,9 +396,6 @@ this.allowShareImages = allowShareImages; } - /** - * @return - */ public boolean isAllowVote() { return allowVote; } @@ -387,9 +404,6 @@ this.allowVote = allowVote; } - /** - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -398,9 +412,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -409,9 +420,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * @return - */ public boolean isAllowRank() { return allowRank; } @@ -420,9 +428,6 @@ this.allowRank = allowRank; } - /** - * @return - */ public int getMaximumRates() { return maximumRates; } @@ -431,9 +436,6 @@ this.maximumRates = maximumRate; } - /** - * @return - */ public int getMinimumRates() { return minimumRates; } @@ -442,10 +444,6 @@ this.minimumRates = minimumRates; } - /** - * - * @return - */ public Set getRatingCriterias() { return ratingCriterias; } @@ -454,9 +452,6 @@ this.ratingCriterias = ratingCriterias; } - /** - * @return - */ public boolean isNotifyTeachersOnImageSumbit() { return notifyTeachersOnImageSumbit; } Fisheye: Tag 230b4867ed4f106ca02b646ea23b36469452de3c refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.java (.../ImageGalleryConfigItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryConfigItem.java (.../ImageGalleryConfigItem.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -23,24 +23,32 @@ package org.lamsfoundation.lams.tool.imageGallery.model; -/** - * - */ -public class ImageGalleryConfigItem implements java.io.Serializable { +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +@Entity +@Table(name = "tl_laimag10_configuration") +public class ImageGalleryConfigItem implements java.io.Serializable { private static final long serialVersionUID = 6360672537352753361L; public static final String KEY_MEDIUM_IMAGE_DIMENSIONS = "mediumImageDimensions"; public static final String KEY_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions"; - Long id; - String configKey; - String configValue; + @Id + @Column(name = "uid") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "config_key") + private String configKey; + + @Column(name = "config_value") + private String configValue; - /** - * - * - */ public Long getId() { return id; } @@ -49,9 +57,6 @@ this.id = id; } - /** - * - */ public String getConfigKey() { return configKey; } @@ -60,9 +65,6 @@ this.configKey = configKey; } - /** - * - */ public String getConfigValue() { return configValue; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -25,63 +25,93 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.tool.imageGallery.dto.ImageGalleryAttachment; /** - * ImageGallery + * ImageGallery item * - * - * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimag10_imagegallery_item") public class ImageGalleryItem implements Cloneable { - private static final Logger log = Logger.getLogger(ImageGalleryItem.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column private String title; + @Column private String description; + @Column(name = "sequence_id") private int sequenceId; + @Column(name = "is_hide") private boolean isHide; + @Column(name = "create_by_author") private boolean isCreateByAuthor; + @Column(name = "create_date") private Date createDate; + @ManyToOne + @JoinColumn(name = "create_by") private ImageGalleryUser createBy; + @Column(name = "original_file_uuid") private Long originalFileUuid; + @Column(name = "original_image_width") private int originalImageWidth; + @Column(name = "original_image_height") private int originalImageHeight; + @Column(name = "medium_file_uuid") private Long mediumFileUuid; + @Column(name = "medium_image_width") private int mediumImageWidth; + @Column(name = "medium_image_height") private int mediumImageHeight; + @Column(name = "thumbnail_file_uuid") private Long thumbnailFileUuid; + @Column(name = "file_name") private String fileName; // *************** NON Persist Fields ******************** + @Transient private String attachmentLocalUrl; - + @Transient private ImageGalleryAttachment originalFile; - + @Transient private ImageGalleryAttachment mediumFile; - + @Transient private ImageGalleryAttachment thumbnailFile; - + @Transient private String titleEscaped; - + @Transient private String descriptionEscaped; @Override @@ -102,30 +132,24 @@ return image; } + + @Override + public String toString() { + return new ToStringBuilder(this).append("uid", uid).append(" title", title).toString(); + } // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the uid. - */ + public Long getUid() { return uid; } - /** - * @param uid - * The uid to set. - */ public void setUid(Long userID) { this.uid = userID; } - /** - * - * @return - */ public String getTitle() { return title; } @@ -134,10 +158,6 @@ this.title = title; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -150,8 +170,6 @@ * Returns image sequence number. * * @return image sequence number - * - * */ public int getSequenceId() { return sequenceId; @@ -167,11 +185,6 @@ this.sequenceId = sequenceId; } - /** - * - * - * @return - */ public ImageGalleryUser getCreateBy() { return createBy; } @@ -180,10 +193,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -192,10 +201,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public boolean isCreateByAuthor() { return isCreateByAuthor; } @@ -204,10 +209,6 @@ this.isCreateByAuthor = isCreateByAuthor; } - /** - * - * @return - */ public boolean isHide() { return isHide; } @@ -216,11 +217,6 @@ this.isHide = isHide; } - /** - * - * - * @return - */ public Long getOriginalFileUuid() { return originalFileUuid; } @@ -229,11 +225,6 @@ this.originalFileUuid = originalFileUuid; } - /** - * - * - * @return - */ public int getOriginalImageWidth() { return originalImageWidth; } @@ -242,11 +233,6 @@ this.originalImageWidth = originalImageWidth; } - /** - * - * - * @return - */ public int getOriginalImageHeight() { return originalImageHeight; } @@ -255,11 +241,6 @@ this.originalImageHeight = originalImageHeight; } - /** - * - * - * @return - */ public Long getMediumFileUuid() { return mediumFileUuid; } @@ -268,11 +249,6 @@ this.mediumFileUuid = mediumFileUuid; } - /** - * - * - * @return - */ public int getMediumImageWidth() { return mediumImageWidth; } @@ -281,11 +257,6 @@ this.mediumImageWidth = mediumImageWidth; } - /** - * - * - * @return - */ public int getMediumImageHeight() { return mediumImageHeight; } @@ -294,11 +265,6 @@ this.mediumImageHeight = mediumImageHeight; } - /** - * - * - * @return - */ public Long getThumbnailFileUuid() { return thumbnailFileUuid; } @@ -307,9 +273,6 @@ this.thumbnailFileUuid = thumbnailFileUuid; } - /** - * - */ public String getFileName() { return fileName; } @@ -367,9 +330,4 @@ public void setDescriptionEscaped(String descriptionEscaped) { this.descriptionEscaped = descriptionEscaped; } - - @Override - public String toString() { - return new ToStringBuilder(this).append("uid", uid).append(" title", title).toString(); - } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java (.../ImageGalleryItemVisitLog.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.java (.../ImageGalleryItemVisitLog.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -26,27 +26,46 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + /** - * ImageGallery + * ImageGallery item visit log. * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_laimag10_item_log") public class ImageGalleryItemVisitLog { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "user_uid") private ImageGalleryUser user; + + @ManyToOne + @JoinColumn(name = "imageGallery_item_uid") private ImageGalleryItem imageGalleryItem; + + @Column private boolean complete; + + @Column(name = "access_date") private Date accessDate; + + @Column(name = "session_id") private Long sessionId; - /** - * - * @return - */ public Date getAccessDate() { return accessDate; } @@ -55,10 +74,6 @@ this.accessDate = accessDate; } - /** - * - * @return - */ public ImageGalleryItem getImageGalleryItem() { return imageGalleryItem; } @@ -67,10 +82,6 @@ this.imageGalleryItem = item; } - /** - * - * @return Returns the log Uid. - */ public Long getUid() { return uid; } @@ -79,10 +90,6 @@ this.uid = uid; } - /** - * - * @return - */ public ImageGalleryUser getUser() { return user; } @@ -91,10 +98,6 @@ this.user = user; } - /** - * - * @return - */ public boolean isComplete() { return complete; } @@ -103,10 +106,6 @@ this.complete = complete; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java (.../ImageGallerySession.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -25,36 +25,53 @@ import java.util.Date; -import org.apache.log4j.Logger; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; /** - * ImageGallery + * ImageGallery session * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_laimag10_session") public class ImageGallerySession { - private static Logger log = Logger.getLogger(ImageGallerySession.class); - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "session_id") private Long sessionId; + + @Column(name = "session_name") private String sessionName; + + @ManyToOne + @JoinColumn(name = "imageGallery_uid") private ImageGallery imageGallery; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; + // finish or not + @Column private int status; // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the learnerID. - */ + public Long getUid() { return uid; } @@ -63,10 +80,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -75,11 +88,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -88,10 +96,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -100,10 +104,6 @@ this.status = status; } - /** - * - * @return - */ public ImageGallery getImageGallery() { return imageGallery; } @@ -112,10 +112,6 @@ this.imageGallery = imageGallery; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java (.../ImageGalleryUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.java (.../ImageGalleryUser.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -25,6 +25,16 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -33,34 +43,52 @@ /** * ImageGallery * - * @author Dapeng Ni - * - * - * + * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimag10_user") public class ImageGalleryUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(ImageGalleryUser.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "user_id") private Long userId; + + @Column(name = "first_name") private String firstName; + + @Column(name = "last_name") private String lastName; + + @Column(name = "login_name") private String loginName; + + @Column(name = "session_finished") private boolean sessionFinished; + @ManyToOne + @JoinColumn(name = "session_uid") private ImageGallerySession session; + + @ManyToOne + @JoinColumn(name = "imageGallery_uid") private ImageGallery imageGallery; // =============== NON Persisit value: for display use =========== - // the user access some reousrce item date time. Use in monitoring summary page + + // the user access some resource item date time. Use in monitoring summary page + @Transient private Date accessDate; public ImageGalleryUser() { } public ImageGalleryUser(UserDTO user, ImageGallerySession session) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -70,7 +98,7 @@ } public ImageGalleryUser(UserDTO user, ImageGallery content) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -79,12 +107,8 @@ this.sessionFinished = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { - ImageGalleryUser user = null; try { user = (ImageGalleryUser) super.clone(); @@ -98,45 +122,47 @@ return user; } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ImageGalleryUser)) { + return false; + } + + final ImageGalleryUser user = (ImageGalleryUser) obj; + + return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName) + .append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals(); + + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode(); + } + // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the uid. - */ + public Long getUid() { return uid; } - /** - * @param uid - * The uid to set. - */ public void setUid(Long userID) { this.uid = userID; } - /** - * - * @return Returns the userId. - */ public Long getUserId() { return userId; } - /** - * @param userId - * The userId to set. - */ public void setUserId(Long userID) { this.userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -145,10 +171,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -157,10 +179,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -169,10 +187,6 @@ this.loginName = loginName; } - /** - * - * @return - */ public ImageGallerySession getSession() { return session; } @@ -181,10 +195,6 @@ this.session = session; } - /** - * - * @return - */ public ImageGallery getImageGallery() { return imageGallery; } @@ -193,10 +203,6 @@ this.imageGallery = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -205,27 +211,6 @@ this.sessionFinished = sessionFinished; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof ImageGalleryUser)) { - return false; - } - - final ImageGalleryUser user = (ImageGalleryUser) obj; - - return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName) - .append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals(); - - } - - @Override - public int hashCode() { - return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode(); - } - public Date getAccessDate() { return accessDate; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java (.../ImageVote.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageVote.java (.../ImageVote.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -23,6 +23,15 @@ package org.lamsfoundation.lams.tool.imageGallery.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -31,16 +40,26 @@ * ImageVote * * @author Andrey Balan - * - * */ +@Entity +@Table(name = "tl_laimag10_image_vote") public class ImageVote implements Cloneable { - private static final Logger log = Logger.getLogger(ImageVote.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - private boolean isVoted; + + @Column(name = "is_voted") + private boolean voted; + + @ManyToOne + @JoinColumn(name = "create_by") private ImageGalleryUser createBy; + + @ManyToOne + @JoinColumn(name = "imageGallery_item_uid") private ImageGalleryItem imageGalleryItem; // ********************************************************** @@ -76,23 +95,19 @@ final ImageVote genericEntity = (ImageVote) o; - return new EqualsBuilder().append(this.uid, genericEntity.uid).append(this.isVoted, genericEntity.isVoted) + return new EqualsBuilder().append(this.uid, genericEntity.uid).append(this.voted, genericEntity.voted) .append(this.createBy, genericEntity.createBy).isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder().append(uid).append(isVoted).append(createBy).toHashCode(); + return new HashCodeBuilder().append(uid).append(voted).append(createBy).toHashCode(); } // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the log Uid. - */ public Long getUid() { return uid; } @@ -101,10 +116,6 @@ this.uid = uid; } - /** - * - * @return - */ public ImageGalleryUser getCreateBy() { return createBy; } @@ -113,22 +124,14 @@ this.createBy = createBy; } - /** - * - * @return - */ public boolean isVoted() { - return isVoted; + return voted; } - public void setVoted(boolean isVoted) { - this.isVoted = isVoted; + public void setVoted(boolean voted) { + this.voted = voted; } - /** - * - * @return - */ public ImageGalleryItem getImageGalleryItem() { return imageGalleryItem; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java =================================================================== diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -64,7 +64,7 @@ * @param imageGalleryUid * @return */ - List getAuthoredItems(Long imageGalleryUid); + List getAuthoredItems(Long imageGalleryUid); /** * Upload imageGallery item file to repository. i.e., single file, websize zip file, or learning object zip file. Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rc37bbcec1cc4b57115b1d1cefe9b6fe7c4ea357a -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision c37bbcec1cc4b57115b1d1cefe9b6fe7c4ea357a) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -78,11 +78,11 @@ import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGallerySessionDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryUserDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageVoteDAO; +import org.lamsfoundation.lams.tool.imageGallery.dto.ImageGalleryAttachment; import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO; import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryAttachment; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; @@ -169,12 +169,12 @@ // save default content by given ID. ImageGallery content = new ImageGallery(); content = ImageGallery.newInstance(defaultContent, contentId); - // content.setNextImageTitle(new Long(1)); + // content.setNextImageTitle(1L); return content; } @Override - public List getAuthoredItems(Long imageGalleryUid) { + public List getAuthoredItems(Long imageGalleryUid) { return imageGalleryItemDao.getAuthoringItems(imageGalleryUid); } @@ -408,8 +408,7 @@ } final Long USER_ID = -1L; final boolean IS_COMMENTS_BY_OTHER_USERS_REQUIRED = true; - // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!TODO calculate average ratings based on one - // session data + // ! TODO calculate average ratings based on one session data itemRatingDtos = getRatingCriteriaDtos(contentId, session.getSessionId(), itemIds, IS_COMMENTS_BY_OTHER_USERS_REQUIRED, USER_ID); } @@ -802,15 +801,15 @@ } } } - ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(newUserUid.longValue(), toolContentId); if (user == null) { user = new ImageGalleryUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(newUserUid.longValue()); user.setImageGallery(toolContentObj); } toolContentObj.setCreatedBy(user); @@ -864,11 +863,11 @@ ImageGallery toContent = ImageGallery.newInstance(imageGallery, toContentId); // save imageGallery items first - Set items = toContent.getImageGalleryItems(); + Set items = toContent.getImageGalleryItems(); if (items != null) { - Iterator iter = items.iterator(); + Iterator iter = items.iterator(); while (iter.hasNext()) { - ImageGalleryItem item = (ImageGalleryItem) iter.next(); + ImageGalleryItem item = iter.next(); if (item.isCreateByAuthor()) { imageGalleryUserDao.saveObject(item.getCreateBy()); imageGalleryItemDao.saveObject(item); @@ -1190,8 +1189,7 @@ } private Long getToolDefaultContentIdBySignature(String toolSignature) throws ImageGalleryException { - Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + Long contentId = toolService.getToolDefaultContentIdBySignature(toolSignature); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); ImageGalleryServiceImpl.log.error(error); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java =================================================================== diff -u -r8fb34ff788990c3ae25a0661090636b38bdecec2 -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 8fb34ff788990c3ae25a0661090636b38bdecec2) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -107,7 +107,7 @@ public String defineLater(@ModelAttribute ImageGalleryForm imageGalleryForm, HttpServletRequest request) throws ServletException { - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); ImageGallery imageGallery = igService.getImageGalleryByContentId(contentId); imageGallery.setDefineLater(true); @@ -125,7 +125,7 @@ */ private String readDatabaseData(ImageGalleryForm imageGalleryForm, HttpServletRequest request) throws ServletException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_CONTENT_ID); List items = null; ImageGallery imageGallery = null; @@ -267,7 +267,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ImageGalleryUser imageGalleryUser = igService.getUserByIDAndContent(new Long(user.getUserID().intValue()), + ImageGalleryUser imageGalleryUser = igService.getUserByIDAndContent(user.getUserID().longValue(), contentId); if (imageGalleryUser == null) { imageGalleryUser = new ImageGalleryUser(user, imageGalleryPO); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r230b4867ed4f106ca02b646ea23b36469452de3c --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) @@ -109,7 +109,7 @@ // initial Session Map SessionMap sessionMap = new SessionMap<>(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); - Long sessionId = new Long(request.getParameter(ImageGalleryConstants.PARAM_TOOL_SESSION_ID)); + Long sessionId = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_SESSION_ID); ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); ImageGallery imageGallery = igService.getImageGalleryBySessionId(sessionId); @@ -242,7 +242,7 @@ try { HttpSession ss = SessionManager.getSession(); UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(userDTO.getUserID().longValue()); + Long userID = userDTO.getUserID().longValue(); nextActivityUrl = igService.finishToolSession(sessionId, userID); request.setAttribute(ImageGalleryConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); @@ -333,7 +333,7 @@ @RequestMapping("/deleteImage") public String deleteImage(HttpServletRequest request, HttpServletResponse response) { - Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID)); + Long imageUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); @@ -362,7 +362,7 @@ ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY); Long userId = ((Integer) sessionMap.get(AttributeNames.PARAM_USER_ID)).longValue(); - Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID)); + Long imageUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); ImageGalleryItem image = igService.getImageGalleryItemByUid(imageUid); String escapedDescription = image.getDescription().replaceAll("[\"]", """); image.setDescription(escapedDescription); @@ -425,9 +425,9 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID); - Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID)); + Long imageUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - ImageGalleryUser imageGalleryUser = igService.getUserByIDAndSession(new Long(user.getUserID().intValue()), + ImageGalleryUser imageGalleryUser = igService.getUserByIDAndSession(user.getUserID().longValue(), sessionId); // persist ImageGalleryItem changes in DB @@ -515,7 +515,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), + ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(user.getUserID().longValue(), sessionId); if (imageGalleryUser == null) { @@ -527,7 +527,7 @@ } private ImageGalleryUser getSpecifiedUser(IImageGalleryService service, Long sessionId, Integer userId) { - ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(userId.longValue(), sessionId); if (imageGalleryUser == null) { LearningController.log.error( "Unable to find specified user for imageGallery activity. Screens are likely to fail. SessionId="