Additional improvements to the configuration parsing.

bigbluebutton-client/resources/config.xml.template

@@ -28,7 +28,6 @@
 			dependsOn="UsersModule"	
 			privateEnabled="true"  
 			fontSize="12"
-			position="top-right"
 			baseTabIndex="801"
 			colorPickerIsVisible="false"
 			maxMessageLength="1024"
@@ -66,17 +65,17 @@
 
 		<module name="VideoconfModule" url="http://HOST/client/VideoconfModule.swf?v=VERSION" 
 			uri="rtmp://HOST/video"
-			dependsOn = "UsersModule"
+			dependsOn="UsersModule"
 			baseTabIndex="401"
-			autoStart = "false"
+			autoStart="false"
 			skipCamSettingsCheck="false"
-			showButton = "true"
+			showButton="true"
 			applyConvolutionFilter="false"
 			convolutionFilter="-1, 0, -1, 0, 6, 0, -1, 0, -1"
 			filterBias="0"
 			filterDivisor="4"
-			displayAvatar = "false"
+			displayAvatar="false"
-			priorityRatio = "0.67"
+			priorityRatio="0.67"
 		/>
 		
 		<module name="WhiteboardModule" url="http://HOST/client/WhiteboardModule.swf?v=VERSION" 

bigbluebutton-client/src/org/bigbluebutton/common/LogUtil.as

