Fisheye: Tag 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java (.../ChatMessageDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java (.../ChatMessageDAO.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.chat.dao.IChatMessageDAO; import org.lamsfoundation.lams.tool.chat.model.ChatMessage; @@ -56,7 +56,7 @@ public static final String SQL_QUERY_FIND_MESSAGE_BY_UID = "from " + ChatMessage.class.getName() + " where uid=?"; public static final String SQL_QUERY_FIND_MESSAGE_BY_SESSION_ORDER_BY_DATE = "from " + ChatMessage.class.getName() - + " as f where f.chatSession=? order by f.sendDate "; + + " as f where f.chatSession.uid=:chatSessionUid order by f.sendDate "; public static final String SQL_QUERY_FIND_MESSAGE_COUNT_BY_FROM_USER = "select f.fromUser.uid, count(*) from " + ChatMessage.class.getName() + " as f where f.chatSession.uid=? group by f.fromUser"; @@ -99,7 +99,7 @@ try { Query query = getSessionFactory().getCurrentSession().createQuery( ChatMessageDAO.SQL_QUERY_FIND_MESSAGE_BY_SESSION_ORDER_BY_DATE + (orderAsc ? "asc" : "desc")); - query.setLong(0, chatSession.getUid()); + query.setParameter("chatSessionUid", chatSession.getUid()); if (max != null) { query.setMaxResults(max); } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java (.../ChatUserDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java (.../ChatUserDAO.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.dao.hibernate; import java.util.Date; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -21,78 +21,96 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.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.OneToMany; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; import org.lamsfoundation.lams.tool.chat.service.ChatService; -/** - * - */ - +@Entity +@Table(name = "tl_lachat11_chat") public class Chat implements java.io.Serializable, Cloneable { - /** - * - */ private static final long serialVersionUID = 579733009969321015L; static Logger log = Logger.getLogger(ChatService.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 = "lock_on_finished") private boolean lockOnFinished; + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + @Column(name = "reflect_instructions") private String reflectInstructions; + @Column(name = "filtering_enabled") private boolean filteringEnabled; + @Column(name = "filter_keywords") private String filterKeywords; + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "tool_content_id") private Long toolContentId; + @Column(name = "submission_deadline") private Date submissionDeadline; - private Set chatSessions; + @OneToMany(mappedBy = "chat", cascade = CascadeType.ALL) + private Set chatSessions = new HashSet(); + + // @OneToMany(cascade = CascadeType.ALL) + // @JoinTable(name = "tl_lachat11_conditions", joinColumns = @JoinColumn(name = "content_uid"), inverseJoinColumns = @JoinColumn(name = "condition_id")) + @Transient private Set conditions = new TreeSet(new TextSearchConditionComparator()); - // Constructors - - /** default constructor */ public Chat() { } - /** full constructor */ public Chat(Date createDate, Date updateDate, Long createBy, String title, String instructions, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords, boolean contentInUse, - boolean defineLater, Long toolContentId, Set chatSessions) { + boolean defineLater, Long toolContentId, Set chatSessions) { this.createDate = createDate; this.updateDate = updateDate; this.createBy = createBy; @@ -107,12 +125,6 @@ this.chatSessions = chatSessions; } - // Property accessors - /** - * - * - */ - public Long getUid() { return uid; } @@ -121,11 +133,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getCreateDate() { return createDate; } @@ -134,11 +141,6 @@ this.createDate = createDate; } - /** - * - * - */ - public Date getUpdateDate() { return updateDate; } @@ -147,11 +149,6 @@ this.updateDate = updateDate; } - /** - * - * - */ - public Long getCreateBy() { return createBy; } @@ -160,11 +157,6 @@ this.createBy = createBy; } - /** - * - * - */ - public String getTitle() { return title; } @@ -173,11 +165,6 @@ this.title = title; } - /** - * - * - */ - public String getInstructions() { return instructions; } @@ -186,11 +173,6 @@ this.instructions = instructions; } - /** - * - * - */ - public boolean isLockOnFinished() { return lockOnFinished; } @@ -199,9 +181,6 @@ this.lockOnFinished = lockOnFinished; } - /** - * - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -210,9 +189,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * - */ public String getReflectInstructions() { return reflectInstructions; } @@ -221,11 +197,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * - */ - public boolean isContentInUse() { return contentInUse; } @@ -234,11 +205,6 @@ this.contentInUse = contentInUse; } - /** - * - * - */ - public boolean isDefineLater() { return defineLater; } @@ -247,11 +213,6 @@ this.defineLater = defineLater; } - /** - * - * - */ - public Long getToolContentId() { return toolContentId; } @@ -260,24 +221,14 @@ this.toolContentId = toolContentId; } - /** - * - * - * - * - */ - - public Set getChatSessions() { + public Set getChatSessions() { return chatSessions; } - public void setChatSessions(Set chatSessions) { + public void setChatSessions(Set chatSessions) { this.chatSessions = chatSessions; } - /** - * - */ public boolean isFilteringEnabled() { return filteringEnabled; } @@ -286,9 +237,6 @@ this.filteringEnabled = filteringEnabled; } - /** - * - */ public String getFilterKeywords() { return filterKeywords; } @@ -297,10 +245,6 @@ this.filterKeywords = filterKeywords; } - /** - * - * @return - */ public Date getSubmissionDeadline() { return submissionDeadline; } @@ -309,11 +253,6 @@ this.submissionDeadline = submissionDeadline; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -368,7 +307,7 @@ chat.setUid(null); // create an empty set for the chatSession - chat.chatSessions = new HashSet(); + chat.chatSessions = new HashSet(); if (conditions != null) { Set set = new TreeSet(new TextSearchConditionComparator()); @@ -384,18 +323,11 @@ return chat; } - /** - * - * sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator" - * - * - * - */ public Set getConditions() { return conditions; } public void setConditions(Set conditions) { this.conditions = conditions; } -} +} \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java (.../ChatCondition.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java (.../ChatCondition.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -20,6 +20,9 @@ * * @author Marcin Cieslak * + * + * @Entity + * @Table(name = "tl_lachat11_conditions") */ public class ChatCondition extends TextSearchCondition { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java (.../ChatMessage.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java (.../ChatMessage.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -21,12 +21,19 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.chat.model; 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 org.apache.commons.lang.builder.ToStringBuilder; /** @@ -36,43 +43,49 @@ * * */ +@Entity +@Table(name = "tl_lachat11_message") public class ChatMessage implements java.io.Serializable { - /** - * - */ private static final long serialVersionUID = -3976906267301586708L; public static final String MESSAGE_TYPE_PUBLIC = "groupchat"; public static final String MESSAGE_TYPE_PRIVATE = "chat"; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @ManyToOne + @JoinColumn(name = "chat_session_uid") private ChatSession chatSession; + @ManyToOne + @JoinColumn(name = "from_user_uid") private ChatUser fromUser; + @ManyToOne + @JoinColumn(name = "to_user_uid") private ChatUser toUser; + @Column private String type; + @Column private String body; + @Column(name = "send_date") private Date sendDate; + @Column private boolean hidden; /** default constructor */ public ChatMessage() { } - // Property accessors - - /** - * - */ public Long getUid() { return uid; } @@ -81,9 +94,6 @@ this.uid = uid; } - /** - * - */ public ChatSession getChatSession() { return chatSession; } @@ -92,11 +102,6 @@ this.chatSession = chatSession; } - /** - * - * - * - */ public ChatUser getFromUser() { return fromUser; } @@ -106,9 +111,6 @@ } /** - * - * - * * The toUser field is null when the type is "groupchat", and non null when * the type is "chat" */ @@ -120,9 +122,6 @@ this.toUser = to; } - /** - * - */ public String getType() { return type; } @@ -131,9 +130,6 @@ this.type = type; } - /** - * - */ public String getBody() { return body; } @@ -142,9 +138,6 @@ this.body = body; } - /** - * - */ public Date getSendDate() { return sendDate; } @@ -153,10 +146,6 @@ this.sendDate = sendDate; } - /** - * - * - */ public boolean isHidden() { return hidden; } @@ -169,4 +158,4 @@ public String toString() { return new ToStringBuilder(this).append("uid", uid).append("body", body).toString(); } -} +} \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java (.../ChatSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java (.../ChatSession.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -21,58 +21,67 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.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_lachat11_session") public class ChatSession implements java.io.Serializable { private static Logger log = Logger.getLogger(ChatSession.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 = "chat_uid") private Chat chat; - private Set chatUsers; + @OneToMany(mappedBy = "chatSession") + private Set chatUsers = new HashSet(); - private Set chatMessages; + @OneToMany(mappedBy = "chatSession") + private Set chatMessages = new HashSet(); - // Constructors - - /** default constructor */ public ChatSession() { } - /** full constructor */ public ChatSession(Date sessionEndDate, Date sessionStartDate, Integer status, Long sessionId, String sessionName, - Chat chat, Set chatUsers) { + Chat chat, Set chatUsers) { this.sessionEndDate = sessionEndDate; this.sessionStartDate = sessionStartDate; this.status = status; @@ -82,12 +91,6 @@ this.chatUsers = chatUsers; } - // Property accessors - /** - * - * - */ - public Long getUid() { return this.uid; } @@ -96,11 +99,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getSessionEndDate() { return this.sessionEndDate; } @@ -109,11 +107,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - */ - public Date getSessionStartDate() { return this.sessionStartDate; } @@ -122,11 +115,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - */ - public Integer getStatus() { return this.status; } @@ -135,11 +123,6 @@ this.status = status; } - /** - * - * - */ - public Long getSessionId() { return this.sessionId; } @@ -148,11 +131,6 @@ this.sessionId = sessionId; } - /** - * - * - */ - public String getSessionName() { return this.sessionName; } @@ -161,12 +139,6 @@ this.sessionName = sessionName; } - /** - * - * - * - */ - public Chat getChat() { return this.chat; } @@ -175,41 +147,22 @@ this.chat = chat; } - /** - * - * - * - * - */ - - public Set getChatUsers() { + public Set getChatUsers() { return this.chatUsers; } - public void setChatUsers(Set chatUsers) { + public void setChatUsers(Set chatUsers) { this.chatUsers = chatUsers; } - /** - * - * - * - * - */ - - public Set getChatMessages() { + public Set getChatMessages() { return this.chatMessages; } - public void setChatMessages(Set chatMessages) { + public void setChatMessages(Set chatMessages) { this.chatMessages = chatMessages; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -255,11 +208,10 @@ ChatSession session = null; try { session = (ChatSession) super.clone(); - session.chatUsers = new HashSet(); + session.chatUsers = new HashSet(); } catch (CloneNotSupportedException e) { log.error("When clone " + ChatSession.class + " failed"); } return session; } - } \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r4f55bd929d94e4cfc74607e6b992bc3a35ce25c8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java (.../ChatUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java (.../ChatUser.java) (revision 4f55bd929d94e4cfc74607e6b992bc3a35ce25c8) @@ -21,11 +21,19 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.chat.model; 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 org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** @@ -35,59 +43,60 @@ * * */ - +@Entity +@Table(name = "tl_lachat11_user") public class ChatUser 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 = "chat_session_uid") private ChatSession chatSession; + @Column private boolean finishedActivity; + @Column private String nickname; + @Column(name = "last_presence") private Date lastPresence; - // Constructors - /** default constructor */ public ChatUser() { } public ChatUser(UserDTO user, ChatSession chatSession) { - 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.chatSession = chatSession; this.finishedActivity = false; } - /** full constructor */ public ChatUser(Long userId, String lastName, String firstName, ChatSession chatSession) { this.userId = userId; this.lastName = lastName; this.firstName = firstName; this.chatSession = chatSession; } - // Property accessors - /** - * - */ public Long getUid() { return this.uid; } @@ -96,10 +105,6 @@ this.uid = uid; } - /** - * - * - */ public Long getUserId() { return this.userId; } @@ -108,10 +113,6 @@ this.userId = userId; } - /** - * - * - */ public String getLastName() { return this.lastName; } @@ -120,10 +121,6 @@ this.lastName = lastName; } - /** - * - * - */ public String getLoginName() { return loginName; } @@ -132,10 +129,6 @@ this.loginName = loginName; } - /** - * - * - */ public String getFirstName() { return this.firstName; } @@ -144,9 +137,6 @@ this.firstName = firstName; } - /** - * - */ public boolean isFinishedActivity() { return finishedActivity; } @@ -155,9 +145,6 @@ this.finishedActivity = finishedActivity; } - /** - * - */ public String getNickname() { return nickname; } @@ -166,11 +153,6 @@ this.nickname = nickname; } - /** - * - * - * - */ public ChatSession getChatSession() { return this.chatSession; } @@ -179,9 +161,6 @@ this.chatSession = chatSession; } - /** - * - */ public Date getLastPresence() { return lastPresence; } @@ -190,11 +169,6 @@ this.lastPresence = lastPresence; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer();