openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1442407 - in /openmeetings/trunk/singlewebapp: WebContent/WEB-INF/ WebContent/src/base/hibernate/ WebContent/src/modules/conference/participants/ WebContent/src/modules/conference/whiteboard/ WebContent/src/modules/conference/whiteboard/ba...
Date Mon, 04 Feb 2013 22:30:28 GMT
Author: sebawagner
Date: Mon Feb  4 22:30:28 2013
New Revision: 1442407

URL: http://svn.apache.org/viewvc?rev=1442407&view=rev
Log:
OPENMEETINGS-460 Cleaning up code for whiteboard loading syncing and cleaning up code to saving/loading/syncing of wml files to the whiteboard

Added:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java
      - copied, changed from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManager.java
Removed:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManager.java
Modified:
    openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
    openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/remoteWhiteboard.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java

Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon Feb  4 22:30:28 2013
@@ -62,14 +62,17 @@
 	</bean>
 	<bean id="openmeetings.EmoticonsManager" 
 		class="org.apache.openmeetings.remote.red5.EmoticonsManager" />
-	<bean id="openmeetings.WhiteBoardObjectListManager"
-		class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager" />
-	<bean id="openmeetings.WhiteBoardObjectListManagerById"
-		class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById" />
-	
+		
+	<!--  Singletons for memory based cache -->
 	<bean id="openmeetings.HashMapStore" scope="singleton" 
 		class="org.apache.openmeetings.session.store.HashMapStore" />
+	<bean id="whiteBoardObjectListManagerById" scope="singleton"  
+	    class="org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById" />
+	<!-- WhiteBoardObjectSyncManager can stay in the memory, even on cluster! -->
+	<bean id="whiteBoardObjectSyncManager" scope="singleton"  
+	    class="org.apache.openmeetings.remote.red5.WhiteBoardObjectSyncManager" />
 	
+	<!-- Database cache -->
 	<bean id="openmeetings.DatabaseStore"
 		class="org.apache.openmeetings.session.store.DatabaseStore" />
 	
@@ -77,9 +80,8 @@
 		class="org.apache.openmeetings.session.ServerUtil">
 		<!-- 
 			Need to be uncommented and set to the real ID if in cluster mode
-			
-		<property name="serverId" value="null" />
-		 -->	
+		<property name="serverId" value="1" />
+		 -->  
 	</bean>	
 	
 	<!-- Cluster related config start -->
@@ -281,6 +283,7 @@
 	<bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
 	<bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement" />
 	<bean id="timezoneUtil" class="org.apache.openmeetings.utils.math.TimezoneUtil" />
+	<bean id="whiteboardManagement" class="org.apache.openmeetings.conference.whiteboard.WhiteboardManagement" />
 	
 	<!-- Templates -->
 	<bean id="registerUserTemplate" class="org.apache.openmeetings.templates.RegisterUserTemplate" />

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Mon Feb  4 22:30:28 2013
@@ -1120,16 +1120,6 @@
             </handler>
         </netRemoteCallHib>             
   
-        <netRemoteCallHib name="sendVars" funcname="sendVars" showLoading="false">
-            <netparam name="vars"><method name="getValue">return canvas.objWhiteboard;</method></netparam>
-            <handler name="ondata" args="value">
-                <![CDATA[
-                	//The onResult-Handler will be called be the rtmpconnection
-                    if ($debug) Debug.write("sendVars : ",value);
-                ]]>
-            </handler>   
-        </netRemoteCallHib>    
-        
         <method name="setUserStatus" args="ctx,user,o">
             <![CDATA[
 				if (!o || !user) return;
@@ -1626,11 +1616,13 @@
                 } else if (value.message[0]=='avsettings'){
                     canvas._videocontainer.setAVSettingsToClient(value.client);
                 } else if (value.message[0]=='whiteboard'){
-                    if (value.message[1]=='wmlloadcomplete'){
-                        canvas._drawarea.sendCompleteWmlLoadedRClient(value.client);
-                    } else if (value.message[1]=='wmlsynccomplete'){
-                        canvas._drawarea.sendCompleteWmlSync(value.client);
-                    } else if (value.message[1]=='imageloadcomplete'){
+                    //if (value.message[1]=='wmlloadcomplete'){
+                    //    canvas._drawarea.sendCompleteWmlLoadedRClient(value.client);
+                    //} else if (value.message[1]=='wmlsynccomplete'){
+                    //    canvas._drawarea.sendCompleteWmlSync(value.client);
+                    //} else 
+                    
+                    if (value.message[1]=='imageloadcomplete'){
                         canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
                     } else if (value.message[1]=='imagesynccomplete'){
                         canvas._drawarea.sendCompleteImageSync(value.client);

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Mon Feb  4 22:30:28 2013
@@ -316,7 +316,7 @@
         <handler name="ondata" args="value">
             <![CDATA[
             //The onResult-Handler will be called be the rtmpconnection
-            //Debug.write("sendVarsModeratorGeneral : ",value);
+            //Debug.write("whiteboardservice.setCanDraw : ",value);
             
             ]]>
         </handler>   
@@ -330,7 +330,7 @@
         <handler name="ondata" args="value">
             <![CDATA[
             //The onResult-Handler will be called be the rtmpconnection
-            //Debug.write("sendVarsModeratorGeneral : ",value);
+            //Debug.write("whiteboardservice.setCanShare : ",value);
             
             ]]>
         </handler>   
@@ -346,7 +346,7 @@
         <handler name="ondata" args="value">
             <![CDATA[
                 //The onResult-Handler will be called be the rtmpconnection
-                if ($debug) Debug.write("setCanRemote : ",value);
+                if ($debug) Debug.write("whiteboardservice.setCanRemote : ",value);
             ]]>
         </handler>   
     </netRemoteCallHib>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx Mon Feb  4 22:30:28 2013
@@ -27,7 +27,7 @@
 	<attribute name="fileData" value="null" />
 	<attribute name="savefileDataWinRef" value="null" />
 	
-	<!-- loading a file from a wml Object -->
+	<!-- loading a file from a wml Object
 	<attribute name="loadfileData" value="null" />
 	<attribute name="loadfileDataIndex" value="0" type="number" />
 	<attribute name="loadfileDataWinRef" value="null" />
@@ -35,7 +35,6 @@
 	<attribute name="loadmessageId" value="206" type="number" />
 	<attribute name="syncmessageId" value="207" type="number" />
 	<attribute name="_loadmessageTxt" value="" type="string" />
-	<!-- loading a file from wml synchronize with remote Users -->
 	<attribute name="_loadingUsers" value="null" />
 	<attribute name="wmlfileName" value="" type="string" />
 	<attribute name="wmlroom" value="" type="string" />
@@ -43,6 +42,7 @@
 	<attribute name="wmlspreadNews" value="false" type="boolean" />
 	<attribute name="wmlLoadingCompleteMessage" value="null" />
 	<attribute name="synccheckTime" value="1000" type="number" />
+	 -->
 	
 	<!-- loading all stage objects on init -->
 	<attribute name="isInitLoader" value="false" type="boolean" />
@@ -81,12 +81,12 @@
     <!-- Images will be send in packages 
     	so timeout is workaround
      -->
-    <attribute name="sendPartURL" value="http://www.webbase-design.de/dokeos/videoconference/createimagefrombitmap.php" type="string" />
+    <attribute name="sendPartURL" value="http://host/createimagefrombitmap.php" type="string" />
     
     <!-- create Image from whole Array
     	Large Images will not be rendered correctly here cause
     	there can be a timeout -->
-    <attribute name="sendURL" value="http://www.webbase-design.de/dokeos/videoconference/createimagefrombitmap.php" type="string" />
+    <attribute name="sendURL" value="http://host/createimagefrombitmap.php" type="string" />
     
     <event name="onprogress" />
     
@@ -228,292 +228,6 @@
             </handler>  
         </netRemoteCallHib>     
     
-	<!-- Loading the wml Object from the library 
-		invoked wether directly (spreadNews=true) from the library
-		or by remoteClient (Moderator spreadNews=false)-->
-	
-    <method name="loadwmlObjectToStage" args="loadObject,fileName,room,domain,spreadNews,isInitLoader">
-        
-        //Debug.write("loadwmlObjectToStage: ",loadObject,fileName,room,domain,spreadNews,isInitLoader);
-		<![CDATA[
-		if (loadObject!=null && loadObject.length>0){
-			
-			this.wmlfileName = fileName;
-			this.wmlroom = room;
-			this.wmldomain = domain;
-			this.wmlspreadNews = spreadNews;
-			this.isInitLoader = isInitLoader;
-			
-			this.loadfileData = loadObject;
-			this.loadfileDataIndex = -1;
-			if (this.onwmlloadStart) this.onwmlloadStart.sendEvent();
-			this._loadmessageTxt = canvas.getLabelName(this.loadmessageId);
-			this.loadfileDataWinRef = new lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
-			
-			if (this.wmlspreadNews){
-				//get remotely connected users sothat we can trigger event when everyBody has synchronized loading
-				this.getClientListScope.doCall();
-			} else {
-				this.loadObjectTimer = new LzDelegate( this, "loadNextObjectFromList" );
-				lz.Timer.addTimer( this.loadObjectTimer, 50 );
-			}
-		//check if this is syncing cause if init of new user
-		//no init-object so load directly
-		} else if (isInitLoader){
-			//check if this is conferenceView or audienceView modus
-			if (canvas.thishib.modus == "conference"){
-				if ($debug) Debug.write("############## showDevicePopUp 1 xyz");
-				canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
-			} else if(canvas.thishib.modus == "audience"){
-				//check in audince modus if this user is the current moderator
-				//this users cannot be the moderator cause he has downloaded
-				//some objects from teh current moderator
-				//Debug.error("WARNING 1 - ERROR - this users cannot be the moderator cause he has downloaded some objects from teh current moderator");
-			}
-
-		}
-		]]>	
-	</method>
-	
-	<!-- get list of clients before loading wml-file-objects cause
-		we have to show the sync process
-		-->
-    <netRemoteCallHib name="getClientListScope" funcname="getClientListScope" remotecontext="$once{ canvas.thishib }" >          
-        <handler name="ondata" args="value">
-        	<![CDATA[
-				//The onResult-Handler will be called by the rtmpconnection
-				//Debug.write("getClientListScope wml and sync Instance: ",value);
-				parent._loadingUsers = new Array();
-	            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]);
-					}
-				}
-				if (!parent.isInitLoader) {
-				    parent.notifyClient();			
-				} else {
-				    parent.notifyClientInitSyncing();
-				}
-				//it is necessary to use lz.Timer cause i want to make status updates
-				//after each loaded object
-                //Debug.write("loadNextObjectFromList 2 this.loadObjectTimer");
-				this.parent.loadObjectTimer = new LzDelegate( this.parent, "loadNextObjectFromList" );
-				lz.Timer.addTimer( this.parent.loadObjectTimer, 50 );	
-            ]]>
-        </handler>   
-    </netRemoteCallHib>
-	
-	<!-- send notification to all clients that a
-		 wml-file has been loaded -->	
-	<method name="notifyClient">
-		var obj = new Array();
-		obj["wmlfileName"] = this.wmlfileName;
-		obj["wmlroom"] = this.wmlroom;
-		obj["wmldomain"] = this.wmldomain;
-		obj["wmlspreadNews"] = this.wmlspreadNews;
-		
-		var tempSendArray = new Array ();
-		tempSendArray[0] = 'whiteboard';
-		tempSendArray[1] = new Date();
-		////Debug.write("Setting Message");
-		tempSendArray[2] = "loadwml";
-		tempSendArray[3] = obj;
-		
-		canvas.objWhiteboard = tempSendArray;
-        hib.sendVars.doCall();
-	</method>
-	
-	<method name="notifyClientInitSyncing">
-		this.wmlLoadingCompleteMessage = new Array();
-		this.wmlLoadingCompleteMessage[0] = "whiteboard";
-		this.wmlLoadingCompleteMessage[1] = "syncinitLoader";
-		this.wmlLoadingCompleteMessage[2] = this.wmlfileName;
-		this.sendMessageWithClient.doCall();
-	</method>
-	
-	<!-- invoked the loading of a wml-file by the moderator -->
-	<method name="remoteWmlLoader" args="fileName,room,domain">
-		this.loadWmlObject.String3 = room;
-		this.loadWmlObject.String1 = fileName;
-		this.loadWmlObject.doCall();
-	</method>
-	
-	<!-- invoked the loading of a wml-file by the moderator -->
-	<method name="remoteWmlLoaderRecording" args="fileName,room,domain">
-		this.isRecordingLoad = true;
-		this.loadWmlObject.String3 = room;
-		this.loadWmlObject.String1 = fileName;
-		this.loadWmlObject.doCall();
-	</method>
-	
-		<!-- load the objects of that wml file -->
-	  	<netRemoteCallHib name="loadWmlObject" funcname="fileservice.loadWmlObject" remotecontext="$once{ canvas.thishib }" >   
-			<netparam><method name="getValue"> return canvas.sessionId; </method></netparam>
-			<netparam><method name="getValue">return parent.String3;</method></netparam>        	
-			  <netparam><method name="getValue">return parent.String1;</method></netparam>
-	        <handler name="ondata" args="value">	
-				<![CDATA[
-					////Debug.write("  loadWmlObject ",value); 
-					parent.loadwmlObjectToStage(value,this.String1,hib.currentroomid,hib.conferencedomain,false);
-				]]>       	     				
-	        </handler>	
-	  	</netRemoteCallHib> 
-	
-	<!-- this event gets triggered when a new user arrives and
-		start loading the init-objects
-		-->
-	<method name="remoteSyncLoader">
-		this.loadfileDataWinRef = new lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
-		this._loadmessageTxt = canvas.getLabelName(this.syncmessageId);
-	    this.loadfileDataWinRef.setMessage(this._loadmessageTxt);
-	</method>
-			
-	
-	<!-- gets triggered once one object of the wml-file has been added completely to the
-		whiteborad -->
-	
-	<handler name="onwmlLoaderSend" args="type">
-		//Debug.write("loadNextObjectFromList 3 this.loadObjectTimer ",type);
-		this.loadObjectTimer = new LzDelegate( this, "loadNextObjectFromList" );
-		lz.Timer.addTimer( this.loadObjectTimer, 50 );
-	</handler>
-	
-	<!-- invoke by lz.Timer
-		checks if object is loaded completely once it is completely loaded it checks wether
-		the process was invoked by moderator, so this is a remoteClient or this client is 
-		really the moderator (this.wmlspreadNews=true)
-		if it ain't the mod it just throws a message to moderator and waits untill the moderator
-		spreads a message that all clients did succeed in loading the wml-file-objects
-		-->
-	<method name="loadNextObjectFromList">
-		<![CDATA[
-			if ($debug) Debug.write("loadNextObjectFromList");
-			this.loadfileDataIndex++;
-			if (this.loadfileDataIndex<this.loadfileData.length){
-				var txt = (this.loadfileDataIndex+1)+'/'+this.loadfileData.length+' '+this._loadmessageTxt;
-				this.loadfileDataWinRef.setMessage(txt);
-				////Debug.write("  loadObject[this.loadfileDataIndex] ",this.loadfileData[this.loadfileDataIndex]);
-				this.sendWatchObject('draw',this.loadfileData[this.loadfileDataIndex],true);
-			} else {
-				////Debug.write("this.loadfileDataIndex complete",this.loadfileDataIndex);
-				this._loadmessageTxt = canvas.getLabelName(this.syncmessageId);
-			    this.loadfileDataWinRef.setMessage(this._loadmessageTxt);
-				if (this.onwmlloadStop) this.onwmlloadStop.sendEvent();
-				if (this.isRecordingLoad || this.isinitRecordingLoad) {
-					this.sendCompleteWmlSync(null);
-				} else if (!this.wmlspreadNews){
-					this.wmlloadingComplete();
-				} else {
-                    //Debug.write("loadNextObjectFromList this.startWmlsyncCheck");
-					this.startWmlsyncCheck();
-				}
-			}
-		]]>
-	</method>
-	
-	<!-- remoteClient will send a notification to moderator 
-		that he has completed loading -->
-	<method name="wmlloadingComplete">
-		if ($debug) Debug.warn("?? wmlloadingComplete ??");
-		new lz.errorPopup(canvas,{error:"?? wmlloadingComplete ??"});
-		this.wmlLoadingCompleteMessage = new Array();
-		this.wmlLoadingCompleteMessage[0] = "whiteboard";
-		this.wmlLoadingCompleteMessage[1] = "wmlloadcomplete";
-		this.wmlLoadingCompleteMessage[2] = this.wmlfileName;
-		this.sendMessageWithClient.doCall();
-	</method>
-	
-	<!-- sending messages/notifications of sync process -->
-	<netRemoteCallHib name="sendMessageWithClient" funcname="sendMessageWithClient" remotecontext="$once{ canvas.thishib }" >   
-		<netparam name="vars"><method name="getValue">return parent.parent.wmlLoadingCompleteMessage;</method></netparam>
-		<handler name="ondata" args="value">
-			<![CDATA[
-			//The onResult-Handler will be called be the rtmpconnection
-			////Debug.write("getValue : ",value);
-			
-			]]>
-		</handler>   
-	</netRemoteCallHib> 	
-	
-	<!-- after loading the objects check if all connected clients of that conference
-		have loaded the file completely, check it every 1 seconds -->
-	<method name="startWmlsyncCheck">
-		<![CDATA[
-            if ($debug) Debug.write("startWmlsyncCheck: ");
-			if (this._loadingUsers.length==0 || this.isInitLoader){
-                //Debug.write("wmlsyncComplete ");
-				this.wmlsyncComplete();
-			} else {
-				var txt = this._loadmessageTxt+' '+this._loadingUsers.length;
-				this.loadfileDataWinRef.setMessage(txt);
-				this.loadObjectTimer = new LzDelegate( this, "startWmlsyncCheck" );
-				lz.Timer.addTimer( this.loadObjectTimer, this.synccheckTime );
-			}
-		]]>
-	</method>
-	
-	<!-- the sync process is complete, 
-		remove all loading windows from connected clients -->
-	<method name="wmlsyncComplete">
-		//set modus to hand so users can directly interact with object's
-		this.setModus('hand');	
-		this.wmlLoadingCompleteMessage = new Array();
-		this.wmlLoadingCompleteMessage[0] = "whiteboard";
-		this.wmlLoadingCompleteMessage[1] = "wmlsynccomplete";
-		this.wmlLoadingCompleteMessage[2] = this.wmlfileName;
-		this.sendMessageWithClient.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 -->
-	<method name="sendCompleteWmlLoadedRClient" args="client">
-		<![CDATA[
-			//detect self messageing
-			if (client.streamid!=canvas.streamid){
-				//remove client from sync list
-				for (var i=0;i<this._loadingUsers.length;i++){
-					if (this._loadingUsers[i].streamid==client.streamid){
-						////Debug.write("deleteing client from list: ",this._loadingUsers[i].streamid);
-						this._loadingUsers.splice(i,1);
-					}
-				}
-			}
-		]]>
-	</method>
-	
-	<!-- invoked remotely by Moderator
-		all clients have succeed in loading the wml-file-objects
-		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
-		 -->
-	<method name="sendCompleteWmlSync" args="client">
-		if ($debug) Debug.write("sendCompleteWmlSync: ",client);
-		this.loadfileDataWinRef.close();
-		if (this.isinitRecordingLoad){
-			this.isinitRecordingLoad = false;
-			if ($debug) Debug.write("this.isinitRecordingLoad",this);
-			if ($debug) Debug.write(this.parent.parent.parent.parent);
-			this.parent.parent.parent.parent.timeLineAction();
-		}
-		//Debug.write("this.loadfileDataWinRef closed: ",this.loadfileDataWinRef);
-		//check if this is syncing cause if init of new user
-		if (this.isInitLoader){
-			//check if this is conferenceView or audienceView modus
-			if (canvas.thishib.modus == "conference"){
-				if ($debug) Debug.write("############## showDevicePopUp 2 xyz");
-				canvas._videocontainer._videoviewcontent.showDevicePopUp(false);
-			} else if(canvas.thishib.modus == "audience"){
-				//check in audince modus if this user is the current moderator
-				//this users cannot be the moderator cause he has downloaded
-				//some objects from teh current moderator
-				if ($debug) Debug.warn("WARNING 2 - ERROR - this users cannot be the moderator cause he has downloaded some objects from teh current moderator");
-			}
-		}
-	</method>
 </class>
 
 </library>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/remoteWhiteboard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/remoteWhiteboard.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/remoteWhiteboard.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/remoteWhiteboard.lzx Mon Feb  4 22:30:28 2013