@@ -87,19 +87,19 @@ package org.bigbluebutton.common {
 				logTarget = new TraceTarget();
 			} else {
 				var lxml:XML = BBB.getConfigManager().config.logging;
-				if (lxml.@enabled != undefined) {
+				if (lxml.@enabled.length() > 0 ) {
-					loggingEnabled = (lxml.@enabled.toString().toUpperCase() == "TRUE") ? true : false;
+					loggingEnabled = (lxml.@enabled.toString().toUpperCase() == "TRUE");
 				}
-				if (lxml.@target != undefined) {
+				if (lxml.@target.length() > 0 ) {
 					loggingTargetName = lxml.@target.toString().toLowerCase();
 				}
-				if (lxml.@level != undefined) {
+				if (lxml.@level.length() > 0 ) {
 					logLevel = String(lxml.@level).toUpperCase();
 				}
-				if (lxml.@format != undefined) {
+				if (lxml.@format.length() > 0 ) {
 					logFormat = lxml.@format.toString();
 				}
-				if (lxml.@logPattern != undefined) {
+				if (lxml.@logPattern.length() > 0 ) {
 					logPattern = lxml.@logPattern.toString();
 				}
 				if (loggingEnabled) {

bigbluebutton-client/src/org/bigbluebutton/core/Options.as

@@ -30,9 +30,9 @@ package org.bigbluebutton.core {
 
 		private static const storage:Dictionary = new Dictionary(true);
 
-		protected var name:String;
+		private static const parsedOptions:Dictionary = new Dictionary(true);
 
-		protected var parsed:Boolean;
+		protected var name:String;
 
 		public static function getOptions(clazz:Class):Options {
 			var options:Options;
@@ -46,8 +46,12 @@ package org.bigbluebutton.core {
 			return options;
 		}
 
+		public static function isParsed(optionName:String):Boolean {
+			return parsedOptions[optionName] != undefined;
+		}
+
 		public function parseOptions():void {
-			if (!parsed) {
+			if (Options.parsedOptions[name] == undefined) {
 				readOptions();
 			}
 		}
@@ -96,13 +100,13 @@ package org.bigbluebutton.core {
 								}
 								break;
 							default:
-								throw new Error("Cannot read undefined property");
+								throw new Error("Cannot parse undefined property type");
 								break;
 						}
 					}
 				}
 				handleExtraData();
-				parsed = true;
+				Options.parsedOptions[name] = true;
 			}
 		}
 

bigbluebutton-client/src/org/bigbluebutton/core/managers/VideoProfileManager.as

@@ -60,7 +60,7 @@ package org.bigbluebutton.core.managers
             _profiles.splice(0);
 
             var profiles:XML = new XML(e.target.data);
-            var fallbackLocale:String = profiles.@fallbackLocale != undefined? profiles.@fallbackLocale.toString(): DEFAULT_FALLBACK_LOCALE;
+            var fallbackLocale:String = profiles.@fallbackLocale != undefined ? profiles.@fallbackLocale.toString(): DEFAULT_FALLBACK_LOCALE;
             for each (var profile:XML in profiles.children()) {
                 _profiles.push(new VideoProfile(profile, fallbackLocale));
             }

bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as

@@ -95,6 +95,10 @@ package org.bigbluebutton.core.model
 			return new XML(config.browserVersions.toXMLString());
 		}
 
+		public function get layout():XML {
+			return new XML(config.layout.toXMLString());
+		}
+		
 		public function get meeting():XML {
 			return new XML(config.meeting.toXMLString());
 		}
@@ -103,6 +107,10 @@ package org.bigbluebutton.core.model
 			return new XML(config.logging.toXMLString());
 		}
 		
+		public function get breakoutRooms():XML {
+			return new XML(config.breakoutRooms.toXMLString());
+		}
+		
 		public function get lock():XML {
 			if(config.lock == null) return null;
 			return new XML(config.lock.toXMLString());

bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as

@@ -488,46 +488,32 @@ package org.bigbluebutton.main.model.users {
 				disablePrivateChat:Boolean,
 				disablePublicChat:Boolean,
 				lockedLayout:Boolean,
-				lockOnJoin:Boolean,
+				lockOnJoin:Boolean = true,
 				lockOnJoinConfigurable:Boolean;
 			var lockConfig:XML;
 			if (config != null) {
 				lockConfig = config.lock;
 			}
-			try {
+			if (lockConfig.@disableCamForLockedUsers.length() > 0 ) {
 				disableCam = (lockConfig.@disableCamForLockedUsers.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				disableCam = false; //If not set, default to false
 			}
-			try {
+			if (lockConfig.@disableMicForLockedUsers.length() > 0 ) {
 				disableMic = (lockConfig.@disableMicForLockedUsers.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				disableMic = false; //If not set, default to false
 			}
-			try {
+			if (lockConfig.@disablePrivateChatForLockedUsers.length() > 0 ) {
 				disablePrivateChat = (lockConfig.@disablePrivateChatForLockedUsers.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				disablePrivateChat = false; //If not set, default to false
 			}
-			try {
+			if (lockConfig.@disablePublicChatForLockedUsers.length() > 0 ) {
 				disablePublicChat = (lockConfig.@disablePublicChatForLockedUsers.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				disablePublicChat = false; //If not set, default to false
 			}
-			try {
+			if (lockConfig.@lockLayoutForLockedUsers.length() > 0 ) {
 				lockedLayout = (lockConfig.@lockLayoutForLockedUsers.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				lockedLayout = false; //If not set, default to false
 			}
-			try {
+			if (lockConfig.@lockOnJoin.length() > 0 ) {
 				lockOnJoin = (lockConfig.@lockOnJoin.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				lockOnJoin = true; //If not set, default to true
 			}
-			try {
+			if (lockConfig.@lockOnJoinConfigurable.length() > 0 ) {
 				lockOnJoinConfigurable = (lockConfig.@lockOnJoinConfigurable.toUpperCase() == "TRUE");
-			} catch (e:Error) {
-				lockOnJoinConfigurable = false; //If not set, default to false
 			}
 			lockSettings = new LockSettingsVO(disableCam, disableMic, disablePrivateChat, disablePublicChat, lockedLayout, lockOnJoin, lockOnJoinConfigurable);
 			setLockSettings(lockSettings);

bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/TextArea2.as

@@ -19,7 +19,6 @@
 package org.bigbluebutton.modules.caption.views
 {
 	import mx.controls.TextArea;
-	import mx.core.IUITextField;
 	import mx.core.UITextField;
 	
 	public class TextArea2 extends TextArea

bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatOptions.as

@@ -28,9 +28,6 @@ package org.bigbluebutton.modules.chat.model {
 		[Bindable]
 		public var fontSize:String = "12";
 
-		[Bindable]
-		public var position:String = "top-right";
-
 		[Bindable]
 		public var baseTabIndex:int = 801;
 

bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml

@@ -45,6 +45,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.common.events.LocaleChangeEvent;
 			import org.bigbluebutton.core.KeyboardUtil;
 			import org.bigbluebutton.main.events.ShortcutEvent;
+			import org.bigbluebutton.main.views.MainCanvas;
 			import org.bigbluebutton.modules.chat.model.ChatOptions;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
@@ -56,7 +57,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] public var chatOptions:ChatOptions;
 			
 			public function getPrefferedPosition():String{
-				return chatOptions.position;
+				return MainCanvas.TOP_RIGHT;
 			} 
 			
 			private function onCreationComplete():void {