You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/19 09:08:12 UTC
svn commit: r1363250 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/hibernate/ WebContent/src/modules/admin/roomadmin/
WebContent/src/modules/conference/conference/
WebContent/src/modules/conference/interviewuserlist/ WebContent/s...
Author: solomax
Date: Thu Jul 19 07:08:11 2012
New Revision: 1363250
URL: http://svn.apache.org/viewvc?rev=1363250&view=rev
Log:
ClientListManager was modified to return List instead of HashMap to avoid redundant iterations.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Thu Jul 19 07:08:11 2012
@@ -1054,9 +1054,6 @@
<netRemoteCallHib name="clientregisterRoom" funcname="clientregisterRoom">
<handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- ////Debug.write("clientregisterRoom: ",value);
- //parent.getClientListScope.doCall();
</handler>
</netRemoteCallHib>
@@ -1064,7 +1061,6 @@
if (canvas._videocontainer!=null){
canvas._videocontainer.disconnectclient(id);
if (canvas.currentModApply!=null) canvas.currentModApply.rejectUser(value);
- //parent.getClientListScope.doCall();
if (value.isRecording) {
canvas._mymod.recordingUser = null;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Thu Jul 19 07:08:11 2012
@@ -157,7 +157,7 @@
}
this._turnoverlist.clearList();
- this._turnoverlist.getRoomClientsMapByRoomId.doCall();
+ this._turnoverlist.getRoomClientsListByRoomId.doCall();
if (obj.ownerId != null) {
this.ownerId.setAttribute("text",obj.ownerId);
@@ -589,11 +589,11 @@
if ($debug) Debug.write("onclickedItem",obj,obj.obj);
</handler>
- <netRemoteCallHib name="getRoomClientsMapByRoomId" funcname="conferenceservice.getRoomClientsMapByRoomId"
+ <netRemoteCallHib name="getRoomClientsListByRoomId" funcname="conferenceservice.getRoomClientsListByRoomId"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue"> return parent.parent.parent.rooms_id; </method></netparam>
<handler name="ondata" args="value">
- if ($debug) Debug.write("getRoomClientsMapByRoomId: ",value);
+ if ($debug) Debug.write("getRoomClientsListByRoomId: ",value);
//this.parent.destroy();
this.parent.renderContent(value);
</handler>
@@ -602,7 +602,7 @@
<method name="renderContent" args="records">
<![CDATA[
this.clearList();
- for (var i in records){
+ for (var i = 0; i < records.length; ++i) {
new lz.roomAdminRoomClientListItem(this._innerlist._inn._inn,{
obj:records[i],
red5_id:i,
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx Thu Jul 19 07:08:11 2012
@@ -127,7 +127,7 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getRoomClientsMapByRoomId" funcname="conferenceservice.getRoomClientsMapByRoomId"
+ <netRemoteCallHib name="getRoomClientsListByRoomId" funcname="conferenceservice.getRoomClientsListByRoomId"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return parent.parent.roomid;</method></netparam>
<handler name="ondata" args="value">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx Thu Jul 19 07:08:11 2012
@@ -136,8 +136,6 @@
//if ($debug) Debug.write("setRoomValues1: ",value);
//if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
- //if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
-
if (roomStatus.roomFull) {
canvas.thishib.showFullMessage = true;
canvas.thishib.disconnect();
@@ -150,15 +148,13 @@
canvas.startBrowser(tObj);
}
- var value = roomStatus.clientMap;
+ var value = roomStatus.clientList;
- //if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
- for (var i in value){
+ for (var i = 0; i < value.length; ++i){
if ( value[i].streamid == canvas.streamid ) {
canvas.isAllowedToDraw = value[i].canDraw;
}
- //if ($debug) Debug.write("getClientListScope value: ",value[i]);
this.parent.addItem(value[i].connectedSince,value[i].isMod,value[i].streamid,value[i].username,
'',value[i].formatedDate,value[i].userpos,value[i].usercolor,value[i]);
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewVideoBox.lzx Thu Jul 19 07:08:11 2012
@@ -39,7 +39,7 @@
<![CDATA[
if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
- for (var i in value) {
+ for (var i = 0; i < value.length; ++i) {
parent._users.addItem(value[i].firstname+','+value[i].lastname+' ['+value[i].username+']',value[i].publicSID);
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx Thu Jul 19 07:08:11 2012
@@ -113,7 +113,7 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
//Debug.write("INSTANCE getClientListScope : ",value);
- for (var eg in value){
+ for (var eg = 0; eg < value.length; ++eg) {
//Debug.write("value: ",eg,value,parent.userslist.userslist.userslist);
if (canvas.streamid!=value[eg].streamid) {
new lz.userItem(parent.userslist.userslist.userslist,{name:value[eg].streamid,username:value[eg].username,streamid:value[eg].streamid});
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Thu Jul 19 07:08:11 2012
@@ -162,9 +162,9 @@
canvas.startBrowser(tObj);
}
- var value = roomStatus.clientMap;
+ var value = roomStatus.clientList;
- for (var i in value){
+ for (var i = 0; i < value.length; ++i){
if ( value[i].streamid == canvas.streamid ) {
canvas.isAllowedToDraw = value[i].canDraw;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx Thu Jul 19 07:08:11 2012
@@ -165,9 +165,9 @@
canvas.startBrowser(tObj);
}
- var value = roomStatus.clientMap;
+ var value = roomStatus.clientList;
- for (var i in value){
+ for (var i = 0; i < value.length; ++i){
if ( value[i].streamid == canvas.streamid ) {
value[i].selfItem = true;
canvas.isAllowedToDraw = value[i].canDraw;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx Thu Jul 19 07:08:11 2012
@@ -34,40 +34,6 @@
<attribute name="screenImageRef1" value="null" />
<attribute name="screenImageRef2" value="null" />
- <!-- reference to the current loading bar
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <attribute name="loadimageDataWinRef" value="null" />
- -->
-
- <!-- labelid of the message seen while waiting for loading
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <attribute name="imageLoadMessageId" value="208" type="number" />
- -->
-
- <!-- labelid of the message seen while waiting for syncing
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <attribute name="imageSyncMessageId" value="209" type="number" />
- <attribute name="imageSyncMessageText" value="" type="string" />
- -->
-
- <!-- syncing process
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <attribute name="syncImageCheckTime" value="1000" type="number" />
- <attribute name="_loadingUsersImageList" value="null" />
- <attribute name="loadingUsersImageListIndex" value="0" type="number" />
- <attribute name="syncImageRefObj" value="null" />
- <attribute name="imageLoadingCompleteMessage" value="null" />
- <attribute name="loadImageObjectTimer" value="null" />
- -->
-
<event name="setNewScreenUserName" />
<!-- invoked by clicking on the confirmation dialog after
@@ -358,49 +324,6 @@
this.sendCompletedObjectSyncEvent.uniqueObjectSyncName = this.syncImageRefObj.uniqueObjectSyncName;
this.sendCompletedObjectSyncEvent.doCall();
</method>
-
-
- <!-- sending messages/notifications of sync process
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <netRemoteCallHib name="sendMessageWithClientImage" funcname="sendMessageWithClient" remotecontext="$once{ canvas.thishib }" >
- <netparam name="vars"><method name="getValue">return parent.parent.imageLoadingCompleteMessage;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getValue : ",value);
-
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
-
- <!-- get list of clients before loading image cause
- we have to show the sync process
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <netRemoteCallHib name="getImageClientListScope" funcname="getClientListScope" remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called by the rtmpconnection
- //Debug.write("getClientListScope Instance: ",value);
- parent._loadingUsersImageList = new Array();
- for (var eg in value){
- if (canvas.streamid != value[eg].streamid){
- //Debug.write("parent._loadingUsersImageList value eg ",eg,value[eg]);
- parent._loadingUsersImageList.push(value[eg]);
- }
- }
- this.parent.doRegisterAfterLoadingOrRecording();
- //set modus to hand so users can directly select that image
- this.parent.setModus('hand');
- this.parent.startImgaesyncCheck();
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
<!--- @keywords deprecated
TODO: Check recorder Modus
@@ -420,72 +343,6 @@
this.getZIndex());
</method>
- <!-- after loading the objects check if all connected clients of that conference
- have loaded the file completely, check it every 1 seconds
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <method name="startImgaesyncCheck">
- <![CDATA[
- if (this._loadingUsersImageList.length==0){
- this.sendSyncNotificationImage();
- } else {
- var txt = this.imageSyncMessageText+' '+this._loadingUsersImageList.length;
- this.loadimageDataWinRef.setMessage(txt);
- this.loadImageObjectTimer = new LzDelegate( this, "startImgaesyncCheck" );
- lz.Timer.addTimer( this.loadImageObjectTimer, this.syncImageCheckTime );
- }
- ]]>
- </method>
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <method name="sendSyncNotificationImage">
- this.imageLoadingCompleteMessage = new Array();
- this.imageLoadingCompleteMessage[0] = "whiteboard";
- this.imageLoadingCompleteMessage[1] = "imagesynccomplete";
- this.sendMessageWithClientImage.doCall();
- </method>
- -->
-
- <!-- invoked by remote client once he has completely loaded the wml-file
- remote client is waiting/still shows loading window untill all clients have
- completely loaded the object/moderator sends "synccomplete" message
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <method name="sendCompleteImageLoadedRClient" args="client">
- <![CDATA[
- //detect self messageing
- if (client.streamid!=canvas.streamid){
- //remove client from sync list
- for (var i=0;i<this._loadingUsersImageList.length;i++){
- if (this._loadingUsersImageList[i].streamid==client.streamid){
- //Debug.write("deleteing client from list: ",this._loadingUsersImageList[i].streamid);
- this._loadingUsersImageList.splice(i,1);
- }
- }
- }
- ]]>
- </method>
- -->
-
- <!-- invoked remotely by Moderator
- all clients have succeed in loading the image
- loading win can be closed
- Alert: This notification will be send from Moderator and received by ALL clients INCLUDING
- the moderator, so the moderator needs no extra command *close* for loading bar cause he
- gets its own *sync* complete nofification
-
- syncing is now on server side implemented, swagner 11.06.2008
-
- <method name="sendCompleteImageSync" args="client">
- //Debug.write("sendCompleteImageSync ",client);
- this.loadimageDataWinRef.close();
- </method>
- -->
-
-
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx Thu Jul 19 07:08:11 2012
@@ -284,7 +284,7 @@
//The onResult-Handler will be called by the rtmpconnection
//Debug.write("getClientListScope wml and sync Instance: ",value);
parent._loadingUsers = new Array();
- for (var eg in value){
+ for (var eg = 0; eg < value.length; ++eg) {
if (canvas.streamid != value[eg].streamid){
////Debug.write("parent._loadingUsers value eg ",eg,value[eg]);
parent._loadingUsers.push(value[eg]);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java Thu Jul 19 07:08:11 2012
@@ -18,21 +18,21 @@
*/
package org.openmeetings.app.conference.whiteboard;
-import java.util.HashMap;
+import java.util.List;
import org.openmeetings.app.persistence.beans.rooms.RoomClient;
public class RoomStatus {
- HashMap<String,RoomClient> clientMap;
+ List<RoomClient> clientList;
BrowserStatus browserStatus;
Boolean roomFull = false;
- public HashMap<String, RoomClient> getClientMap() {
- return clientMap;
+ public List<RoomClient> getClientList() {
+ return clientList;
}
- public void setClientMap(HashMap<String, RoomClient> clientMap) {
- this.clientMap = clientMap;
+ public void setClientList(List<RoomClient> clientList) {
+ this.clientList = clientList;
}
public BrowserStatus getBrowserStatus() {
return browserStatus;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java Thu Jul 19 07:08:11 2012
@@ -20,7 +20,6 @@ package org.openmeetings.app.data.basic;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -485,16 +484,7 @@ public class Sessionmanagement {
*/
public void clearSessionByRoomId(Long room_id) {
try {
-
- HashMap<String, RoomClient> MyUserList = clientListManager
- .getClientListByRoom(room_id);
-
- for (Iterator<String> iter = MyUserList.keySet().iterator(); iter
- .hasNext();) {
- String key = iter.next();
-
- RoomClient rcl = MyUserList.get(key);
-
+ for (RoomClient rcl : clientListManager.getClientListByRoom(room_id)) {
String aux = rcl.getSwfurl();
int init_pos = aux.indexOf("sid=") + 4;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java Thu Jul 19 07:08:11 2012
@@ -19,7 +19,6 @@
package org.openmeetings.app.data.conference;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -42,7 +41,6 @@ import org.openmeetings.app.data.user.da
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.Server;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.rooms.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation;
@@ -204,15 +202,7 @@ public class Roommanagement {
Rooms room = this.getRoomById(rooms_id);
if (room != null) {
- HashMap<String, RoomClient> map = clientListManager
- .getClientListByRoom(room.getRooms_id());
-
- room.setCurrentusers(new LinkedList<RoomClient>());
-
- for (Iterator<String> iter = map.keySet().iterator(); iter
- .hasNext();) {
- room.getCurrentusers().add(map.get(iter.next()));
- }
+ room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
return room;
}
@@ -334,17 +324,7 @@ public class Roommanagement {
asc);
for (Rooms room : rooms) {
-
- HashMap<String, RoomClient> map = clientListManager
- .getClientListByRoom(room.getRooms_id());
-
- room.setCurrentusers(new LinkedList<RoomClient>());
-
- for (Iterator<String> iter = map.keySet().iterator(); iter
- .hasNext();) {
- room.getCurrentusers().add(map.get(iter.next()));
- }
-
+ room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
}
sResult.setResult(rooms);
@@ -365,17 +345,7 @@ public class Roommanagement {
asc);
for (Rooms room : rooms) {
-
- HashMap<String, RoomClient> map = clientListManager
- .getClientListByRoom(room.getRooms_id());
-
- room.setCurrentusers(new LinkedList<RoomClient>());
-
- for (Iterator<String> iter = map.keySet().iterator(); iter
- .hasNext();) {
- room.getCurrentusers().add(map.get(iter.next()));
- }
-
+ room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
}
return rooms;
@@ -397,17 +367,7 @@ public class Roommanagement {
orderby, asc, externalRoomType);
for (Rooms room : rooms) {
-
- HashMap<String, RoomClient> map = clientListManager
- .getClientListByRoom(room.getRooms_id());
-
- room.setCurrentusers(new LinkedList<RoomClient>());
-
- for (Iterator<String> iter = map.keySet().iterator(); iter
- .hasNext();) {
- room.getCurrentusers().add(map.get(iter.next()));
- }
-
+ room.setCurrentusers(clientListManager.getClientListByRoom(room.getRooms_id()));
}
return rooms;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java Thu Jul 19 07:08:11 2012
@@ -1671,20 +1671,13 @@ public class Usermanagement {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = getUserLevelByID(users_id);
- HashMap<String, RoomClient> MyUserList = clientListManager
- .getClientListByRoom(room_id);
// admins only
if (authLevelManagement.checkAdminLevel(user_level)) {
sessionManagement.clearSessionByRoomId(room_id);
- for (Iterator<String> iter = MyUserList.keySet().iterator(); iter
- .hasNext();) {
- String key = iter.next();
-
- RoomClient rcl = MyUserList.get(key);
-
+ for (RoomClient rcl : clientListManager.getClientListByRoom(room_id)) {
if (rcl == null) {
return true;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java Thu Jul 19 07:08:11 2012
@@ -23,7 +23,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -687,9 +686,13 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
);
- Rooms room = roommanagement.getRoomById(roomId);
- room.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
- roommanagement.updateRoomObject(room);
+ try {
+ Rooms room = roommanagement.getRoomById(roomId);
+ room.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
+ roommanagement.updateRoomObject(room);
+ } catch (Exception e) {
+ log.error("Error while setting server.");
+ }
return roomId;
}
@@ -761,31 +764,7 @@ public class ConferenceService {
* @return
*/
public List<RoomClient> getRoomClientsListByRoomId(Long room_id) {
- log.debug("getRoomClientsListByRoomId");
- try {
- LinkedList<RoomClient> clients = new LinkedList<RoomClient>();
- HashMap<String, RoomClient> clientList = clientListManager
- .getClientListByRoom(room_id);
- for (Iterator<String> iter = clientList.keySet().iterator(); iter
- .hasNext();) {
- RoomClient rcl = clientList.get(iter.next());
- clients.add(rcl);
- }
- return clients;
- } catch (Exception err) {
- log.error("[getRoomClientsListByRoomId]", err);
- }
- return null;
- }
-
- public HashMap<String, RoomClient> getRoomClientsMapByRoomId(Long room_id) {
- try {
- // log.error("getRoomClientsListByRoomId: "+room_id);
- return this.clientListManager.getClientListByRoom(room_id);
- } catch (Exception err) {
- log.error("[getRoomClientsMapByRoomId]", err);
- }
- return null;
+ return clientListManager.getClientListByRoom(room_id);
}
public SearchResult<RoomClient> getRoomClientsMap(String SID, int start, int max,
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java Thu Jul 19 07:08:11 2012
@@ -22,7 +22,6 @@ import java.io.File;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -125,20 +124,10 @@ public class FLVRecorderService implemen
RoomClient currentClient = this.clientListManager
.getClientByStreamId(streamid);
- HashMap<String, RoomClient> roomClientList = this.clientListManager
- .getClientListByRoom(currentClient.getRoom_id());
-
- for (Iterator<String> iter = roomClientList.keySet().iterator(); iter
- .hasNext();) {
-
- RoomClient rcl = roomClientList.get(iter.next());
-
+ for (RoomClient rcl : clientListManager.getClientListByRoom(currentClient.getRoom_id())) {
if (rcl.getIsRecording()) {
-
return rcl;
-
}
-
}
return null;
@@ -562,18 +551,10 @@ public class FLVRecorderService implemen
log.debug("getCurrentRoomClient -#########################- "
+ currentClient.getRoom_id());
- HashMap<String, RoomClient> roomList = this.clientListManager
- .getClientListByRoomAll(currentClient.getRoom_id());
-
- for (Iterator<String> iter = roomList.keySet().iterator(); iter
- .hasNext();) {
-
- RoomClient rcl = roomList.get(iter.next());
-
+ for (RoomClient rcl : clientListManager.getClientListByRoomAll(currentClient.getRoom_id())) {
if (rcl.getIsRecording()) {
return rcl;
}
-
}
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java Thu Jul 19 07:08:11 2012
@@ -485,9 +485,13 @@ public class UserService {
"showContactDataToContacts")
.toString()).booleanValue());
if (userId > 0) {
- Users user = userManagement.getUserById(userId);
- user.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
- userManagement.updateUser(user);
+ try {
+ Users user = userManagement.getUserById(userId);
+ user.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
+ userManagement.updateUser(user);
+ } catch (Exception e) {
+ log.error("Error while setting server.");
+ }
}
return userId;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java Thu Jul 19 07:08:11 2012
@@ -21,7 +21,6 @@ package org.openmeetings.app.remote.red5
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import javax.persistence.EntityManager;
@@ -55,13 +54,8 @@ public class ClientListManager {
* @param room_id
* @return
*/
- public HashMap<String, RoomClient> getRoomClients(Long room_id) {
- try {
- return getClientListByRoom(room_id);
- } catch (Exception err) {
- log.error("[getRoomClients]", err);
- }
- return null;
+ public List<RoomClient> getRoomClients(Long room_id) {
+ return getClientListByRoom(room_id);
}
public synchronized RoomClient addClientListItem(String streamId,
@@ -239,37 +233,31 @@ public class ClientListManager {
* @return
*/
// FIXME seems like there is no need to return HashMap
- public synchronized HashMap<String, RoomClient> getClientListByRoom(Long room_id) {
- HashMap<String, RoomClient> roomClientList = new HashMap<String, RoomClient>();
+ public synchronized List<RoomClient> getClientListByRoom(Long room_id) {
try {
TypedQuery<RoomClient> q = em.createNamedQuery("getByRoomId", RoomClient.class);
q.setParameter("room_id", room_id);
- for (RoomClient rc : q.getResultList()) {
- roomClientList.put(rc.getStreamid(), rc);
- }
+ return q.getResultList();
} catch (Exception err) {
log.error("[getClientListByRoom]", err);
}
- return roomClientList;
+ return null;
}
// FIXME seems to be copy/pasted with previous one
- public synchronized HashMap<String, RoomClient> getClientListByRoomAll(Long room_id) {
- HashMap<String, RoomClient> roomClientList = new HashMap<String, RoomClient>();
+ public synchronized List<RoomClient> getClientListByRoomAll(Long room_id) {
try {
TypedQuery<RoomClient> q = em.createNamedQuery("getByRoomIdAll", RoomClient.class);
q.setParameter("room_id", room_id);
- for (RoomClient rc : q.getResultList()) {
- roomClientList.put(rc.getStreamid(), rc);
- }
+ return q.getResultList();
} catch (Exception err) {
log.error("[getClientListByRoom]", err);
}
- return roomClientList;
+ return new ArrayList<RoomClient>();
}
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Thu Jul 19 07:08:11 2012
@@ -267,18 +267,10 @@ public class ScopeApplicationAdapter ext
RoomClient currentClient = this.clientListManager
.getClientByStreamId(streamid);
- HashMap<String, RoomClient> roomList = this.clientListManager
- .getClientListByRoomAll(currentClient.getRoom_id());
-
- for (Iterator<String> iter = roomList.keySet().iterator(); iter
- .hasNext();) {
-
- RoomClient rcl = roomList.get(iter.next());
-
+ for (RoomClient rcl : clientListManager.getClientListByRoomAll(currentClient.getRoom_id())) {
if (rcl.isStartStreaming()) {
screenSharerList.add(rcl);
}
-
}
return screenSharerList;
@@ -1486,8 +1478,7 @@ public class ScopeApplicationAdapter ext
log.debug("##### setRoomValues : " + currentClient);
// Check for Moderation LogicalRoom ENTER
- HashMap<String, RoomClient> clientListRoom = this.clientListManager
- .getRoomClients(room_id);
+ List<RoomClient> clientListRoom = clientListManager.getRoomClients(room_id);
// appointed meeting or moderated Room? => Check Max Users first
if (room.getNumberOfPartizipants() != null
@@ -1706,7 +1697,7 @@ public class ScopeApplicationAdapter ext
// RoomStatus roomStatus = new RoomStatus();
// FIXME: Rework Client Object to DTOs
- roomStatus.setClientMap(clientListRoom);
+ roomStatus.setClientList(clientListRoom);
roomStatus.setBrowserStatus(browserStatus);
return roomStatus;
@@ -2879,19 +2870,18 @@ public class ScopeApplicationAdapter ext
*
* @return
*/
- public synchronized HashMap<String, RoomClient> getClientListScope() {
- HashMap<String, RoomClient> roomClientList = new HashMap<String, RoomClient>();
+ public synchronized List<RoomClient> getClientListScope() {
try {
IConnection current = Red5.getConnectionLocal();
RoomClient currentClient = this.clientListManager
.getClientByStreamId(current.getClient().getId());
- return this.clientListManager.getClientListByRoom(currentClient.getRoom_id());
+ return clientListManager.getClientListByRoom(currentClient.getRoom_id());
} catch (Exception err) {
log.debug("[getClientListScope]", err);
}
- return roomClientList;
+ return new ArrayList<RoomClient>();
}
private boolean getWhiteboardDrawStatus() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java Thu Jul 19 07:08:11 2012
@@ -106,8 +106,7 @@ public class JabberWebService {
Long user_level = this.userManagement.getUserLevelByID(users_id);
if (this.authLevelManagement.checkUserLevel(user_level)) {
- return this.conferenceService.getRoomClientsMapByRoomId(roomId)
- .size();
+ return conferenceService.getRoomClientsListByRoomId(roomId).size();
}
return -1;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java?rev=1363250&r1=1363249&r2=1363250&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java Thu Jul 19 07:08:11 2012
@@ -483,23 +483,13 @@ public class RoomWebService {
int i = 0;
for (Rooms room : rooms) {
-
- HashMap<String, RoomClient> map = clientListManager
- .getClientListByRoom(room.getRooms_id());
-
- // room.setCurrentusers(new LinkedList<RoomClient>());
-
- // for (Iterator<String> iter = map.keySet().iterator();
- // iter.hasNext(); ) {
- // room.getCurrentusers().add(map.get(iter.next()));
- // }
-
RoomCountBean rCountBean = new RoomCountBean();
rCountBean.setRoomId(room.getRooms_id());
rCountBean.setRoomName(room.getName());
rCountBean.setMaxUser(room.getNumberOfPartizipants()
.intValue());
- rCountBean.setRoomCount(map.size());
+ rCountBean.setRoomCount(clientListManager
+ .getClientListByRoom(room.getRooms_id()).size());
roomsArray[i] = rCountBean;
i++;
@@ -563,16 +553,13 @@ public class RoomWebService {
roomReturn.setName(room.getName());
roomReturn.setRoom_id(room.getRooms_id());
- HashMap<String, RoomClient> map = clientListManager
+ List<RoomClient> map = clientListManager
.getClientListByRoom(room.getRooms_id());
RoomUser[] roomUsers = new RoomUser[map.size()];
int i = 0;
- for (Iterator<String> iter = map.keySet().iterator(); iter
- .hasNext();) {
- RoomClient rcl = map.get(iter.next());
-
+ for (RoomClient rcl : map) {
RoomUser roomUser = new RoomUser();
roomUser.setFirstname(rcl.getFirstname());
roomUser.setLastname(rcl.getLastname());
@@ -581,10 +568,7 @@ public class RoomWebService {
roomUser.setIsBroadCasting(rcl.getIsBroadcasting());
roomUser.setAvsettings(rcl.getAvsettings());
- roomUsers[i] = roomUser;
-
- i++;
-
+ roomUsers[i++] = roomUser;
}
roomReturn.setRoomUser(roomUsers);