- fix some exception popups when running flash debugger

Author: ritzalam

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml

@@ -132,10 +132,12 @@
 			}
 			
 			public function setGraphicType(type:String):void {
+                if (model == null) return;
 				model.setGraphicType(type);
 			}
 			
 			public function setTool(s:String):void {
+                if (model == null) return;
 				model.setTool(s);
 				toolType = s;
 			}

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml

@@ -169,7 +169,7 @@ Author: Ajay Gopinath <ajgopi124(at)gmail(dot)com>
 				this.visible = true;
 			}
 			
-			private function disableTextToolbar():void{
+			private function disableTextToolbar(evt:Event=null):void{
 				this.visible = false;
 			}
 			
@@ -206,11 +206,18 @@ Author: Ajay Gopinath <ajgopi124(at)gmail(dot)com>
 			
 			public function repositionToolbar(tobj:TextObject = null):void {
 				// translate TextObject's coords to stage coords because TextToolbar is added to stage
-				if (tobj == null)  tobj = currentlySelectedTextObject;
+               
+				if (tobj == null && currentlySelectedTextObject == null)  {
+                    return;
+                }
+                
+                tobj = currentlySelectedTextObject;
+                            
 				if (textSizeMenu.isOpen) {
 					LogUtil.debug("Text size menu is open...trying to close");
 					textSizeMenu.displayPopUp();
 				}
+                              
 				var loc:Point = canvas.localToGlobal(new Point(tobj.x, tobj.y));
 				this.x = loc.x;
 				this.y = loc.y - this.height - 45;

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml

@@ -115,18 +115,38 @@
                 setToolType(e.graphicType, e.toolType);
             }
             
-            private function setToolType(graphicType:String, toolType:String):void {
+            private function setToolType(graphicType:String, toolType:String):void {                
                 canvas.setGraphicType(graphicType);
                 canvas.setTool(toolType);
                 
-                panzoomBtn.setTool(graphicType, toolType);
-                scribbleBtn.setTool(graphicType, toolType);
-                rectangleBtn.setTool(graphicType, toolType);
-                circleBtn.setTool(graphicType, toolType);
-                triangleBtn.setTool(graphicType, toolType);
-                lineBtn.setTool(graphicType, toolType);
-                textBtn.setTool(graphicType, toolType);
+                if (panzoomBtn != null) {
+                    panzoomBtn.setTool(graphicType, toolType);
+                }
+                
+                if (scribbleBtn != null) {
+                    scribbleBtn.setTool(graphicType, toolType); 
+                }
+                                
+                if (rectangleBtn != null) {
+                    rectangleBtn.setTool(graphicType, toolType); 
+                }
+                
+                if (circleBtn != null) {
+                    circleBtn.setTool(graphicType, toolType);
+                }
                 
+                if (triangleBtn != null) {
+                    triangleBtn.setTool(graphicType, toolType);
+                }
+                                
+                if (lineBtn != null) {
+                    lineBtn.setTool(graphicType, toolType);
+                }
+                
+                if (textBtn != null) {
+                    textBtn.setTool(graphicType, toolType);
+                }
+                                
                 if(graphicType == WhiteboardConstants.TYPE_CLEAR) {
                     dispatchEvent(new WhiteboardDrawEvent(WhiteboardDrawEvent.CLEAR));
                 }
@@ -172,6 +192,7 @@
 			}
 						
 			private function presenterMode(e:MadePresenterEvent):void {
+                if (canvas == null) return;
 				canvas.makeTextObjectsEditable(e);
                 this.visible = true;
                 setToolType(WhiteboardConstants.TYPE_ZOOM, null);
@@ -219,12 +240,12 @@
            
             private function graphicObjSelected(event:GraphicObjectFocusEvent):void  {
                 var gobj:GraphicObject = event.data;
-                LogUtil.debug("!!!!SELECTED:" );
+//                LogUtil.debug("!!!!SELECTED:" );
             }
             
             private function graphicObjDeselected(event:GraphicObjectFocusEvent):void  {
                 var gobj:GraphicObject = event.data;
-                LogUtil.debug("!!!!DESELECTED:" + " " );
+ //               LogUtil.debug("!!!!DESELECTED:" + " " );
             }
 			           
 		]]>