Fisheye: Tag bc098bac007b1eac4ebdf897b0dd8b26365d4762 refers to a dead (removed) revision in file `lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bc098bac007b1eac4ebdf897b0dd8b26365d4762 refers to a dead (removed) revision in file `lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bc098bac007b1eac4ebdf897b0dd8b26365d4762 refers to a dead (removed) revision in file `lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bc098bac007b1eac4ebdf897b0dd8b26365d4762 refers to a dead (removed) revision in file `lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) @@ -21,63 +21,83 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.notebook.model; import java.util.Date; import java.util.HashSet; import java.util.Set; import java.util.TreeSet; +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.OneToMany; +import javax.persistence.Table; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; import org.lamsfoundation.lams.tool.notebook.service.NotebookService; -/** - * - */ +@Entity +@Table(name = "tl_lantbk11_notebook") public class Notebook implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 579733009969321015L; static Logger log = Logger.getLogger(NotebookService.class.getName()); - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "create_date") private Date createDate; + @Column(name = "update_date") private Date updateDate; + @Column(name = "create_by") private Long createBy; + @Column private String title; + @Column private String instructions; - + + @Column(name = "force_response") private boolean forceResponse; + @Column(name = "lock_on_finished") private boolean lockOnFinished; + @Column(name = "allow_rich_editor") private boolean allowRichEditor; + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "submission_deadline") private Date submissionDeadline; + @Column(name = "tool_content_id") private Long toolContentId; - private Set notebookSessions; + @OneToMany(mappedBy = "notebook") + private Set notebookSessions = new HashSet(); + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "content_uid") private Set conditions = new TreeSet(new TextSearchConditionComparator()); - // Property accessors - /** - * - * - */ public Long getUid() { return uid; } @@ -86,10 +106,6 @@ this.uid = uid; } - /** - * - * - */ public Date getCreateDate() { return createDate; } @@ -98,10 +114,6 @@ this.createDate = createDate; } - /** - * - * - */ public Date getUpdateDate() { return updateDate; } @@ -110,11 +122,6 @@ this.updateDate = updateDate; } - /** - * - * - */ - public Long getCreateBy() { return createBy; } @@ -123,11 +130,6 @@ this.createBy = createBy; } - /** - * - * - */ - public String getTitle() { return title; } @@ -136,11 +138,6 @@ this.title = title; } - /** - * - * - */ - public String getInstructions() { return instructions; } @@ -149,37 +146,22 @@ this.instructions = instructions; } - /** - * - * - */ - public boolean isLockOnFinished() { return lockOnFinished; } public void setLockOnFinished(boolean lockOnFinished) { this.lockOnFinished = lockOnFinished; } - - /** - * - * - */ public boolean isForceResponse() { - return forceResponse; + return forceResponse; } public void setForceResponse(boolean forceResponse) { - this.forceResponse = forceResponse; + this.forceResponse = forceResponse; } - - /** - * - * @return - */ public boolean isAllowRichEditor() { return allowRichEditor; } @@ -188,11 +170,6 @@ this.allowRichEditor = allowRichEditor; } - /** - * - * - */ - public boolean isContentInUse() { return contentInUse; } @@ -201,11 +178,6 @@ this.contentInUse = contentInUse; } - /** - * - * - */ - public boolean isDefineLater() { return defineLater; } @@ -218,22 +190,10 @@ this.submissionDeadline = submissionDeadline; } - /** - * - * - * @return date submissionDeadline - * - */ - public Date getSubmissionDeadline() { return submissionDeadline; } - /** - * - * - */ - public Long getToolContentId() { return toolContentId; } @@ -242,28 +202,14 @@ this.toolContentId = toolContentId; } - /** - * - * - * - * - */ - - public Set getNotebookSessions() { + public Set getNotebookSessions() { return notebookSessions; } - public void setNotebookSessions(Set notebookSessions) { + public void setNotebookSessions(Set notebookSessions) { this.notebookSessions = notebookSessions; } - /** - * - * sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator" - * - * - * - */ public Set getConditions() { return conditions; } @@ -272,11 +218,6 @@ this.conditions = conditions; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -331,7 +272,7 @@ notebook.setUid(null); // create an empty set for the notebookSession - notebook.notebookSessions = new HashSet(); + notebook.notebookSessions = new HashSet(); if (conditions != null) { Set set = new TreeSet(new TextSearchConditionComparator()); @@ -346,5 +287,4 @@ } return notebook; } - -} +} \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.java (.../NotebookCondition.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.java (.../NotebookCondition.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) @@ -1,5 +1,8 @@ package org.lamsfoundation.lams.tool.notebook.model; +import javax.persistence.Entity; +import javax.persistence.Table; + import org.lamsfoundation.lams.learningdesign.BranchCondition; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.TextSearchCondition; @@ -12,6 +15,8 @@ * @author Marcin Cieslak * */ +@Entity +@Table(name = "tl_lantbk11_conditions") public class NotebookCondition extends TextSearchCondition { public NotebookCondition() { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java (.../NotebookSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookSession.java (.../NotebookSession.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) @@ -21,56 +21,63 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.notebook.model; import java.util.Date; import java.util.HashSet; import java.util.Set; +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.Table; + import org.apache.log4j.Logger; -/** - * - * Represents the tool session. - * - * - */ - +@Entity +@Table(name = "tl_lantbk11_session") public class NotebookSession implements java.io.Serializable { - private static Logger log = Logger.getLogger(NotebookSession.class); - /** - * - */ + private static final long serialVersionUID = 4407078136514639026L; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "session_end_date") private Date sessionEndDate; + @Column(name = "session_start_date") private Date sessionStartDate; + @Column private Integer status; + @Column(name = "session_id") private Long sessionId; + @Column(name = "session_name") private String sessionName; + @ManyToOne + @JoinColumn(name = "notebook_uid") private Notebook notebook; - private Set notebookUsers; + @OneToMany(mappedBy = "notebookSession") + private Set notebookUsers = new HashSet(); - // Constructors - - /** default constructor */ public NotebookSession() { } - /** full constructor */ public NotebookSession(Date sessionEndDate, Date sessionStartDate, Integer status, Long sessionId, - String sessionName, Notebook notebook, Set notebookUsers) { + String sessionName, Notebook notebook, Set notebookUsers) { this.sessionEndDate = sessionEndDate; this.sessionStartDate = sessionStartDate; this.status = status; @@ -80,12 +87,6 @@ this.notebookUsers = notebookUsers; } - // Property accessors - /** - * - * - */ - public Long getUid() { return this.uid; } @@ -94,11 +95,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getSessionEndDate() { return this.sessionEndDate; } @@ -107,11 +103,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - */ - public Date getSessionStartDate() { return this.sessionStartDate; } @@ -120,11 +111,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - */ - public Integer getStatus() { return this.status; } @@ -133,11 +119,6 @@ this.status = status; } - /** - * - * - */ - public Long getSessionId() { return this.sessionId; } @@ -146,11 +127,6 @@ this.sessionId = sessionId; } - /** - * - * - */ - public String getSessionName() { return this.sessionName; } @@ -159,12 +135,6 @@ this.sessionName = sessionName; } - /** - * - * - * - */ - public Notebook getNotebook() { return this.notebook; } @@ -173,26 +143,14 @@ this.notebook = notebook; } - /** - * - * - * - * - */ - - public Set getNotebookUsers() { + public Set getNotebookUsers() { return this.notebookUsers; } - public void setNotebookUsers(Set notebookUsers) { + public void setNotebookUsers(Set notebookUsers) { this.notebookUsers = notebookUsers; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -238,11 +196,10 @@ NotebookSession session = null; try { session = (NotebookSession) super.clone(); - session.notebookUsers = new HashSet(); + session.notebookUsers = new HashSet(); } catch (CloneNotSupportedException e) { log.error("When clone " + NotebookSession.class + " failed"); } return session; } - } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rbc098bac007b1eac4ebdf897b0dd8b26365d4762 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java (.../NotebookUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java (.../NotebookUser.java) (revision bc098bac007b1eac4ebdf897b0dd8b26365d4762) @@ -21,9 +21,17 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.notebook.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.lamsfoundation.lams.usermanagement.dto.UserDTO; /** @@ -32,56 +40,61 @@ * * */ +@Entity +@Table(name = "tl_lantbk11_user") public class NotebookUser implements java.io.Serializable { private static final long serialVersionUID = -3701664859818409197L; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "user_id") private Long userId; + @Column(name = "last_name") private String lastName; + @Column(name = "first_name") private String firstName; + @Column(name = "login_name") private String loginName; + @ManyToOne + @JoinColumn(name = "notebook_session_uid") private NotebookSession notebookSession; + @Column private boolean finishedActivity; + @Column(name = "entry_uid") private Long entryUID; + @Column(name = "teachers_comment") private String teachersComment; - // Constructors - - /** default constructor */ public NotebookUser() { } public NotebookUser(UserDTO user, NotebookSession notebookSession) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); this.notebookSession = notebookSession; this.finishedActivity = false; } - /** full constructor */ public NotebookUser(Long userId, String lastName, String firstName, NotebookSession notebookSession) { this.userId = userId; this.lastName = lastName; this.firstName = firstName; this.notebookSession = notebookSession; } - // Property accessors - /** - * - */ public Long getUid() { return this.uid; } @@ -90,10 +103,6 @@ this.uid = uid; } - /** - * - * - */ public Long getUserId() { return this.userId; } @@ -102,10 +111,6 @@ this.userId = userId; } - /** - * - * - */ public String getLastName() { return this.lastName; } @@ -114,10 +119,6 @@ this.lastName = lastName; } - /** - * - * - */ public String getLoginName() { return loginName; } @@ -126,10 +127,6 @@ this.loginName = loginName; } - /** - * - * - */ public String getFirstName() { return this.firstName; } @@ -138,9 +135,6 @@ this.firstName = firstName; } - /** - * - */ public boolean isFinishedActivity() { return finishedActivity; } @@ -149,11 +143,6 @@ this.finishedActivity = finishedActivity; } - /** - * - * - * - */ public NotebookSession getNotebookSession() { return this.notebookSession; } @@ -162,9 +151,6 @@ this.notebookSession = notebookSession; } - /** - * - */ public Long getEntryUID() { return entryUID; } @@ -173,10 +159,6 @@ this.entryUID = entryUID; } - /** - * - * - */ public String getTeachersComment() { return teachersComment; } @@ -185,11 +167,6 @@ this.teachersComment = teachersComment; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer();