From 99376a3dfee874ef4a74d13d1b12a5e1ef589004 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Tue, 28 Sep 2010 15:52:39 -0400 Subject: [PATCH] - cleanup --- .../deskshare/services/DeskshareService.as | 22 +++++---------- .../deskshare/server/mina/Codec.scala | 28 ------------------- 2 files changed, 7 insertions(+), 43 deletions(-) delete mode 100755 deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/mina/Codec.scala diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as index f6580a9f8d..9425fc7d40 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as @@ -59,8 +59,7 @@ package org.bigbluebutton.modules.deskshare.services public function connect(uri:String):void { this.uri = uri; - LogUtil.debug("Deskshare Service connecting to " + uri); - trace("Deskshare Service connecting to " + uri); + LogUtil.debug("Deskshare Service connecting to " + uri); conn = new Connection(); conn.addEventListener(Connection.SUCCESS, connectionSuccessHandler); conn.addEventListener(Connection.FAILED, connectionFailedHandler); @@ -74,19 +73,16 @@ package org.bigbluebutton.modules.deskshare.services width = result.width as Number; height = result.height as Number; LogUtil.debug("Desk Share stream is streaming [" + width + "," + height + "]"); - trace("Desk Share stream is streaming [" + width + "," + height + "]"); var event:ViewStreamEvent = new ViewStreamEvent(ViewStreamEvent.START); event.videoWidth = width; event.videoHeight = height; dispatcher.dispatchEvent(event); } else { - LogUtil.debug("No deskshare stream being published"); - trace("No deskshare stream being published"); + LogUtil.debug("No deskshare stream being published"); } }, function(status:Object):void{ - LogUtil.error("Error while trying to call remote mathod on server"); - trace("Error while trying to call remote mathod on server"); + LogUtil.error("Error while trying to call remote mathod on server"); } ); } @@ -109,13 +105,11 @@ package org.bigbluebutton.modules.deskshare.services } public function connectionFailedHandler(e:ConnectionEvent):void{ - LogUtil.error("connection failed to " + uri + " with message " + e.toString()); - trace("connection failed to " + uri + " with message " + e.toString()); + LogUtil.error("connection failed to " + uri + " with message " + e.toString()); } public function connectionRejectedHandler(e:ConnectionEvent):void{ - LogUtil.error("connection rejected " + uri + " with message " + e.toString()); - trace("connection rejected " + uri + " with message " + e.toString()); + LogUtil.error("connection rejected " + uri + " with message " + e.toString()); } /** @@ -131,7 +125,6 @@ package org.bigbluebutton.modules.deskshare.services */ public function appletStarted(videoWidth:Number, videoHeight:Number):void{ LogUtil.debug("Got applet started"); - trace("Got applet started"); var event:AppletStartedEvent = new AppletStartedEvent(); event.videoWidth = videoWidth; event.videoHeight = videoHeight; @@ -146,8 +139,7 @@ package org.bigbluebutton.modules.deskshare.services try{ deskSO.send("startViewing", captureWidth, captureHeight); } catch(e:Error){ - LogUtil.error("error while trying to send start viewing notification"); - trace("error while trying to send start viewing notification"); + LogUtil.error("error while trying to send start viewing notification"); } } @@ -196,7 +188,7 @@ package org.bigbluebutton.modules.deskshare.services * */ public function stopViewing():void{ - trace("Received dekskshareStreamStopped"); + LogUtil.debug("Received dekskshareStreamStopped"); dispatcher.dispatchEvent(new ViewStreamEvent(ViewStreamEvent.STOP)); } diff --git a/deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/mina/Codec.scala b/deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/mina/Codec.scala deleted file mode 100755 index ce16464524..0000000000 --- a/deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/mina/Codec.scala +++ /dev/null @@ -1,28 +0,0 @@ -/* - * BigBlueButton - http://www.bigbluebutton.org - * - * Copyright (c) 2008-2009 by respective authors (see below). All rights reserved. - * - * BigBlueButton is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. - * - * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License along - * with BigBlueButton; if not, If not, see . - * - * $Id: $ - */ -package org.bigbluebutton.deskshare.server.mina - -import org.apache.mina.core.buffer.IoBuffer -import org.apache.mina.core.session.{IdleStatus, IoSession} -import org.apache.mina.filter.codec._ - -object Codec { - -}