@@ -240,7 +240,7 @@
 		}
     </method>
 	
-	<method name="loadRemoteObject">
+	<method name="loadRemoteObject" args="ref">
 		<![CDATA[
 			this.sendRemoteWatchObject(this.loadingObjectList[this.loadingObjectListId]);
 			this.loadingObjectListId++;

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Mon Feb  4 22:30:28 2013
@@ -317,7 +317,7 @@
              -->
              
             <handler name="onopenWhiteBoard" >
-                parent.parent.getRoomItems.doCall();
+                //parent.parent.getRoomItems.doCall();
             </handler>
             
             <!-- clientid  = streamid of the user -->
@@ -468,6 +468,7 @@
             </handler>   
         </netRemoteCallHib>     
     
+    <!-- 
         <netRemoteCallHib name="getRoomItems" funcname="whiteboardservice.getRoomItems"
             remotecontext="$once{ canvas.thishib }" >
             <handler name="ondata" args="value">
@@ -477,7 +478,8 @@
                     canvas._drawarea.loadObjectList(value);
                 ]]>
             </handler>   
-        </netRemoteCallHib>     
+        </netRemoteCallHib>  
+     -->  
         
     <view name="panelArea" width="${ parent.parent.width }" 
           height="${ parent.parent.height-42-parent._propertyPanel.height }">

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Mon Feb  4 22:30:28 2013
@@ -38,9 +38,8 @@
         <netparam><method name="getValue">return parent.parent.whiteboardId;</method></netparam>
         <handler name="ondata" args="value">
             <![CDATA[
-            //The onResult-Handler will be called be the rtmpconnection
-            	//if ($debug) Debug.write("sendVars : ",value);
-            
+                //The onResult-Handler will be called be the rtmpconnection
+            	//if ($debug) Debug.write("sendVarsByWhiteboardId : ",value);
             ]]>
         </handler>   
     </netRemoteCallHib>     

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx Mon Feb  4 22:30:28 2013
@@ -121,7 +121,7 @@
     </method>    
 
 	<method name="activateSynced">
