Revision: 3221
Author: seba.wagner
Date: Fri Apr 16 00:31:19 2010
Log: Optimize Slide Presentation Loading Synchronization
http://code.google.com/p/openmeetings/source/detail?r=3221
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawSave.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/swfResourceView.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
Mon Oct 12 07:45:40 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawImage.lzx
Fri Apr 16 00:31:19 2010
@@ -57,6 +57,7 @@
if ($debug) Debug.write("urlname: ",urlname);
var now = new Date();
//This invokes a Method which is in the remoteWhiteboard.lzx
+ this.startNewObjectSyncProcess.isStarting = true;
this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName +
now.getTime();
this.startNewObjectSyncProcess.doCall();
this.addNewImage(urlname,posx,posy,baseurl,fileName,
@@ -199,6 +200,7 @@
if ($debug)
Debug.write("addImageToLayerHistory: ",actionObject,refObj);
//start sync process using the remote uniqueObjectSyncName as
identifier
//This invokes a Method which is in the remoteWhiteboard.lzx
+ this.startNewObjectSyncProcess.isStarting = false;
this.startNewObjectSyncProcess.uniqueObjectSyncName =
actionObject[8];
this.startNewObjectSyncProcess.doCall();
this.addImageToLayer(refObj,actionObject[actionObject.length-1],actionObject[1],
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Thu Mar 4 01:22:24 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawObject.lzx
Fri Apr 16 00:31:19 2010
@@ -15,6 +15,7 @@
<method name="loadSWFPresentationSynced"
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
var now = new Date();
//This invokes a Method which is in the remoteWhiteboard.lzx
+ this.startNewObjectSyncProcess.isStarting = true;
this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName +
now.getTime();
this.startNewObjectSyncProcess.doCall();
//if ($debug)
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
@@ -146,6 +147,7 @@
-->
<method name="addSWFToLayerHistorySynced" args="actionObject,refObj">
this.baseactionobjectList.push(actionObject);
+ this.startNewObjectSyncProcess.isStarting = false;
this.startNewObjectSyncProcess.uniqueObjectSyncName =
actionObject[17];
this.startNewObjectSyncProcess.doCall();
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawSave.lzx
Sun Jan 31 07:04:50 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawSave.lzx
Fri Apr 16 00:31:19 2010
@@ -395,6 +395,8 @@
<!-- 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";
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Thu Mar 4 01:20:42 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Fri Apr 16 00:31:19 2010
@@ -103,8 +103,10 @@
<!-- methods for syncing events -->
<netRemoteCallHib name="startNewObjectSyncProcess"
funcname="whiteboardservice.startNewObjectSyncProcess"
remotecontext="$once{ canvas.thishib }" >
+ <attribute name="isStarting" value="false" type="boolean" />
<attribute name="uniqueObjectSyncName" value="" type="string" />
<netparam><method name="getValue">return
parent.uniqueObjectSyncName;</method></netparam>
+ <netparam><method name="getValue">return
parent.isStarting;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/swfResourceView.lzx
Fri Nov 27 10:25:08 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/swfResourceView.lzx
Fri Apr 16 00:31:19 2010
@@ -240,6 +240,9 @@
<handler name="onerror" args="error">
<![CDATA[
////Debug.write("onerror "+error);
+
+
+ new lz.errorPopup(canvas,{error:"onerror SWF!! "+error});
this.parent.initwidth = this.width;
this.parent.initheight = this.height;
@@ -270,6 +273,8 @@
<handler name="ontimeout" args="error">
<![CDATA[
////Debug.write("ontimeout "+error);
+
+ new lz.errorPopup(canvas,{error:"ontimeout SWF!! "+error});
this.parent.initwidth = this.width;
this.parent.initheight = this.height;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Tue Jan 26 07:08:58 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Fri Apr 16 00:31:19 2010
@@ -293,7 +293,9 @@
this.parent.whiteboardRef.editTextByValues(this.parent.objRef,this.parent.objRef.name,this.parent.objRef.text,x,y,this.parent.objRef.width,this.parent.objRef.height);
}
</handler>
+ <!--
<labelTooltip labelid="252" />
+ -->
</view>
<!--
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
Thu Mar 4 01:32:29 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
Fri Apr 16 00:31:19 2010
@@ -269,7 +269,7 @@
*
*/
- public WhiteboardSyncLockObject startNewObjectSyncProcess(String
object_id){
+ public void startNewObjectSyncProcess(String object_id, boolean
isStarting){
try {
log.debug("startNewObjectSyncprocess: "+object_id);
@@ -288,33 +288,32 @@
syncListImage.put(currentClient.getPublicSID(),
wSyncLockObject);
this.whiteBoardObjectListManager.setWhiteBoardImagesSyncListByRoomAndObjectId(room_id,
object_id, syncListImage);
- Collection<Set<IConnection>> conCollection =
current.getScope().getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection conn : conset) {
- if (conn != null) {
- if (conn instanceof
IServiceCapableConnection) {
- RoomClient rcl =
this.clientListManager.getClientByStreamId(conn.getClient().getId());
- if (rcl.getIsScreenClient() !=
null && rcl.getIsScreenClient()) {
- //continue;
- } else {
- log.debug("sending
:"+rcl);
- if (room_id!=null
&& room_id.equals(rcl.getRoom_id())) {
-
log.debug("sendObjectSyncFlag :"+rcl);
- ((IServiceCapableConnection) conn).invoke("sendObjectSyncFlag",
new Object[] { wSyncLockObject },this);
+ //Do only send the Token to show the Loading Splash for the
initial-Request that starts the loading
+ if (isStarting) {
+ Collection<Set<IConnection>> conCollection =
current.getScope().getConnections();
+ for (Set<IConnection> conset : conCollection) {
+ for (IConnection conn : conset) {
+ if (conn != null) {
+ if (conn instanceof
IServiceCapableConnection) {
+ RoomClient rcl =
this.clientListManager.getClientByStreamId(conn.getClient().getId());
+ if
(rcl.getIsScreenClient() != null && rcl.getIsScreenClient()) {
+ //continue;
+ } else {
+
log.debug("sending :"+rcl);
+ if
(room_id!=null && room_id.equals(rcl.getRoom_id())) {
+
log.debug("sendObjectSyncFlag :"+rcl);
+ ((IServiceCapableConnection) conn).invoke("sendObjectSyncFlag",
new Object[] { wSyncLockObject },this);
+ }
}
}
- }
- }
- }
- }
-
- return wSyncLockObject;
-
+ }
+ }
+ }
+ }
} catch (Exception err) {
log.error("[startNewObjectSyncProcess]",err);
}
- return null;
}
public int sendCompletedObjectSyncEvent(String object_id) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
Tue Dec 29 06:13:44 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
Fri Apr 16 00:31:19 2010
@@ -351,8 +351,8 @@
}
} catch (Exception er) {
- System.out.println("Error downloading: " + er);
- er.printStackTrace();
+ log.error("Error downloading: " , er);
+ //er.printStackTrace();
}
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
