diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
index d5db58452d3426841f9814978e83e0b9f376692b..fba9acc3d03f00886fee2daba884bdc4f0725aec 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
@@ -36,7 +36,6 @@ package org.bigbluebutton.modules.screenshare.managers
public class ScreenshareManager {
private static const LOGGER:ILogger = getClassLogger(ScreenshareManager);
- private static const LOG:String = "SC::ScreenshareManager - ";
private var publishWindowManager:PublishWindowManager;
private var viewWindowManager:ViewerWindowManager;
@@ -55,7 +54,7 @@ package org.bigbluebutton.modules.screenshare.managers
}
public function handleStartModuleEvent(module:ScreenshareModule):void {
- LOGGER.debug(LOG + "Screenshare Module starting");
+ LOGGER.debug("Screenshare Module starting");
this.module = module;
service.handleStartModuleEvent(module);
@@ -65,14 +64,14 @@ package org.bigbluebutton.modules.screenshare.managers
}
public function handleStopModuleEvent():void {
- LOGGER.debug(LOG + "Screenshare Module stopping");
+ LOGGER.debug("Screenshare Module stopping");
publishWindowManager.stopSharing();
viewWindowManager.stopViewing();
service.disconnect();
}
public function handleConnectionSuccessEvent():void {
- LOGGER.debug(LOG + "handle Connection Success Event");
+ LOGGER.debug("handle Connection Success Event");
service.checkIfPresenterIsSharingScreen();
}
@@ -164,7 +163,7 @@ package org.bigbluebutton.modules.screenshare.managers
}
public function handleShareStartRequestResponseEvent(event:ShareStartRequestResponseEvent):void {
- LOGGER.debug(LOG + "handleShareStartRequestResponseEvent");
+ LOGGER.debug("handleShareStartRequestResponseEvent");
var dispatcher:Dispatcher = new Dispatcher();
if (event.success) {
ScreenshareModel.getInstance().authToken = event.token;
@@ -176,7 +175,7 @@ package org.bigbluebutton.modules.screenshare.managers
}
public function handleStartSharingEvent(autoStart:Boolean):void {
- LOGGER.debug(LOG + "handleStartSharingEvent");
+ LOGGER.debug("handleStartSharingEvent");
//toolbarButtonManager.disableToolbarButton();
toolbarButtonManager.startedSharing();
var option:ScreenshareOptions = new ScreenshareOptions();
@@ -198,7 +197,7 @@ package org.bigbluebutton.modules.screenshare.managers
}
private function handleStreamStartEvent(streamId: String, videoWidth:Number, videoHeight:Number):void{
- LOGGER.debug(LOG + "Received start vieweing command");
+ LOGGER.debug("Received start vieweing command");
viewWindowManager.startViewing(streamId, videoWidth, videoHeight);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
index 4fada92002660e3e69a44e0fd8361dbcd1dbca59..fd4f3b428fdf7823a7806466771d880a5ddaeb2c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ViewerWindowManager.as
@@ -31,7 +31,6 @@ package org.bigbluebutton.modules.screenshare.managers
import org.bigbluebutton.modules.screenshare.view.components.ScreenshareViewWindow;
public class ViewerWindowManager {
- private static const LOG:String = "SC::ViewerWindowManager - ";
private static const LOGGER:ILogger = getClassLogger(ViewerWindowManager);
private var viewWindow:ScreenshareViewWindow;
@@ -72,7 +71,7 @@ package org.bigbluebutton.modules.screenshare.managers
}
public function startViewing(streamId:String, videoWidth:Number, videoHeight:Number):void{
- LOGGER.debug(LOG + "ViewerWindowManager::startViewing");
+ LOGGER.debug("ViewerWindowManager::startViewing");
viewWindow = new ScreenshareViewWindow();
viewWindow.startVideo(service.getConnection());
openWindow(viewWindow);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
index 0274157c8e7e2b71ba4a31e4a969ff2b9af90f78..adcd8f46e8a7b0ef42b6a675e4328ab27d4e80df 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
@@ -33,7 +33,6 @@ package org.bigbluebutton.modules.screenshare.services
public class MessageReceiver implements IMessageListener
{
- private static const LOG:String = "SC::MessageReceiver - ";
private static const LOGGER:ILogger = getClassLogger(MessageReceiver);
private var conn: Connection;
@@ -45,7 +44,7 @@ package org.bigbluebutton.modules.screenshare.services
}
public function onMessage(messageName:String, message:Object):void {
- LOGGER.debug(LOG + " Received message " + messageName);
+ LOGGER.debug(" Received message " + messageName);
switch (messageName) {
case "isSharingScreenRequestResponse":
@@ -72,7 +71,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleStartShareRequestResponse(message:Object):void {
- LOGGER.debug(LOG + "handleStartShareRequestResponse " + message);
+ LOGGER.debug("handleStartShareRequestResponse " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("authToken") && map.hasOwnProperty("jnlp")) {
var shareSuccessEvent: ShareStartRequestResponseEvent = new ShareStartRequestResponseEvent(map.authToken, map.jnlp, true);
@@ -84,7 +83,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleScreenShareStartedMessage(message:Object):void {
- LOGGER.debug(LOG + "handleScreenShareStartedMessage " + message);
+ LOGGER.debug("handleScreenShareStartedMessage " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("streamId")) {
var streamEvent: ShareStartedEvent = new ShareStartedEvent(map.streamId);
@@ -93,7 +92,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleScreenShareStoppedMessage(message:Object):void {
- LOGGER.debug(LOG + "handleScreenShareStoppedMessage " + message);
+ LOGGER.debug("handleScreenShareStoppedMessage " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("streamId")) {
var streamEvent: ShareStoppedEvent = new ShareStoppedEvent(map.streamId);
@@ -102,7 +101,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleScreenStreamStartedMessage(message:Object):void {
- LOGGER.debug(LOG + "handleScreenStreamStartedMessage " + message);
+ LOGGER.debug("handleScreenStreamStartedMessage " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("streamId") && map.hasOwnProperty("width") &&
map.hasOwnProperty("height") && map.hasOwnProperty("url")) {
@@ -113,7 +112,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleScreenStreamStoppedMessage(message:Object):void {
- LOGGER.debug(LOG + "handleScreenStreamStoppedMessage " + message);
+ LOGGER.debug("handleScreenStreamStoppedMessage " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("streamId")) {
var streamEvent: StreamStoppedEvent = new StreamStoppedEvent(map.streamId);
@@ -122,7 +121,7 @@ package org.bigbluebutton.modules.screenshare.services
}
private function handleIsSharingScreenRequestResponse(message:Object):void {
- LOGGER.debug(LOG + "handleIsSharingScreenRequestResponse " + message);
+ LOGGER.debug("handleIsSharingScreenRequestResponse " + message);
var map:Object = JSON.parse(message.msg);
if (map.hasOwnProperty("sharing") && map.sharing) {
if (map.hasOwnProperty("streamId") && map.hasOwnProperty("width") &&
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
index c4fae5543f81b58b173259350c4567352d4a0237..bf094fe82306d3354a4b4030f94aa14c0ca308b5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/ScreenshareService.as
@@ -52,7 +52,7 @@ package org.bigbluebutton.modules.screenshare.services
}
public function handleStartModuleEvent(module:ScreenshareModule):void {
- LOGGER.debug(LOG + "Screenshare Module starting");
+ LOGGER.debug("Screenshare Module starting");
this.module = module;
connect(module.uri, module.getRoom());
}
@@ -60,7 +60,7 @@ package org.bigbluebutton.modules.screenshare.services
public function connect(uri:String, room:String):void {
this.uri = uri;
this.room = room;
- LOGGER.debug(LOG + "Screenshare Service connecting to " + uri);
+ LOGGER.debug("Screenshare Service connecting to " + uri);
conn = new Connection(room);
sender = new MessageSender(conn);
@@ -79,7 +79,7 @@ package org.bigbluebutton.modules.screenshare.services
}
public function checkIfPresenterIsSharingScreen():void {
- LOGGER.debug(LOG + "check if presenter is sharing screen");
+ LOGGER.debug("check if presenter is sharing screen");
sender.isScreenSharing(UsersUtil.getInternalMeetingID());
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
index a6bb09e6c9489ea4557f6697b971575a61003764..68e3d1aca84e41b70f6b18d831d28ff92b4ec953 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
@@ -39,7 +39,6 @@ package org.bigbluebutton.modules.screenshare.services.red5
public class Connection {
private static const LOGGER:ILogger = getClassLogger(Connection);
- public static const LOG:String = "Screenshare::Connection - ";
private var netConn:NetConnection;
private var uri:String;
@@ -70,14 +69,14 @@ package org.bigbluebutton.modules.screenshare.services.red5
netConn.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
if (getURI().length == 0){
- trace(LOG + "please provide a valid URI connection string. URI Connection String missing");
+ LOGGER.debug("please provide a valid URI connection string. URI Connection String missing");
return;
} else if (netConn.connected){
- trace(LOG + "You are already connected to " + getURI());
+ LOGGER.debug("You are already connected to " + getURI());
return;
}
- trace(LOG + "Trying to connect to [" + getURI() + "] retry=[" + retry + "]");
+ LOGGER.debug("Trying to connect to [" + getURI() + "] retry=[" + retry + "]");
if (! (retryCount > 0)) {
var ce:ConnectionEvent = new ConnectionEvent(ConnectionEvent.CONNECTING);
dispatcher.dispatchEvent(ce);
@@ -111,17 +110,17 @@ package org.bigbluebutton.modules.screenshare.services.red5
_messageListeners[notify].onMessage(messageName, message);
}
} else {
- trace( LOG + "Message name is undefined");
+ LOGGER.debug("Message name is undefined");
}
}
public function onMessageFromServer(messageName:String, msg:Object):void {
- trace(LOG + "Got message from server [" + messageName + "] data=" + msg.msg);
+ LOGGER.debug("Got message from server [" + messageName + "] data=" + msg.msg);
notifyListeners(messageName, msg);
}
private function connectTimeoutHandler(e:TimerEvent):void {
- trace(LOG + "Connection attempt to [" + getURI() + "] timedout. Retrying.");
+ LOGGER.debug("Connection attempt to [" + getURI() + "] timedout. Retrying.");
retryTimer.stop();
retryTimer = null;
@@ -164,7 +163,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
}
private function sendMessage(service:String, onSuccess:Function, onFailure:Function, message:Object=null):void {
- trace(LOG + "SENDING [" + service + "]");
+ LOGGER.debug("SENDING [" + service + "]");
var responder:Responder = new Responder(
function(result:Object):void { // On successful result
onSuccess("Successfully sent [" + service + "].");
@@ -235,7 +234,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
if (rest.length > 0) p_bw = rest[0];
// your application should do something here
// when the bandwidth check is complete
- trace("bandwidth = " + p_bw + " Kbps.");
+ LOGGER.debug("bandwidth = " + p_bw + " Kbps.");
}
private function sendUserIdToServer():void {
@@ -255,11 +254,11 @@ package org.bigbluebutton.modules.screenshare.services.red5
}
private function netStatusHandler(event:NetStatusEvent):void {
- trace(LOG + "Connected to [" + getURI() + "]. [" + event.info.code + "]");
+ LOGGER.debug("Connected to [" + getURI() + "]. [" + event.info.code + "]");
if (retryTimer) {
retryCount = 0;
- trace(LOG + "Cancelling retry timer.");
+ LOGGER.debug("Cancelling retry timer.");
retryTimer.stop();
retryTimer = null;
}
@@ -284,7 +283,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
break;
case "NetConnection.Connect.Closed":
- trace(LOG + "Screenshare connection closed.");
+ LOGGER.debug("Screenshare connection closed.");
ce = new ConnectionEvent(ConnectionEvent.CLOSED);
break;
@@ -299,7 +298,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
break;
case "NetConnection.Connect.NetworkChange":
- trace(LOG + "Detected network change. User might be on a wireless and temporarily dropped connection. Doing nothing. Just making a note.");
+ LOGGER.debug("Detected network change. User might be on a wireless and temporarily dropped connection. Doing nothing. Just making a note.");
break;
default :
@@ -333,12 +332,10 @@ package org.bigbluebutton.modules.screenshare.services.red5
public function connectionFailedHandler(e:ConnectionEvent):void{
LOGGER.error("connection failed to " + uri + " with message " + e.toString());
- trace(LOG + "connection failed to " + uri + " with message " + e.toString());
}
public function connectionRejectedHandler(e:ConnectionEvent):void{
LOGGER.error("connection rejected " + uri + " with message " + e.toString());
- trace(LOG + "connection rejected " + uri + " with message " + e.toString());
}
@@ -347,7 +344,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
*
*/
public function appletStarted(videoWidth:Number, videoHeight:Number):void{
- trace(LOG + "Got applet started");
+ LOGGER.debug("Got applet started");
var event:AppletStartedEvent = new AppletStartedEvent();
event.videoWidth = videoWidth;
event.videoHeight = videoHeight;
@@ -367,7 +364,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
}
public function sendStartedViewingNotification(stream:String):void{
- trace(LOG + "Sending start viewing to server");
+ LOGGER.debug("Sending start viewing to server");
netConn.call("deskshare.startedToViewStream", null, stream);
}
@@ -381,7 +378,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
*
*/
public function startViewing(videoWidth:Number, videoHeight:Number):void{
- trace(LOG + "startViewing invoked by server");
+ LOGGER.debug("startViewing invoked by server");
var event:ViewStreamEvent = new ViewStreamEvent(ViewStreamEvent.START);
dispatcher.dispatchEvent(event);
@@ -392,11 +389,11 @@ package org.bigbluebutton.modules.screenshare.services.red5
*
*/
public function sendStopViewingNotification():void{
- trace(LOG + "Sending stop viewing notification to other clients.");
+ LOGGER.debug("Sending stop viewing notification to other clients.");
try{
deskSO.send("stopViewing");
} catch(e:Error){
- trace(LOG + "could not send stop viewing notification");
+ LOGGER.debug("could not send stop viewing notification");
}
}
@@ -413,7 +410,7 @@ package org.bigbluebutton.modules.screenshare.services.red5
*
*/
public function stopViewing():void{
- trace(LOG + "Received dekskshareStreamStopped");
+ LOGGER.debug("Received dekskshareStreamStopped");
dispatcher.dispatchEvent(new ViewStreamEvent(ViewStreamEvent.STOP));
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
index 4f5163e4fab22c6f86f3f18e80a766547f1257ab..e29f50019a017558c13aeb1d78b49a027d302aaa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
@@ -65,8 +65,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.core.BBB;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
-
- private static const LOG:String = "SC::ScreensharePublishWIndow - ";
+
private static const LOGGER:ILogger = getClassLogger(ScreensharePublishWindow);
public static const SCALE:Number = 5;
@@ -163,7 +162,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
public function shareScreen(fullScreen:Boolean):void {
- LOGGER.debug(LOG + "Calling shareScreen");
+ LOGGER.debug("Calling shareScreen");
btnFSPublish.enabled = false;
btnRegionPublish.enabled = false;
startSharing(connection, uri, room, fullScreen);
@@ -175,12 +174,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
sharingFullScreen = fullScreen;
var authToken:String = ScreenshareModel.getInstance().authToken;
var jnlp: String = ScreenshareModel.getInstance().jnlp;
- LOGGER.debug(LOG + "StartScreensharing jnlp=" + jnlp + " token=" + authToken);
+ LOGGER.debug("StartScreensharing jnlp=" + jnlp + " token=" + authToken);
ExternalInterface.call("startScreensharing", jnlp, UsersUtil.getInternalMeetingID(), authToken, fullScreen);
}
public function stopSharing():void {
- LOGGER.debug(LOG + "Calling stopSharing");
+ LOGGER.debug("Calling stopSharing");
if (streaming) {
stopStream();
var streamEvent:RequestToStopSharing = new RequestToStopSharing();
@@ -205,7 +204,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function handleStartViewStreamEvent(event:ViewStreamEvent):void{
- LOGGER.debug(LOG + "handleStartViewStreamEvent");
+ LOGGER.debug("handleStartViewStreamEvent");
var width: int = ScreenshareModel.getInstance().width;
var height: int = ScreenshareModel.getInstance().height;
var streamId: String = ScreenshareModel.getInstance().streamId;
@@ -216,7 +215,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
removeHowToHelpArea();
- LOGGER.debug(LOG + "Viewing stream =[" + streamId + "]");
+ LOGGER.debug("Viewing stream =[" + streamId + "]");
streaming = true;
// Store capture dimensions so we can position cursor properly.
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
index c0db7c1ead8cc51de499b3a632507e8bde406cfc..b303f6d2f85ec640add7be318f475d78b6a590de 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
@@ -201,7 +201,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onAsyncError(e:AsyncErrorEvent):void{
- LOGGER.debug(LOG + "asyncerror " + e.toString());
+ LOGGER.debug("asyncerror " + e.toString());
var logData:Object = new Object();
logData.error = e.toString();
JSLog.debug(LOG + "asyncerror ", logData);
@@ -213,7 +213,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
switch(e.info.code){
case "NetStream.Play.Start":
- LOGGER.debug(LOG + "NetStream.Publish.Start for broadcast stream " + streamId);
+ LOGGER.debug("NetStream.Publish.Start for broadcast stream " + streamId);
JSLog.debug(LOG + "NetStream.Publish.Start for broadcast stream ", logData);
var dispatcher: Dispatcher = new Dispatcher();
var viewEvent:StartedViewingEvent = new StartedViewingEvent(StartedViewingEvent.STARTED_VIEWING_EVENT);
@@ -221,7 +221,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
dispatcher.dispatchEvent(viewEvent);
break;
case "NetStream.Play.UnpublishNotify":
- LOGGER.debug(LOG + "NetStream.Play.UnpublishNotify for broadcast stream " + streamId);
+ LOGGER.debug("NetStream.Play.UnpublishNotify for broadcast stream " + streamId);
JSLog.debug(LOG + "NetStream.Play.UnpublishNotify for broadcast stream ", logData);
stopViewing();
break;