-		this.parent.sendActiveWindowSynced(this,win);
+		this.parent.sendActiveWindowSynced(this);
 	</method>
     
     <view name="_minimizebtn_mo" width="${ parent.width-2 }" height="16"

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/whiteboard/WhiteboardManagement.java Mon Feb  4 22:30:28 2013
@@ -24,295 +24,18 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager;
 import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class WhiteboardManagement {
 
 	private static final Logger log = Red5LoggerFactory.getLogger(
 			WhiteboardManagement.class, OpenmeetingsVariables.webAppRootKey);
-
-	private WhiteboardManagement() {
-	}
-
-	private static WhiteboardManagement instance = null;
-
-	public static synchronized WhiteboardManagement getInstance() {
-		if (instance == null) {
-			instance = new WhiteboardManagement();
-		}
-		return instance;
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void addWhiteBoardObject(Long room_id, Map whiteboardObj) {
-		try {
-			log.debug("addWhiteBoardObject: " + whiteboardObj);
-
-			// log.debug("whiteboardObj 0: Event: "+whiteboardObj.get(0));
-			// log.debug("whiteboardObj 1: Event: "+whiteboardObj.get(1));
-			// log.debug("whiteboardObj 2: Event: "+whiteboardObj.get(2));
-			// log.debug("whiteboardObj 3: Event: "+whiteboardObj.get(3));
-
-			// log.debug("whiteboardObj NUMB3: Event: "+whiteboardObj.get(3).getClass().getName());
-
-			// Date dateOfEvent = (Date) whiteboardObj.get(1);
-			String action = whiteboardObj.get(2).toString();
-			List actionObject = (List) whiteboardObj.get(3);
-
-			log.debug("action: " + action);
-
-			if (action.equals("draw") || action.equals("redo")) {
-				HashMap<String, List> roomList = WhiteBoardObjectListManager
-						.getInstance().getWhiteBoardObjectListByRoomId(room_id);
-
-				// log.debug(actionObject);
-				// log.debug(actionObject.size()-1);
-				// log.debug(actionObject.get(actionObject.size()-1));
-				String objectType = actionObject.get(0).toString();
-				if (!objectType.equals("pointerWhiteBoard")) {
-					String objectOID = actionObject
-							.get(actionObject.size() - 1).toString();
-					log.debug("objectOID: " + objectOID);
-					roomList.put(objectOID, actionObject);
-					WhiteBoardObjectListManager.getInstance()
-							.setWhiteBoardObjectListRoomObj(room_id, roomList);
-				}
-			} else if (action.equals("clear")) {
-
-				WhiteBoardObjectListManager.getInstance().setWhiteBoardObject(
-						room_id, new WhiteboardObject());
-
-			} else if (action.equals("delete") || action.equals("undo")) {
-				HashMap<String, List> roomList = WhiteBoardObjectListManager
-						.getInstance().getWhiteBoardObjectListByRoomId(room_id);
-				String objectOID = actionObject.get(actionObject.size() - 1)
-						.toString();
-				String objectType = actionObject.get(0).toString();
-				log.debug("removal of objectOID: " + objectOID);
-
-				// "ellipse"
-				// || this.baseactionobjectList[i][0] == "drawarrow"
-				// || this.baseactionobjectList[i][0] == "line"
-				// || this.baseactionobjectList[i][0] == "paint"
-				// || this.baseactionobjectList[i][0] == "rectangle"
-				// || this.baseactionobjectList[i][0] == "uline"
-				// || this.baseactionobjectList[i][0] == "image"
-				// || this.baseactionobjectList[i][0] == "letter"
-
-				// Re-Index all items in its zIndex
-				if (objectType.equals("ellipse")
-						|| objectType.equals("drawarrow")
-						|| objectType.equals("line")
-						|| objectType.equals("paint")
-						|| objectType.equals("rectangle")
-						|| objectType.equals("uline")
-						|| objectType.equals("image")
-						|| objectType.equals("letter")
-						|| objectType.equals("swf")) {
-
-					Integer zIndex = Integer.valueOf(
-							actionObject.get(actionObject.size() - 8)
-									.toString()).intValue();
-
-					log.debug("1|zIndex " + zIndex);
-					log.debug("2|zIndex "
-							+ actionObject.get(actionObject.size() - 8)
-									.toString());
-					log.debug("3|zIndex "
-							+ actionObject.get(actionObject.size() - 8));
-
-					int l = 0;
-					for (Iterator debugIter = actionObject.iterator(); debugIter
-							.hasNext();) {
-						log.debug("4|zIndex " + l + " -- " + debugIter.next());
-						l++;
-					}
-
-					for (Iterator<String> iter = roomList.keySet().iterator(); iter
-							.hasNext();) {
-						String whiteboardObjKey = iter.next();
-						List actionObjectStored = roomList
-								.get(whiteboardObjKey);
-
-						Integer zIndexStored = Integer.valueOf(
-								actionObjectStored.get(
-										actionObjectStored.size() - 8)
-										.toString()).intValue();
-
-						log.debug("zIndexStored|zIndex " + zIndexStored + "|"
-								+ zIndex);
-
-						if (zIndexStored >= zIndex) {
-							zIndexStored -= 1;
-							log.debug("new-zIndex " + zIndexStored);
-						}
-						actionObjectStored.set(actionObjectStored.size() - 8,
-								zIndexStored);
-
-						roomList.put(whiteboardObjKey, actionObjectStored);
-					}
-
-				}
-
-				roomList.remove(objectOID);
-				WhiteBoardObjectListManager.getInstance()
-						.setWhiteBoardObjectListRoomObj(room_id, roomList);
-			} else if (action.equals("size") || action.equals("editProp")
-					|| action.equals("editText") || action.equals("swf")) {
-				HashMap<String, List> roomList = WhiteBoardObjectListManager
-						.getInstance().getWhiteBoardObjectListByRoomId(room_id);
-				String objectOID = actionObject.get(actionObject.size() - 1)
-						.toString();
-				// List roomItem = roomList.get(objectOID);
-				List currentObject = roomList.get(objectOID);
-				roomList.put(objectOID, actionObject);
-
-				if (action.equals("swf")) {
-					if (actionObject.get(0).equals("swf")) {
-
-						if (actionObject.get(8) != currentObject.get(8)) {
-
-							String baseObjectName = actionObject.get(
-									actionObject.size() - 1).toString();
-							Integer slidesNumber = Integer.valueOf(
-									actionObject.get(8).toString()).intValue();
-
-							log.debug("updateObjectsToSlideNumber :: "
-									+ baseObjectName + "," + slidesNumber);
-
-							for (Iterator<String> iter = roomList.keySet()
-									.iterator(); iter.hasNext();) {
-								String whiteboardObjKey = iter.next();
-								List actionObjectStored = roomList
-										.get(whiteboardObjKey);
-
-								if (actionObjectStored.get(0).equals("ellipse")
-										|| actionObjectStored.get(0).equals(
-												"drawarrow")
-										|| actionObjectStored.get(0).equals(
-												"line")
-										|| actionObjectStored.get(0).equals(
-												"paint")
-										|| actionObjectStored.get(0).equals(
-												"rectangle")
-										|| actionObjectStored.get(0).equals(
-												"uline")
-										|| actionObjectStored.get(0).equals(
-												"image")
-										|| actionObjectStored.get(0).equals(
-												"letter")) {
-
-									Map swfObj = (Map) actionObjectStored
-											.get(actionObjectStored.size() - 7);
-									log.debug("swfObj :1: " + swfObj);
-
-									if (swfObj != null) {
-
-										if (swfObj.get("name").equals(
-												baseObjectName)) {
-
-											if (Integer.valueOf(
-													swfObj.get("slide")
-															.toString())
-													.intValue() == slidesNumber) {
-
-												swfObj.put("isVisible", true);
-
-												actionObjectStored.set(
-														actionObjectStored
-																.size() - 7,
-														swfObj);
-
-											} else {
-
-												swfObj.put("isVisible", false);
-
-												actionObjectStored.set(
-														actionObjectStored
-																.size() - 7,
-														swfObj);
-
-											}
-
-										}
-
-									}
-
-									log.debug("swfObj :1: " + swfObj);
-
-								}
-
-							}
-
-						}
-
-					}
-				}
-
-				WhiteBoardObjectListManager.getInstance()
-						.setWhiteBoardObjectListRoomObj(room_id, roomList);
-			} else if (action.equals("clearSlide")) {
-
-				HashMap<String, List> roomList = WhiteBoardObjectListManager
-						.getInstance().getWhiteBoardObjectListByRoomId(room_id);
-
-				for (String objectName : (List<String>) actionObject) {
-
-					roomList.remove(objectName);
-
-				}
-
-				WhiteBoardObjectListManager.getInstance()
-						.setWhiteBoardObjectListRoomObj(room_id, roomList);
-
-			} else {
-				log.warn("Unkown Type: " + action + " actionObject: "
-						+ actionObject);
-			}
-
-		} catch (Exception err) {
-			log.error("[addWhiteBoardObject]", err);
-		}
-	}
-
-	@SuppressWarnings({ "rawtypes" })
-	public void updateWhiteboardObject(Long room_id, List actionObject) {
-		try {
-
-			WhiteboardObject whiteBoardObject = WhiteBoardObjectListManager
-					.getInstance().getWhiteBoardObjectRoomId(room_id);
-
-			whiteBoardObject.setFullFit((Boolean) actionObject.get(1));
-			whiteBoardObject.setZoom((Integer) actionObject.get(2));
-
-			WhiteBoardObjectListManager.getInstance().setWhiteBoardObject(
-					room_id, whiteBoardObject);
-
-		} catch (Exception err) {
-			log.error("[updateWhiteboardObject]", err);
-		}
-	}
-
-	@SuppressWarnings({ "rawtypes" })
-	public void updateWhiteboardObjectPos(Long room_id, List actionObject) {
-		try {
-
-			WhiteboardObject whiteBoardObject = WhiteBoardObjectListManager
-					.getInstance().getWhiteBoardObjectRoomId(room_id);
-
-			whiteBoardObject.setX((Integer) actionObject.get(1));
-			whiteBoardObject.setY((Integer) actionObject.get(2));
-
-			WhiteBoardObjectListManager.getInstance().setWhiteBoardObject(
-					room_id, whiteBoardObject);
-
-		} catch (Exception err) {
-			log.error("[updateWhiteboardObjectPos]", err);
-		}
-	}
+	
+	@Autowired
+	private WhiteBoardObjectListManagerById whiteBoardObjectListManagerById;
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void addWhiteBoardObjectById(Long room_id, Map whiteboardObj,
@@ -336,8 +59,7 @@ public class WhiteboardManagement {
 			List actionObject = (List) whiteboardObj.get(3);
 
 			if (action.equals("moveMap")) {
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 
@@ -346,12 +68,11 @@ public class WhiteboardManagement {
 				whiteboardObject.setY(Integer.valueOf(
 						actionObject.get(2).toString()).intValue());
 
-				WhiteBoardObjectListManagerById.getInstance()
+				whiteBoardObjectListManagerById
 						.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
 								whiteboardObject, whiteBoardId);
 			} else if (action.equals("draw") || action.equals("redo")) {
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 
@@ -365,22 +86,20 @@ public class WhiteboardManagement {
 					log.debug("objectOID: " + objectOID);
 					whiteboardObject.getRoomItems()
 							.put(objectOID, actionObject);
-					WhiteBoardObjectListManagerById.getInstance()
+					whiteBoardObjectListManagerById
 							.setWhiteBoardObjectListRoomObjAndWhiteboardId(
 									room_id, whiteboardObject, whiteBoardId);
 				}
 			} else if (action.equals("clear")) {
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 				whiteboardObject.setRoomItems(new HashMap<String, List>());
-				WhiteBoardObjectListManagerById.getInstance()
+				whiteBoardObjectListManagerById
 						.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
 								whiteboardObject, whiteBoardId);
 			} else if (action.equals("delete") || action.equals("undo")) {
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 				String objectOID = actionObject.get(actionObject.size() - 1)
@@ -460,7 +179,7 @@ public class WhiteboardManagement {
 
 				whiteboardObject.getRoomItems().remove(objectOID);
 
-				WhiteBoardObjectListManagerById.getInstance()
+				whiteBoardObjectListManagerById
 						.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
 								whiteboardObject, whiteBoardId);
 			} else if (action.equals("size") || action.equals("editProp")
@@ -469,8 +188,7 @@ public class WhiteboardManagement {
 					|| action.equals("flv")
 					|| action.equals("editTextMindMapColor")
 					|| action.equals("editTextMindMapFontColor")) {
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 				String objectOID = actionObject.get(actionObject.size() - 1)
@@ -572,13 +290,12 @@ public class WhiteboardManagement {
 					}
 				}
 
-				WhiteBoardObjectListManagerById.getInstance()
+				whiteBoardObjectListManagerById
 						.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
 								whiteboardObject, whiteBoardId);
 			} else if (action.equals("clearSlide")) {
 
-				WhiteboardObject whiteboardObject = WhiteBoardObjectListManagerById
-						.getInstance()
+				WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById
 						.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
 								whiteBoardId);
 
@@ -590,7 +307,7 @@ public class WhiteboardManagement {
 
 				}
 
-				WhiteBoardObjectListManagerById.getInstance()
+				whiteBoardObjectListManagerById
 						.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
 								whiteboardObject, whiteBoardId);
 			} else {

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java Mon Feb  4 22:30:28 2013
@@ -74,6 +74,8 @@ public class ConferenceLibrary implement
 	private AuthLevelmanagement authLevelManagement;
 	@Autowired
 	private LibraryWmlLoader libraryWmlLoader;
+	@Autowired
+	private WhiteboardManagement whiteboardManagement;
 
 	public LibraryPresentation getPresentationPreviewFileExplorer(String SID,
 			String parentFolder) {
@@ -196,7 +198,7 @@ public class ConferenceLibrary implement
 				whiteboardObjClear.put(2, "clear");
 				whiteboardObjClear.put(3, null);
 
-				WhiteboardManagement.getInstance().addWhiteBoardObjectById(
+				whiteboardManagement.addWhiteBoardObjectById(
 						room_id, whiteboardObjClear, whiteboardId);
 
 				for (int k = 0; k < roomItems.size(); k++) {
@@ -207,7 +209,7 @@ public class ConferenceLibrary implement
 					whiteboardObj.put(2, "draw");
 					whiteboardObj.put(3, actionObject);
 
-					WhiteboardManagement.getInstance().addWhiteBoardObjectById(
+					whiteboardManagement.addWhiteBoardObjectById(
 							room_id, whiteboardObj, whiteboardId);
 
 				}
@@ -231,17 +233,9 @@ public class ConferenceLibrary implement
 												.getIsScreenClient())) {
 									continue;
 								} else {
-									// log.debug("*..*idremote: " +
-									// rcl.getStreamid());
-									// log.debug("*..* sendVars room_id IS EQUAL: "
-									// + currentClient.getStreamid() + " asd " +
-									// rcl.getStreamid() + " IS eq? "
-									// +currentClient.getStreamid().equals(rcl.getStreamid()));
 									((IServiceCapableConnection) conn).invoke(
 											"loadWmlToWhiteboardById",
 											new Object[] { sendObject }, this);
-									// log.debug("sending sendVarsToWhiteboard to "
-									// + conn + " rcl " + rcl);
 								}
 							}
 						}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/WhiteBoardService.java Mon Feb  4 22:30:28 2013
