Author: sebawagner
Date: Fri Jan 20 14:30:09 2012
New Revision: 1233929
URL: http://svn.apache.org/viewvc?rev=1233929&view=rev
Log:
Remove Deprecated Calls
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1233929&r1=1233928&r2=1233929&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Fri Jan 20 14:30:09 2012
@@ -1930,95 +1930,6 @@ public class ScopeApplicationAdapter ext
return null;
}
- /*
- * Returns only the Moderators (if there are some)
- *
- * @deprecated I don't see this Function used anywhere
- */
- // public synchronized HashMap<String,RoomClient>
- // getModeratorRoomClients(Long room_id) {
- // try {
- //
- // HashMap <String,RoomClient> roomClientList = new
- // HashMap<String,RoomClient>();
- //
- // HashMap<String,RoomClient> clientListRoom =
- // this.clientListManager.getClientListByRoom(room_id);
- // for (Iterator<String>
- // iter=clientListRoom.keySet().iterator();iter.hasNext();) {
- // String key = (String) iter.next();
- // RoomClient rcl = this.clientListManager.getClientByStreamId(key);
- //
- // if (rcl.getIsMod()) {
- // log.debug("#+#+#+#+##+## logicalRoomEnter ClientList key:
"+rcl.getRoom_id()+" "+room_id);
- // log.debug("set to ++ for client: "+rcl.getStreamid());
- // //Add user to List
- // roomClientList.put(key, rcl);
- // }
- // }
- //
- // return roomClientList;
- // } catch (Exception err){
- // log.error("[getModeratorRoomClients]",err);
- // }
- // return null;
- // }
-
- /**
- * this is set initial directly after login/loading language
- *
- * @deprecated
- *
- * @param userId
- * @param username
- * @param firstname
- * @param lastname
- * @param orgdomain
- * @return
- */
- @Deprecated
- public synchronized RoomClient setUsername(Long userId, String username,
- String firstname, String lastname) {
- try {
- log.debug("#*#*#*#*#*#*# setUsername userId: " + userId
- + " username: " + username + "
firstname: " + firstname
- + " lastname: " + lastname);
- IConnection current = Red5.getConnectionLocal();
- String streamid = current.getClient().getId();
- RoomClient currentClient = this.clientListManager
- .getClientByStreamId(streamid);
-
- log.debug("[setUsername] id: " +
currentClient.getStreamid());
-
- currentClient.setUsername(username);
- currentClient.setUser_id(userId);
- currentClient.setUserObject(userId, username,
firstname, lastname);
-
- // Update Session Data
- log.debug("UDPATE SESSION " +
currentClient.getPublicSID() + ", "
- + userId);
-
-
sessionManagement.updateUser(currentClient.getPublicSID(), userId,
- false, null);
-
- // only fill this value from User-REcord
- // cause invited users have non
- // you cannot set the firstname,lastname from the
UserRecord
- Users us = usersDao.getUser(userId);
- if (us != null && us.getPictureuri() != null) {
- // set Picture-URI
- log.debug("###### SET PICTURE URI");
-
currentClient.setPicture_uri(us.getPictureuri());
- }
- this.clientListManager.updateClientByStreamId(streamid,
- currentClient);
- return currentClient;
- } catch (Exception err) {
- log.error("[setUsername]", err);
- }
- return null;
- }
-
public synchronized RoomClient setUsernameReconnect(String SID,
Long userId, String username, String firstname, String
lastname,
String picture_uri) {
@@ -2124,78 +2035,6 @@ public class ScopeApplicationAdapter ext
}
/**
- *
- * @param colorObj
- * @param userPos
- * @deprecated
- * @return
- */
- @Deprecated
- public synchronized int setAudienceModus(String colorObj, int userPos) {
- try {
- IConnection current = Red5.getConnectionLocal();
-
- RoomClient currentClient = this.clientListManager
-
.getClientByStreamId(current.getClient().getId());
- log.debug("xmlcrm setUserObjectOneFour: "
- + currentClient.getUsername());
- currentClient.setUsercolor(colorObj);
- currentClient.setUserpos(userPos);
- // Long room_id = currentClient.getRoom_id();
-
- // Notify all clients of the same scope (room)
- Collection<Set<IConnection>> conCollection =
current.getScope()
- .getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection conn : conset) {
- if (conn != null) {
- if (conn instanceof
IServiceCapableConnection) {
- if
(conn.equals(current)) {
- continue;
- } else {
- RoomClient rcl
= this.clientListManager
-
.getClientByStreamId(conn.getClient()
-
.getId());
- if (rcl ==
null) {
- //
continue;
- } else if
(rcl.getIsScreenClient() != null
-
&& rcl.getIsScreenClient()) {
- //
continue;
- } else {
- //
log.debug("*** setAudienceModus Found Client to "
- // +
conn);
- //
log.debug("*** setAudienceModus Found Client to "
- // +
conn.getClient());
- if
(conn instanceof IServiceCapableConnection) {
-
((IServiceCapableConnection) conn)
-
.invoke("setAudienceModusClient",
-
new Object[] { currentClient },
-
this);
-
// log.debug("sending setAudienceModusClient to "
-
// + conn);
-
// if any user in this room is recording
-
// add this client to the list
-
// if (rcl.getIsRecording()) {
-
// log.debug("currentClient "+currentClient.getPublicSID());
-
// //StreamService.addRoomClientEnterEventFunc(currentClient,
-
// rcl.getRoomRecordingName(),
-
// currentClient.getUserip(), true);
-
// }
- }
- }
- }
- }
- }
- }
- }
-
- } catch (Exception err) {
- log.error("[setUserObjectOne2Four]", err);
- }
- return -1;
- }
-
- /**
* used by the Screen-Sharing Servlet to trigger events
*
* @param room_id
