Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java (.../DAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java (.../DAO.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.rsrc.dao; import java.io.Serializable; -import java.util.List; import org.lamsfoundation.lams.dao.IBaseDAO; @@ -37,16 +36,6 @@ public interface DAO extends IBaseDAO { /** - * 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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java (.../ResourceItemDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemDAO.java (.../ResourceItemDAO.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -35,7 +35,7 @@ * @param resourceUid * @return */ - List getAuthoringItems(Long resourceUid); + List getAuthoringItems(Long resourceUid); ResourceItem getByUid(Long resourceItemUid); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java (.../ResourceDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java (.../ResourceDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -33,8 +33,6 @@ /** * * @author Steve.Ni - * - * @version $Revision$ */ @Repository public class ResourceDAOHibernate extends LAMSBaseDAO implements ResourceDAO { @@ -43,7 +41,7 @@ @Override public Resource getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = (List) doFind(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Resource) list.get(0); } else { Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java (.../ResourceItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java (.../ResourceItemDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -37,9 +37,8 @@ + " where resource_uid = ? order by create_date asc"; @Override - public List getAuthoringItems(Long resourceUid) { - - return this.doFind(FIND_AUTHORING_ITEMS, resourceUid); + public List getAuthoringItems(Long resourceUid) { + return (List) this.doFind(FIND_AUTHORING_ITEMS, resourceUid); } @Override Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -92,17 +92,15 @@ Map summaryList = new HashMap(result.size()); for (Object[] list : result) { if (list[1] != null) { - summaryList.put((Long) list[0], new Integer(((Number) list[1]).intValue())); + summaryList.put((Long) list[0], ((Number) list[1]).intValue()); } } return summaryList; - } @Override @SuppressWarnings("unchecked") public List getResourceItemLogBySession(Long sessionId, Long itemUid) { - return (List) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); } @@ -174,24 +172,19 @@ + " visit WHERE visit.sessionId = :sessionId AND visit.resourceItem.uid = :itemUid" + " AND (CONCAT(visit.user.lastName, ' ', visit.user.firstName) LIKE CONCAT('%', :searchString, '%')) "; - Query query = getSession().createQuery(COUNT_USERS_BY_SESSION_AND_ITEM); + Query query = getSession().createQuery(COUNT_USERS_BY_SESSION_AND_ITEM, Number.class); query.setParameter("sessionId", sessionId); query.setParameter("itemUid", itemUid); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; query.setParameter("searchString", searchString); - List list = query.list(); - - if ((list == null) || (list.size() == 0)) { - return 0; - } else { - return ((Number) list.get(0)).intValue(); - } + return query.uniqueResult().intValue(); } @Override public Object[] getDateRangeOfAccesses(Long userUid, Long toolSessionId) { - NativeQuery query = getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + @SuppressWarnings("unchecked") + NativeQuery query = getSession().createNativeQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) .setParameter("userUid", userUid).setParameter("sessionId", toolSessionId); Object[] values = (Object[]) query.list().get(0); return values; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java (.../ResourceSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java (.../ResourceSessionDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -40,7 +40,7 @@ @Override public ResourceSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = (List) doFind(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java (.../ResourceUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java (.../ResourceUserDAOHibernate.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -42,20 +42,22 @@ @Override public ResourceUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + List list = (List) this.doFind(FIND_BY_USER_ID_SESSION_ID, + new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; } - return (ResourceUser) list.get(0); + return list.get(0); } @Override public ResourceUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + List list = (List) this.doFind(FIND_BY_USER_ID_CONTENT_ID, + new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; } - return (ResourceUser) list.get(0); + return list.get(0); } @Override Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java (.../InstructionNavDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java (.../InstructionNavDTO.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -29,17 +29,15 @@ import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction; /** - * * @author Steve.Ni - * @version $Revision$ */ public class InstructionNavDTO { private String title; private int total; private int current; private ResourceItemInstruction instruction; - private List allInstructions; + private List allInstructions; private short type; public int getCurrent() { @@ -82,11 +80,11 @@ this.instruction = instruction; } - public List getAllInstructions() { + public List getAllInstructions() { return allInstructions; } - public void setAllInstructions(List allInstructions) { + public void setAllInstructions(List allInstructions) { this.allInstructions = allInstructions; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java (.../ResourceItemDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java (.../ResourceItemDTO.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -42,8 +42,6 @@ *
  • count(resource_item_uid)
    • * * @author Steve.Ni - * - * @version $Revision$ */ public class ResourceItemDTO { @@ -85,7 +83,7 @@ this.setAllowRating(item.isAllowRating()); this.setAllowComments(item.isAllowComments()); } else { - this.itemUid = new Long(-1); + this.itemUid = -1L; } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IMSManifestException.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IMSManifestException.java (.../IMSManifestException.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/IMSManifestException.java (.../IMSManifestException.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -31,32 +31,20 @@ * @author Fiona Malikoff */ public class IMSManifestException extends ImscpApplicationException { + private static final long serialVersionUID = -1624575909006230298L; - /** - * - */ public IMSManifestException() { super(); } - /** - * @param arg0 - */ public IMSManifestException(String arg0) { super(arg0); } - /** - * @param arg0 - */ public IMSManifestException(Throwable arg0) { super(arg0); } - /** - * @param arg0 - * @param arg1 - */ public IMSManifestException(String arg0, Throwable arg1) { super(arg0, arg1); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/ImscpApplicationException.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/ImscpApplicationException.java (.../ImscpApplicationException.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/ImscpApplicationException.java (.../ImscpApplicationException.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -29,32 +29,20 @@ * @author Fiona Malikoff */ public class ImscpApplicationException extends Exception { + private static final long serialVersionUID = -4120899849012910669L; - /** - * - */ public ImscpApplicationException() { super(); } - /** - * @param arg0 - */ public ImscpApplicationException(String arg0) { super(arg0); } - /** - * @param arg0 - */ public ImscpApplicationException(Throwable arg0) { super(arg0); } - /** - * @param arg0 - * @param arg1 - */ public ImscpApplicationException(String arg0, Throwable arg1) { super(arg0, arg1); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java (.../Resource.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -28,81 +28,112 @@ import java.util.Iterator; 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 javax.persistence.Transient; + 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; /** * Resource * * @author Dapeng Ni - * - * - * */ +@Entity +@Table(name = "tl_larsrc11_resource") public class Resource implements Cloneable { - private static final Logger log = Logger.getLogger(Resource.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; // advance + @Column(name = "allow_auto_run") private boolean runAuto; + @Column(name = "mini_view_resource_number") private int miniViewResourceNumber; + @Column(name = "allow_add_files") private boolean allowAddFiles; + @Column(name = "allow_add_urls") private boolean allowAddUrls; + @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 = "assigment_submit_notify") private boolean notifyTeachersOnAssigmentSumbit; + @Column(name = "file_upload_notify") private boolean notifyTeachersOnFileUpload; + @Column(name = "reflect_on_activity") + private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") + private String reflectInstructions; + // general infomation + + @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 ResourceUser createdBy; - // resource Items - private Set resourceItems; + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("create_date DESC") + @JoinColumn(name = "resource_uid") + private Set resourceItems = new HashSet<>(); - private boolean reflectOnActivity; + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("order_id ASC") + @JoinColumn(name = "tool_content_id") + private Set ratingCriterias = new HashSet<>(); - private String reflectInstructions; - - private Set ratingCriterias; - // *************** NON Persist Fields ******************** + @Transient private String miniViewNumberStr; - /** - * Default contruction method. - * - */ - public Resource() { - resourceItems = new HashSet(); - } - // ********************************************************** // Function method for Resource // ********************************************************** @@ -139,10 +170,10 @@ resource = (Resource) super.clone(); resource.setUid(null); if (resourceItems != null) { - Iterator iter = resourceItems.iterator(); - Set set = new HashSet(); + Iterator iter = resourceItems.iterator(); + Set set = new HashSet<>(); while (iter.hasNext()) { - ResourceItem item = (ResourceItem) iter.next(); + ResourceItem item = iter.next(); ResourceItem newItem = (ResourceItem) item.clone(); // just clone old file without duplicate it in repository set.add(newItem); @@ -156,7 +187,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 @@ -199,7 +230,6 @@ * Updates the modification data for this entity. */ public void updateModificationData() { - long now = System.currentTimeMillis(); if (created == null) { this.setCreated(new Date(now)); @@ -250,9 +280,6 @@ /** * @return Returns the userid of the user who created the Share resources. - * - * - * */ public ResourceUser getCreatedBy() { return createdBy; @@ -266,9 +293,6 @@ this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -277,30 +301,14 @@ this.uid = uid; } - /** - * @return Returns the title. - * - * - * - */ public String getTitle() { return title; } - /** - * @param title - * The title to set. - */ public void setTitle(String title) { this.title = title; } - /** - * @return Returns the lockWhenFinish. - * - * - * - */ public boolean getLockWhenFinished() { return lockWhenFinished; } @@ -315,8 +323,6 @@ /** * @return Returns the instructions set by the teacher. - * - * */ public String getInstructions() { return instructions; @@ -326,27 +332,14 @@ this.instructions = instructions; } - /** - * - * - * - * - * - * - * @return - */ - public Set getResourceItems() { + public Set getResourceItems() { return resourceItems; } - public void setResourceItems(Set resourceItems) { + public void setResourceItems(Set resourceItems) { this.resourceItems = resourceItems; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -355,10 +348,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -367,10 +356,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -379,10 +364,6 @@ this.contentId = contentId; } - /** - * - * @return - */ public boolean isAllowAddFiles() { return allowAddFiles; } @@ -391,10 +372,6 @@ this.allowAddFiles = allowAddFiles; } - /** - * - * @return - */ public boolean isAllowAddUrls() { return allowAddUrls; } @@ -403,10 +380,6 @@ this.allowAddUrls = allowAddUrls; } - /** - * - * @return - */ public int getMiniViewResourceNumber() { return miniViewResourceNumber; } @@ -415,10 +388,6 @@ miniViewResourceNumber = minViewResourceNumber; } - /** - * - * @return - */ public boolean isRunAuto() { return runAuto; } @@ -440,10 +409,6 @@ miniViewNumberStr = minViewNumber; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -452,10 +417,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -464,9 +425,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * - */ public boolean isNotifyTeachersOnAssigmentSumbit() { return notifyTeachersOnAssigmentSumbit; } @@ -475,21 +433,14 @@ this.notifyTeachersOnAssigmentSumbit = notifyTeachersOnAssigmentSumbit; } - /** - * - */ public boolean isNotifyTeachersOnFileUpload() { return notifyTeachersOnFileUpload; } public void setNotifyTeachersOnFileUpload(boolean notifyTeachersOnFileUpload) { this.notifyTeachersOnFileUpload = notifyTeachersOnFileUpload; } - - /** - * - * @return - */ + public Set getRatingCriterias() { return ratingCriterias; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -28,6 +28,20 @@ import java.util.Iterator; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +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 javax.persistence.Transient; + import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -36,55 +50,85 @@ * Resource * * @author Dapeng Ni - * - * - * */ +@Entity +@Table(name = "tl_larsrc11_resource_item") public class ResourceItem implements Cloneable { private static final Logger log = Logger.getLogger(ResourceItem.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + // Resource Type:1=URL,2=File,3=Website,4=Learning Object + @Column(name = "item_type") private short type; + @Column private String title; + @Column private String description; + @Column private String url; + @Column(name = "open_url_new_window") private boolean openUrlNewWindow; + @Column(name = "ims_schema") private String imsSchema; + @Column(name = "init_item") private String initialItem; + @Column(name = "organization_xml") private String organizationXml; + @Column(name = "file_uuid") private Long fileUuid; + @Column(name = "file_version_id") private Long fileVersionId; + @Column(name = "file_name") private String fileName; + @Column(name = "file_type") private String fileType; - private Set itemInstructions; + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) + @OrderBy("sequence_id ASC") + @JoinColumn(name = "item_uid") + private Set itemInstructions = new HashSet<>(); + @Column(name = "order_id") private Integer orderId; + @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 ResourceUser createBy; + @Column(name = "is_allow_rating") private boolean allowRating; + + @Column(name = "is_allow_comments") private boolean allowComments; - // *********************************************** - // DTO fields: + // ******************************* DTO fields *********** + @Transient private boolean complete; + @Transient private ItemRatingDTO ratingDTO; @Override @@ -94,10 +138,10 @@ obj = (ResourceItem) super.clone(); // clone attachment if (itemInstructions != null) { - Iterator iter = itemInstructions.iterator(); - Set set = new HashSet(); + Iterator iter = itemInstructions.iterator(); + Set set = new HashSet<>(); while (iter.hasNext()) { - ResourceItemInstruction instruct = (ResourceItemInstruction) iter.next(); + ResourceItemInstruction instruct = iter.next(); ResourceItemInstruction newInsruct = (ResourceItemInstruction) instruct.clone(); set.add(newInsruct); } @@ -119,27 +163,15 @@ // ********************************************************** // 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 Long getFileUuid() { return fileUuid; } @@ -148,10 +180,6 @@ this.fileUuid = crUuid; } - /** - * - * @return - */ public Long getFileVersionId() { return fileVersionId; } @@ -160,10 +188,6 @@ this.fileVersionId = crVersionId; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -172,10 +196,6 @@ this.description = description; } - /** - * - * @return - */ public String getImsSchema() { return imsSchema; } @@ -184,10 +204,6 @@ this.imsSchema = imsSchema; } - /** - * - * @return - */ public String getInitialItem() { return initialItem; } @@ -196,26 +212,14 @@ this.initialItem = initialItem; } - /** - * - * - * - * - * - * @return - */ - public Set getItemInstructions() { + public Set getItemInstructions() { return itemInstructions; } - public void setItemInstructions(Set itemInstructions) { + public void setItemInstructions(Set itemInstructions) { this.itemInstructions = itemInstructions; } - /** - * - * @return - */ public String getOrganizationXml() { return organizationXml; } @@ -224,10 +228,6 @@ this.organizationXml = organizationXml; } - /** - * - * @return - */ public String getTitle() { return title; } @@ -236,10 +236,6 @@ this.title = title; } - /** - * - * @return - */ public String getUrl() { return url; } @@ -248,11 +244,6 @@ this.url = url; } - /** - * - * - * @return - */ public ResourceUser getCreateBy() { return createBy; } @@ -261,10 +252,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -273,10 +260,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public boolean isCreateByAuthor() { return isCreateByAuthor; } @@ -285,10 +268,6 @@ this.isCreateByAuthor = isCreateByAuthor; } - /** - * - * @return - */ public boolean isHide() { return isHide; } @@ -297,10 +276,6 @@ this.isHide = isHide; } - /** - * - * @return - */ public short getType() { return type; } @@ -309,9 +284,6 @@ this.type = type; } - /** - * - */ public String getFileType() { return fileType; } @@ -320,9 +292,6 @@ this.fileType = type; } - /** - * - */ public String getFileName() { return fileName; } @@ -331,10 +300,6 @@ this.fileName = name; } - /** - * - * @return - */ public boolean isOpenUrlNewWindow() { return openUrlNewWindow; } @@ -343,10 +308,6 @@ this.openUrlNewWindow = openUrlNewWindow; } - /** - * - * @return - */ public Integer getOrderId() { return orderId; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java (.../ResourceItemInstruction.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java (.../ResourceItemInstruction.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -23,19 +23,33 @@ package org.lamsfoundation.lams.tool.rsrc.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** * * @author Steve.Ni - * - * @version $Revision$ */ +@Entity +@Table(name = "tl_larsrc11_item_instruction") public class ResourceItemInstruction implements Cloneable { private static final Logger log = Logger.getLogger(ResourceItemInstruction.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "sequence_id") private int sequenceId; + + @Column private String description; @Override @@ -54,26 +68,15 @@ // ********************************************************** // 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 getDescription() { return description; } @@ -82,10 +85,6 @@ this.description = description; } - /** - * - * @return - */ public int getSequenceId() { return sequenceId; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java (.../ResourceItemVisitLog.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java (.../ResourceItemVisitLog.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -26,28 +26,49 @@ 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; + /** - * Resource + * Resource item visit log * * @author Dapeng Ni - * - * - * */ +@Entity +@Table(name = "tl_larsrc11_item_log") public class ResourceItemVisitLog { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "user_uid") private ResourceUser user; + + @ManyToOne + @JoinColumn(name = "resource_item_uid") private ResourceItem resourceItem; + + @Column private boolean complete; + + @Column(name = "complete_date") private Date completeDate; + + @Column(name = "access_date") private Date accessDate; + + @Column(name = "session_id") private Long sessionId; - /** - * - * @return - */ public Date getAccessDate() { return accessDate; } @@ -56,10 +77,6 @@ this.accessDate = accessDate; } - /** - * - * @return - */ public Date getCompleteDate() { return completeDate; } @@ -68,10 +85,6 @@ this.completeDate = completeDate; } - /** - * - * @return - */ public ResourceItem getResourceItem() { return resourceItem; } @@ -80,10 +93,6 @@ this.resourceItem = item; } - /** - * - * @return Returns the log Uid. - */ public Long getUid() { return uid; } @@ -92,10 +101,6 @@ this.uid = uid; } - /** - * - * @return - */ public ResourceUser getUser() { return user; } @@ -104,10 +109,6 @@ this.user = user; } - /** - * - * @return - */ public boolean isComplete() { return complete; } @@ -116,10 +117,6 @@ this.complete = complete; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceSession.java (.../ResourceSession.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -24,40 +24,64 @@ package org.lamsfoundation.lams.tool.rsrc.model; import java.util.Date; +import java.util.HashSet; import java.util.Set; -import org.apache.log4j.Logger; +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; /** - * Resource + * Resource session * * @author Dapeng Ni - * - * - * */ +@Entity +@Table(name = "tl_larsrc11_session") public class ResourceSession { - private static Logger log = Logger.getLogger(ResourceSession.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 = "resource_uid") private Resource resource; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; + // finish or not + @Column private int status; - // resource Items - private Set resourceItems; + + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("create_date DESC") + @JoinColumn(name = "session_uid") + private Set resourceItems = new HashSet<>(); // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the learnerID. - */ + public Long getUid() { return uid; } @@ -66,10 +90,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -78,11 +98,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -91,10 +106,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -103,10 +114,6 @@ this.status = status; } - /** - * - * @return - */ public Resource getResource() { return resource; } @@ -115,10 +122,6 @@ this.resource = resource; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } @@ -144,20 +147,11 @@ this.sessionName = sessionName; } - /** - * - * - * - * - * - * - * @return - */ - public Set getResourceItems() { + public Set getResourceItems() { return resourceItems; } - public void setResourceItems(Set resourceItems) { + public void setResourceItems(Set resourceItems) { this.resourceItems = resourceItems; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceUser.java (.../ResourceUser.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -25,45 +25,76 @@ 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; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** - * Resource + * Resource user * * @author Dapeng Ni - * - * */ +@Entity +@Table(name = "tl_larsrc11_user") public class ResourceUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(ResourceUser.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 ResourceSession session; + + @ManyToOne + @JoinColumn(name = "resource_uid") private Resource resource; // =============== 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; // resource item complete date. Use in monitoring summary page + @Transient private Date completeDate; // difference between completeDate and accessDate + @Transient private Date timeTaken; public ResourceUser() { } public ResourceUser(UserDTO user, ResourceSession 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(); @@ -73,7 +104,7 @@ } public ResourceUser(UserDTO user, Resource 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(); @@ -82,12 +113,8 @@ this.sessionFinished = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { - ResourceUser user = null; try { user = (ResourceUser) super.clone(); @@ -101,6 +128,27 @@ return user; } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ResourceUser)) { + return false; + } + + final ResourceUser user = (ResourceUser) 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 // ********************************************************** @@ -136,10 +184,6 @@ this.userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -148,10 +192,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -160,10 +200,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -172,10 +208,6 @@ this.loginName = loginName; } - /** - * - * @return - */ public ResourceSession getSession() { return session; } @@ -184,10 +216,6 @@ this.session = session; } - /** - * - * @return - */ public Resource getResource() { return resource; } @@ -196,10 +224,6 @@ this.resource = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -208,27 +232,6 @@ this.sessionFinished = sessionFinished; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof ResourceUser)) { - return false; - } - - final ResourceUser user = (ResourceUser) 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_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -654,7 +654,7 @@ * @param request * @return */ - private List getDeletedResourceItemList(SessionMap sessionMap) { + private List getDeletedResourceItemList(SessionMap sessionMap) { return getListFromSession(sessionMap, ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -61,14 +61,7 @@ /** * Display main frame to display instrcution and item content. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ - @RequestMapping("/reviewItem") private String reviewItem(HttpServletRequest request) { String mode = request.getParameter(AttributeNames.ATTR_MODE); @@ -112,19 +105,11 @@ request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID); return "pages/itemreview/mainframe"; - } /** * Return next instrucion to page. It need four input parameters, mode, itemIndex or itemUid, and insIdx. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ - @RequestMapping("/nextInstruction") private String nextInstruction(HttpServletRequest request) { String mode = request.getParameter(AttributeNames.ATTR_MODE); @@ -141,7 +126,7 @@ int currIns = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_CURRENT_INSTRUCTION_INDEX), 0); - Set instructions = item.getItemInstructions(); + Set instructions = item.getItemInstructions(); InstructionNavDTO navDto = new InstructionNavDTO(); // For Learner upload item, its instruction will display description/comment fields in ReosourceItem. if (!item.isCreateByAuthor()) { @@ -154,13 +139,13 @@ navDto.setAllInstructions(navItems); instructions.add(ins); } else { - navDto.setAllInstructions(new ArrayList(instructions)); + navDto.setAllInstructions(new ArrayList<>(instructions)); } navDto.setTitle(item.getTitle()); navDto.setType(item.getType()); navDto.setTotal(instructions.size()); if (instructions.size() > 0) { - navDto.setInstruction((ResourceItemInstruction) new ArrayList(instructions).get(currIns)); + navDto.setInstruction(new ArrayList<>(instructions).get(currIns)); navDto.setCurrent(currIns + 1); } else { navDto.setCurrent(0); @@ -174,14 +159,7 @@ /** * Open url or file in a popup window page. - * - * @param mapping - * @param form - * @param request - * @param response - * @return */ - @RequestMapping("/openUrlPopup") private String openUrlPopup(HttpServletRequest request) { String mode = request.getParameter(AttributeNames.ATTR_MODE); @@ -204,8 +182,9 @@ } // ************************************************************************************* - // Private method + // Private methods // ************************************************************************************* + /** * Return resource item according to ToolAccessMode. * Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java =================================================================== diff -u -r94e36ba92006160e48c47ff2a60bb4f525c011e1 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 94e36ba92006160e48c47ff2a60bb4f525c011e1) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -23,17 +23,10 @@ package org.lamsfoundation.lams.tool.rsrc.web.form; -import org.apache.log4j.Logger; - /** - * * Reflection Form. - * - * */ public class ReflectionForm { - private static final long serialVersionUID = -9054365604649146735L; - private static Logger logger = Logger.getLogger(ReflectionForm.class.getName()); private Integer userID; private String sessionMapID; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java =================================================================== diff -u -r94e36ba92006160e48c47ff2a60bb4f525c011e1 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java (.../ResourceForm.java) (revision 94e36ba92006160e48c47ff2a60bb4f525c011e1) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java (.../ResourceForm.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -27,16 +27,11 @@ import org.lamsfoundation.lams.tool.rsrc.model.Resource; /** - * * Resource Form. * - * - * - * User: Dapeng.Ni + * Author: Dapeng.Ni */ public class ResourceForm { - private static final long serialVersionUID = 3599879328307492312L; - private static Logger logger = Logger.getLogger(ResourceForm.class.getName()); // Forum fields Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java (.../ResourceItemForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java (.../ResourceItemForm.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -29,8 +29,6 @@ * Resource Item Form. * * @author Steve.Ni - * - * @version $Revision$ */ public class ResourceItemForm { private String itemIndex; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -r0a46648d9547d3fca73e1931d4e628be7e1acd7b --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) @@ -37,9 +37,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; -/** - * - */ public class ResourcePedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm { private List title; private List url;