@@ -38,7 +38,7 @@ import org.apache.openmeetings.data.basi
 import org.apache.openmeetings.data.user.Usermanagement;
 import org.apache.openmeetings.persistence.beans.rooms.Client;
 import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManager;
+import org.apache.openmeetings.remote.red5.WhiteBoardObjectSyncManager;
 import org.apache.openmeetings.remote.red5.WhiteBoardObjectListManagerById;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.OmFileHelper;
@@ -67,7 +67,7 @@ public class WhiteBoardService implement
 	@Autowired
 	private final ISessionManager sessionManager = null;
 	@Autowired
-	private final WhiteBoardObjectListManager whiteBoardObjectListManager = null;
+	private final WhiteBoardObjectSyncManager whiteBoardObjectListManager = null;
 	@Autowired
 	private final WhiteBoardObjectListManagerById whiteBoardObjectListManagerById = null;
 	@Autowired
@@ -79,7 +79,7 @@ public class WhiteBoardService implement
 	 * Loading the List of Objects on the whiteboard
 	 * 
 	 * @return HashMap<String,Map>
-	 */
+	
 	public WhiteboardObject getRoomItems() {
 		try {
 			IConnection current = Red5.getConnectionLocal();
@@ -98,6 +98,7 @@ public class WhiteBoardService implement
 		}
 		return null;
 	}
