Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java =================================================================== diff -u -r337324507183ca0d40e138e7efa42ec4170af5c2 -rfbd232c320fcee76fd95240d75b8482b46565c82 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java (.../ChatSessionDTO.java) (revision 337324507183ca0d40e138e7efa42ec4170af5c2) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java (.../ChatSessionDTO.java) (revision fbd232c320fcee76fd95240d75b8482b46565c82) @@ -32,37 +32,49 @@ import org.lamsfoundation.lams.tool.chat.model.ChatMessage; import org.lamsfoundation.lams.tool.chat.model.ChatSession; +import org.lamsfoundation.lams.tool.chat.model.ChatUser; public class ChatSessionDTO implements Comparable { + Long sessionID; + + String sessionName; + + Set messageDTOs; + + Set userDTOs; + + int postCount; + public ChatSessionDTO(ChatSession session) { this.sessionID = session.getSessionId(); this.sessionName = session.getSessionName(); - chatMessages = new TreeSet(); + messageDTOs = new TreeSet(); for (Iterator i = session.getChatMessages().iterator(); i.hasNext();) { - chatMessages.add(new ChatMessageDTO((ChatMessage) i.next())); + messageDTOs.add(new ChatMessageDTO((ChatMessage) i.next())); } + + userDTOs = new TreeSet(); } public ChatSessionDTO (ChatSession session, List messages) { this.sessionID = session.getSessionId(); this.sessionName = session.getSessionName(); - chatMessages = new TreeSet(); + messageDTOs = new TreeSet(); for (Iterator i = messages.iterator(); i.hasNext();) { - chatMessages.add(new ChatMessageDTO((ChatMessage) i.next())); - } + messageDTOs.add(new ChatMessageDTO((ChatMessage) i.next())); + } + + userDTOs = new TreeSet(); } - public ChatSessionDTO() {} + public ChatSessionDTO() { + userDTOs = new TreeSet(); + messageDTOs = new TreeSet(); + } - Long sessionID; - - String sessionName; - - Set chatMessages; - public Long getSessionID() { return sessionID; } @@ -79,12 +91,12 @@ this.sessionName = sessionName; } - public Set getChatMessages() { - return chatMessages; + public Set getMessageDTOs() { + return messageDTOs; } - public void setChatMessages(Set chatMessages) { - this.chatMessages = chatMessages; + public void setMessageDTOs(Set chatMessages) { + this.messageDTOs = chatMessages; } public int compareTo(Object o) { @@ -96,4 +108,20 @@ } return returnValue; } + + public Set getUserDTOs() { + return userDTOs; + } + + public void setUserDTOs(Set chatUsers) { + this.userDTOs = chatUsers; + } + + public int getPostCount() { + return postCount; + } + + public void setPostCount(int postCount) { + this.postCount = postCount; + } } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatUserDTO.java =================================================================== diff -u --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatUserDTO.java (revision 0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatUserDTO.java (revision fbd232c320fcee76fd95240d75b8482b46565c82) @@ -0,0 +1,111 @@ +/**************************************************************** + * 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 version 2.0 + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ + +package org.lamsfoundation.lams.tool.chat.dto; + +import org.lamsfoundation.lams.tool.chat.model.ChatUser; + +public class ChatUserDTO implements Comparable{ + + public Long uid; + + public String loginName; + + public String jabberNickname; + + public String firstName; + + public String lastName; + + public int postCount; + + public ChatUserDTO(ChatUser user) { + this.uid = user.getUid(); + this.loginName = user.getLoginName(); + this.jabberNickname = user.getJabberNickname(); + this.firstName = user.getFirstName(); + this.lastName = user.getLastName(); + postCount=0; // this needs to be set manually. + } + + public int compareTo(Object o) { + int returnValue; + ChatUserDTO toUser = (ChatUserDTO)o; + returnValue = this.lastName.compareTo(toUser.lastName); + if (returnValue == 0) { + returnValue = this.uid.compareTo(toUser.uid); + } + return returnValue; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getJabberNickname() { + return jabberNickname; + } + + public void setJabberNickname(String jabberNickname) { + this.jabberNickname = jabberNickname; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getLoginName() { + return loginName; + } + + public void setLoginName(String loginName) { + this.loginName = loginName; + } + + public int getPostCount() { + return postCount; + } + + public void setPostCount(int postCount) { + this.postCount = postCount; + } + + public Long getUid() { + return uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + +}