Revision: 4019
Author: solomax666
Date: Wed Aug 3 10:26:21 2011
Log: - 'show.whiteboard.draw.status' property is added to
enable/disable displaying draw status
http://code.google.com/p/openmeetings/source/detail?r=4019
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 09:52:10 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 10:26:21 2011
@@ -1086,7 +1086,7 @@
<method name="setUserStatus" args="ctx,user,o">
<![CDATA[
-if (!o) return;
+ if (!o || !user) return;
//The onResult-Handler will be called be the rtmpconnection
if ($debug) {
Debug.write("setUserStatus: ", user);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Wed Aug 3 10:26:21 2011
@@ -436,6 +436,9 @@
Configurationmanagement.getInstance().addConfByKey(3, "dashboard.show.rssfeed",
"0", null, "Show RSS Tab");
+
Configurationmanagement.getInstance().addConfByKey(3, "show.whiteboard.draw.status",
+ "0", null, "Display name of the user who
draw the current object (User Name auto-disapper after 3 seconds.");
+
}
public void loadDefaultRooms() {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 09:52:10 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 10:26:21 2011
@@ -2122,6 +2122,9 @@
//if (ismod) {
+ Configuration conf =
Configurationmanagement.getInstance().getConfKey(3, "show.whiteboard.draw.status");
+ boolean showDrawStatus = conf != null
&& "1".equals(conf.getConf_value());
+
//Notify all Clients of that Scope (Room)
Collection<Set<IConnection>> conCollection =
current.getScope().getConnections();
for (Set<IConnection> conset : conCollection) {
@@ -2137,7 +2140,7 @@
//log.debug("*..*idremote: " + rcl.getStreamid());
//log.debug("*..* sendVars room_id IS EQUAL: " +
currentClient.getStreamid() + " asd " + rcl.getStreamid() + " IS eq? "
+currentClient.getStreamid().equals(rcl.getStreamid()));
if
(!currentClient.getStreamid().equals(rcl.getStreamid())) {
- ((IServiceCapableConnection) conn).invoke("sendVarsToWhiteboard",
new Object[] { currentClient, whiteboardObj },this);
+ ((IServiceCapableConnection) conn).invoke("sendVarsToWhiteboard",
new Object[] { showDrawStatus ? currentClient : null, whiteboardObj },this);
//log.debug("sending sendVarsToWhiteboard to " + conn + " rcl " +
rcl);
numberOfUsers++;
}
@@ -2250,6 +2253,9 @@
sendObject.put("id", whiteboardId);
sendObject.put("param", whiteboardObjParam);
+ Configuration conf =
Configurationmanagement.getInstance().getConfKey(3, "show.whiteboard.draw.status");
+ boolean showDrawStatus = conf != null
&& "1".equals(conf.getConf_value());
+
//Notify all Clients of that Scope (Room)
Collection<Set<IConnection>> conCollection =
current.getScope().getConnections();
for (Set<IConnection> conset : conCollection) {
@@ -2263,7 +2269,7 @@
//log.debug("*..*idremote: " + rcl.getStreamid());
//log.debug("*..* sendVars room_id IS EQUAL: " +
currentClient.getStreamid() + " asd " + rcl.getStreamid() + " IS eq? "
+currentClient.getStreamid().equals(rcl.getStreamid()));
if
(!currentClient.getStreamid().equals(rcl.getStreamid())) {
- ((IServiceCapableConnection)
conn).invoke("sendVarsToWhiteboardById", new Object[] { currentClient,
sendObject },this);
+ ((IServiceCapableConnection)
conn).invoke("sendVarsToWhiteboardById", new Object[] { showDrawStatus ?
currentClient : null, sendObject },this);
//log.debug("sending sendVarsToWhiteboard to " + conn + " rcl " +
rcl);
numberOfUsers++;
}
--
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.