+	 */
 
 	public Long getNewWhiteboardId() {
 		try {
@@ -575,8 +576,7 @@ public class WhiteBoardService implement
 			Long room_id = currentClient.getRoom_id();
 
 			// TODO: Maybe we should also check all rooms, independent from the
-			// current
-			// room_id if there is any user registered
+			// current room_id if there is any user registered
 			if (room_id != null) {
 
 				log.debug("removeUserFromAllLists this.whiteBoardObjectListManager: "

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Mon Feb  4 22:30:28 2013
@@ -85,6 +85,8 @@ public class ScopeApplicationAdapter ext
 	@Autowired
 	private WhiteBoardService whiteBoardService;
 	@Autowired
+	private WhiteboardManagement whiteboardManagement;
+	@Autowired
 	private FLVRecorderService flvRecorderService;
 	@Autowired
 	private ConfigurationDao configurationDaoImpl;
@@ -1866,85 +1868,6 @@ public class ScopeApplicationAdapter ext
 	 * This Function is triggered from the Whiteboard
 	 * 
 	 * @param whiteboardObjParam - array of parameters being sended to whiteboard
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public synchronized void sendVars(ArrayList whiteboardObjParam) {
-		//
-		try {
-			Map whiteboardObj = new HashMap();
-			int i = 0;
-			for (Iterator iter = whiteboardObjParam.iterator(); iter.hasNext();) {
-				Object obj = iter.next();
-				whiteboardObj.put(i, obj);
-				i++;
-			}
-
-			// Check if this User is the Mod:
-			IConnection current = Red5.getConnectionLocal();
-			Client currentClient = this.sessionManager
-					.getClientByStreamId(current.getClient().getId(), null);
-
-			if (currentClient == null) {
-				return;
-			}
-			Long room_id = currentClient.getRoom_id();
-			String action = whiteboardObj.get(2).toString();
-
-			if (action != null && action.equals("whiteboardObj")) {
-				// Update Whiteboard Object
-				List actionObject = (List) whiteboardObj.get(3);
-				WhiteboardManagement.getInstance().updateWhiteboardObject(
-						room_id, actionObject);
-			} else if (action != null && action.equals("moveMap")) {
-				// Update Whiteboard Object
-				List actionObject = (List) whiteboardObj.get(3);
-				WhiteboardManagement.getInstance().updateWhiteboardObjectPos(
-						room_id, actionObject);
-			} else {
-				// Store event in list
-				WhiteboardManagement.getInstance().addWhiteBoardObject(room_id,
-						whiteboardObj);
-			}
-
-			boolean showDrawStatus = getWhiteboardDrawStatus();
-
-			// Notify all Clients of that 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) {
-							IClient client = conn.getClient();
-							if (SessionVariablesUtil.isScreenClient(client)) {
-								// screen sharing clients do not receive events
-								continue;
-							} else if (SessionVariablesUtil.isAVClient(client)) {
-								// AVClients or potential AVClients do not receive events
-								continue;
-							} if (client.getId().equals(
-									current.getClient().getId())) {
-								// don't send back to same user
-								continue;
-							}
-							((IServiceCapableConnection) conn)
-								.invoke("sendVarsToWhiteboard",
-									new Object[] { (showDrawStatus ? currentClient : null), whiteboardObj }, 
-										this);
-						}
-					}
-				}
-			}
-
-		} catch (Exception err) {
-			log.error("[sendVars]", err);
-		}
-	}
-
-	/**
-	 * This Function is triggered from the Whiteboard
-	 * 
-	 * @param whiteboardObjParam - array of parameters being sended to whiteboard
 	 * @param whiteboardId - id of whiteboard parameters will be send to
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -2003,14 +1926,14 @@ public class ScopeApplicationAdapter ext
 
 					whiteboardTempObj.put(3, tempActionObject);
 
-					WhiteboardManagement.getInstance().addWhiteBoardObjectById(
+					whiteboardManagement.addWhiteBoardObjectById(
 							room_id, whiteboardTempObj, whiteboardId);
 
 				}
 
 			} else {
 
-				WhiteboardManagement.getInstance().addWhiteBoardObjectById(
+				whiteboardManagement.addWhiteBoardObjectById(
 						room_id, whiteboardObj, whiteboardId);
 
 			}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java?rev=1442407&r1=1442406&r2=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManagerById.java Mon Feb  4 22:30:28 2013
@@ -20,42 +20,24 @@ package org.apache.openmeetings.remote.r
 
 import java.util.HashMap;
 
-import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardObject;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardObjectList;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
 
+/**
+ * Memory based cache, configured as singleton in spring configuration
+ * 
+ * @author sebawagner
+ *
+ */
 public class WhiteBoardObjectListManagerById {
 	
-	private static HashMap<Long,WhiteboardObjectList> whiteBoardObjectList = new HashMap<Long,WhiteboardObjectList>();
+	private HashMap<Long,WhiteboardObjectList> whiteBoardObjectList = new HashMap<Long,WhiteboardObjectList>();
 	
-	private static Long whiteboardId = 0L;
-	
-//	private static HashMap<Long,Map<String,WhiteboardSyncLockObject>> whiteBoardSyncList = new HashMap<Long,Map<String,WhiteboardSyncLockObject>>();
-//	
-//	private static HashMap<Long,Map<String,Map<String,WhiteboardSyncLockObject>>> whiteBoardObjectSyncList = new HashMap<Long,Map<String,Map<String,WhiteboardSyncLockObject>>>();
-
-	private static final Logger log = Red5LoggerFactory.getLogger(WhiteBoardObjectListManagerById.class, OpenmeetingsVariables.webAppRootKey);
-
-	private static WhiteBoardObjectListManagerById instance = null;
-
-	private WhiteBoardObjectListManagerById() {
-		log.debug("WhiteBoardObjectListManagerById is constructed");
-	}
-
-	public static synchronized WhiteBoardObjectListManagerById getInstance() {
-		if (instance == null) {
-			instance = new WhiteBoardObjectListManagerById();
-		}
-		return instance;
-	}
+	private Long whiteboardId = 0L;
 	
 	public Long getNewWhiteboardId(Long room_id) throws Exception {
 		whiteboardId++;
-		
 		this.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, new WhiteboardObject(), whiteboardId);
-		
 		return whiteboardId;
 	}
 	
