You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2014/05/23 06:38:51 UTC
svn commit: r1597009 -
/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java
Author: vdegtyarev
Date: Fri May 23 04:38:51 2014
New Revision: 1597009
URL: http://svn.apache.org/r1597009
Log:
Use roomDao instead of roomManager.
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java?rev=1597009&r1=1597008&r2=1597009&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ChatService.java Fri May 23 04:38:51 2014
@@ -27,9 +27,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.Room;
@@ -62,7 +62,7 @@ public class ChatService implements IPen
@Autowired
private EmoticonsManager emoticonsManager;
@Autowired
- private RoomManager roomManager;
+ private RoomDao roomDao;
@Autowired
private UserManager userManager;
@@ -110,8 +110,7 @@ public class ChatService implements IPen
if (room_id == null) {
return 1; //TODO weird
}
- Long user_level = userManager.getUserLevelByID(currentClient.getUser_id());
- Room room = roomManager.getRoomById(user_level, room_id);
+ Room room = roomDao.get(room_id);
@SuppressWarnings("rawtypes")
ArrayList messageMap = (ArrayList) newMessage;
// adding delimiter space, cause otherwise an emoticon in the last
@@ -196,8 +195,7 @@ public class ChatService implements IPen
IConnection current = Red5.getConnectionLocal();
Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
Long room_id = currentClient.getRoom_id();
- Long user_level = userManager.getUserLevelByID(currentClient.getUser_id());
- Room room = roomManager.getRoomById(user_level, room_id);
+ Room room = roomDao.get(room_id);
log.debug("room_id: " + room_id);
@SuppressWarnings("rawtypes")