@@ -82,78 +64,11 @@ public class WhiteBoardObjectListManager
 		return whiteboardObjects;
 	}
 	
-//	/*
-//	 * Initial Sync Process
-//	 */
-//	public synchronized void setWhiteBoardSyncListByRoomid(Long room_id, Map<String,WhiteboardSyncLockObject> mapObject ){
-//		whiteBoardSyncList.put(room_id, mapObject);
-//	}
-//	public synchronized Map<String,WhiteboardSyncLockObject> getWhiteBoardSyncListByRoomid(Long room_id){
-//		Map<String,WhiteboardSyncLockObject> roomList = whiteBoardSyncList.get(room_id);
-//		if (roomList == null) {
-//			roomList = new HashMap<String,WhiteboardSyncLockObject>();
-//		}
-//		return roomList;
-//	}
-//	
-//	/*
-//	 * Image Sync Process
-//	 */
-//	public synchronized void setWhiteBoardImagesSyncListByRoomid(Long room_id, Map<String,Map<String,WhiteboardSyncLockObject>> mapObject ){
-//		whiteBoardObjectSyncList.put(room_id, mapObject);
-//	}
-//	public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(Long room_id, 
-//			String object_id,Map<String,WhiteboardSyncLockObject> imageSyncList){
-//		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
-//		if (roomList == null) {
-//			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
-//		}
-//		if (imageSyncList.size() == 0) {
-//			roomList.remove(object_id);
-//		} else {
-//			roomList.put(object_id, imageSyncList);
-//		}
-//		setWhiteBoardImagesSyncListByRoomid(room_id,roomList);
-//	}
-//	public synchronized Map<String,Map<String,WhiteboardSyncLockObject>> getWhiteBoardObjectSyncListByRoomid(Long room_id){
-//		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
-//		if (roomList == null) {
-//			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
-//		}
-//		return roomList;
-//	}
-//	public synchronized Map<String,WhiteboardSyncLockObject> getWhiteBoardObjectSyncListByRoomAndObjectId(Long room_id, 
-//			String object_id){
-//		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid room_id: "+room_id);
-//		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
-//		if (roomList == null) {
-//			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
-//		}
-//		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList: "+roomList);
-//		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid object_id: "+object_id);
-//		if (roomList.size() == 1) {
-//			log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList Key image_id: "+roomList.keySet().iterator().next());
-//		}
-//		Map<String,WhiteboardSyncLockObject> imageSyncList = roomList.get(object_id);
-//		if (imageSyncList == null) {
-//			imageSyncList = new HashMap<String,WhiteboardSyncLockObject>();
-//		}
-//		return imageSyncList;
-//	}
-	
 	/*
 	 * Whiteboard Object List
 	 * 
 	 */
 	
-//	public synchronized HashMap<Long,HashMap<String,List>> getWhiteBoardObjectList(){
-//		return whiteBoardObjectList;
-//	}
-//	
-//	public synchronized void setWhiteBoardObjectList(HashMap<Long,HashMap<String,List>> whiteBoardObjectListNew){
-//		whiteBoardObjectList = whiteBoardObjectListNew;
-//	}
-//	
 	public synchronized void setWhiteBoardObjectListRoomObj(Long room_id, WhiteboardObjectList whiteboardObjectList){
 		whiteBoardObjectList.put(room_id, whiteboardObjectList);
 	}

Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java (from r1439243, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManager.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManager.java&r1=1439243&r2=1442407&rev=1442407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectListManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/WhiteBoardObjectSyncManager.java Mon Feb  4 22:30:28 2013
@@ -19,133 +19,104 @@
 package org.apache.openmeetings.remote.red5;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
 import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.conference.whiteboard.WhiteboardObject;
 import org.apache.openmeetings.conference.whiteboard.WhiteboardSyncLockObject;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
 
-public class WhiteBoardObjectListManager {
-	
-	private static HashMap<Long,WhiteboardObject> whiteBoardObjectList = new HashMap<Long,WhiteboardObject>();
-	private static HashMap<Long,Map<String,WhiteboardSyncLockObject>> whiteBoardSyncList = new HashMap<Long,Map<String,WhiteboardSyncLockObject>>();
-	
-	private static HashMap<Long,Map<String,Map<String,WhiteboardSyncLockObject>>> whiteBoardObjectSyncList = new HashMap<Long,Map<String,Map<String,WhiteboardSyncLockObject>>>();
-
-	private static final Logger log = Red5LoggerFactory.getLogger(WhiteBoardObjectListManager.class, OpenmeetingsVariables.webAppRootKey);
-
-	private static WhiteBoardObjectListManager instance = null;
-
-	private WhiteBoardObjectListManager() {
-	}
+/**
+ * Memory based, configured as singleton in spring configuration
+ * 
+ * @author sebawagner
+ *
+ */
+public class WhiteBoardObjectSyncManager {
+
+	private HashMap<Long, Map<String, WhiteboardSyncLockObject>> whiteBoardSyncList = new HashMap<Long, Map<String, WhiteboardSyncLockObject>>();
+
+	private HashMap<Long, Map<String, Map<String, WhiteboardSyncLockObject>>> whiteBoardObjectSyncList = new HashMap<Long, Map<String, Map<String, WhiteboardSyncLockObject>>>();
+
+	private static final Logger log = Red5LoggerFactory.getLogger(
+			WhiteBoardObjectSyncManager.class,
+			OpenmeetingsVariables.webAppRootKey);
 
-	public static synchronized WhiteBoardObjectListManager getInstance() {
-		if (instance == null) {
-			instance = new WhiteBoardObjectListManager();
-		}
-		return instance;
-	}
-	
-	public synchronized WhiteboardObject getWhiteBoardObjectRoomId(Long room_id){
-		WhiteboardObject whiteBoardObject = whiteBoardObjectList.get(room_id);
-		if (whiteBoardObject == null) {
-			whiteBoardObject = new WhiteboardObject();
-		}
-		return whiteBoardObject;
-	}
-	
-	/*
-	 * Room items a Whiteboard
-	 */
-	@SuppressWarnings("rawtypes")
-	public synchronized HashMap<String,List> getWhiteBoardObjectListByRoomId(Long room_id){
-		return new HashMap<String,List>();
-	}
-	
 	/*
 	 * Initial Sync Process
 	 */
-	public synchronized void setWhiteBoardSyncListByRoomid(Long room_id, Map<String,WhiteboardSyncLockObject> mapObject ){
+	public synchronized void setWhiteBoardSyncListByRoomid(Long room_id,
+			Map<String, WhiteboardSyncLockObject> mapObject) {
 		whiteBoardSyncList.put(room_id, mapObject);
 	}
-	public synchronized Map<String,WhiteboardSyncLockObject> getWhiteBoardSyncListByRoomid(Long room_id){
-		Map<String,WhiteboardSyncLockObject> roomList = whiteBoardSyncList.get(room_id);
+
+	public synchronized Map<String, WhiteboardSyncLockObject> getWhiteBoardSyncListByRoomid(
+			Long room_id) {
+		Map<String, WhiteboardSyncLockObject> roomList = whiteBoardSyncList
+				.get(room_id);
 		if (roomList == null) {
-			roomList = new HashMap<String,WhiteboardSyncLockObject>();
+			roomList = new HashMap<String, WhiteboardSyncLockObject>();
 		}
 		return roomList;
 	}
-	
+
 	/*
 	 * Image Sync Process
 	 */
-	public synchronized void setWhiteBoardImagesSyncListByRoomid(Long room_id, Map<String,Map<String,WhiteboardSyncLockObject>> mapObject ){
+	public synchronized void setWhiteBoardImagesSyncListByRoomid(Long room_id,
+			Map<String, Map<String, WhiteboardSyncLockObject>> mapObject) {
 		whiteBoardObjectSyncList.put(room_id, mapObject);
 	}
-	public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(Long room_id, 
-			String object_id,Map<String,WhiteboardSyncLockObject> imageSyncList){
-		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
+
+	public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(
+			Long room_id, String object_id,
+			Map<String, WhiteboardSyncLockObject> imageSyncList) {
+		Map<String, Map<String, WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList
+				.get(room_id);
 		if (roomList == null) {
-			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
+			roomList = new HashMap<String, Map<String, WhiteboardSyncLockObject>>();
 		}
 		if (imageSyncList.size() == 0) {
 			roomList.remove(object_id);
 		} else {
 			roomList.put(object_id, imageSyncList);
 		}
-		setWhiteBoardImagesSyncListByRoomid(room_id,roomList);
+		setWhiteBoardImagesSyncListByRoomid(room_id, roomList);
 	}
-	public synchronized Map<String,Map<String,WhiteboardSyncLockObject>> getWhiteBoardObjectSyncListByRoomid(Long room_id){
-		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
+
+	public synchronized Map<String, Map<String, WhiteboardSyncLockObject>> getWhiteBoardObjectSyncListByRoomid(
+			Long room_id) {
+		Map<String, Map<String, WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList
+				.get(room_id);
 		if (roomList == null) {
-			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
+			roomList = new HashMap<String, Map<String, WhiteboardSyncLockObject>>();
 		}
 		return roomList;
 	}
-	public synchronized Map<String,WhiteboardSyncLockObject> getWhiteBoardObjectSyncListByRoomAndObjectId(Long room_id, 
-			String object_id){
-		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid room_id: "+room_id);
-		Map<String,Map<String,WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList.get(room_id);
+
+	public synchronized Map<String, WhiteboardSyncLockObject> getWhiteBoardObjectSyncListByRoomAndObjectId(
+			Long room_id, String object_id) {
+		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid room_id: "
+				+ room_id);
+		Map<String, Map<String, WhiteboardSyncLockObject>> roomList = whiteBoardObjectSyncList
+				.get(room_id);
 		if (roomList == null) {
-			roomList = new HashMap<String,Map<String,WhiteboardSyncLockObject>>();
+			roomList = new HashMap<String, Map<String, WhiteboardSyncLockObject>>();
 		}
-		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList: "+roomList);
-		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid object_id: "+object_id);
+		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList: "
+				+ roomList);
+		log.debug("getWhiteBoardImagesSyncListByRoomAndImageid object_id: "
+				+ object_id);
 		if (roomList.size() == 1) {
-			log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList Key image_id: "+roomList.keySet().iterator().next());
+			log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomList Key image_id: "
+					+ roomList.keySet().iterator().next());
 		}
-		Map<String,WhiteboardSyncLockObject> imageSyncList = roomList.get(object_id);
+		Map<String, WhiteboardSyncLockObject> imageSyncList = roomList
+				.get(object_id);
 		if (imageSyncList == null) {
-			imageSyncList = new HashMap<String,WhiteboardSyncLockObject>();
+			imageSyncList = new HashMap<String, WhiteboardSyncLockObject>();
 		}
 		return imageSyncList;
 	}
-	
-	/*
-	 * Whiteboard Object List
-	 * 
-	 */
-//	public synchronized HashMap<Long,HashMap<String,List>> getWhiteBoardObjectList(){
-//		return whiteBoardObjectList;
-//	}
-//	public synchronized void setWhiteBoardObjectList(HashMap<Long,HashMap<String,List>> whiteBoardObjectListNew){
-//		whiteBoardObjectList = whiteBoardObjectListNew;
-//	}
-	
-	public synchronized void setWhiteBoardObject(Long room_id, WhiteboardObject whiteBoardObject){
-		whiteBoardObjectList.put(room_id, whiteBoardObject);
-	}
-	
-	public synchronized void setWhiteBoardObjectListRoomObj(Long room_id, @SuppressWarnings("rawtypes") HashMap<String,List> roomList){
-		WhiteboardObject whiteBoardObject = whiteBoardObjectList.get(room_id);
-		if (whiteBoardObject == null) {
-			whiteBoardObject = new WhiteboardObject();
-		}
-		//whiteBoardObject.setObjList(roomList);
-		whiteBoardObjectList.put(room_id, whiteBoardObject);
-	}
 
 }



Mime
View raw message