minor renaming of how to get config for each module

This commit is contained in:
Richard Alam 2011-10-05 23:47:24 -04:00
parent cb32d63e49
commit 14ec18fceb
10 changed files with 19 additions and 25 deletions

View File

@ -38,6 +38,10 @@ package org.bigbluebutton.core
return configManager;
}
public static function getConfigForModule(module:String):XML {
return initConfigManager().config.getConfigFor(module);
}
public static function initStreamManager():StreamManager {
if (streamManager == null) {
streamManager = new StreamManager();
@ -63,8 +67,7 @@ package org.bigbluebutton.core
var versionString:String = Capabilities.version;
var pattern:RegExp = /^(\w*) (\d*),(\d*),(\d*),(\d*)$/;
var result:Object = pattern.exec(versionString);
if (result != null)
{
if (result != null) {
// trace("input: " + result.input);
// trace("platform: " + result[1]);
// trace("majorVersion: " + result[2]);

View File

@ -11,14 +11,9 @@ package org.bigbluebutton.core.managers
import org.bigbluebutton.core.EventBroadcaster;
import org.bigbluebutton.core.model.Config;
public class ConfigManager2 extends EventDispatcher
{
public class ConfigManager2 extends EventDispatcher {
private var _config:Config = null;
public function ConfigManager2()
{
}
public function loadConfig():void {
var urlLoader:URLLoader = new URLLoader();
urlLoader.addEventListener(Event.COMPLETE, handleComplete);

View File

@ -78,7 +78,7 @@ package org.bigbluebutton.core.model
return found;
}
public function getModuleConfig(moduleName:String):XML {
public function getConfigFor(moduleName:String):XML {
if (isModulePresent(moduleName)) {
return new XML(config.modules.module.(@name.toUpperCase() == moduleName.toUpperCase()).toXMLString());
}

View File

@ -49,7 +49,7 @@ package org.bigbluebutton.modules.chat.maps {
}
private function getChatOptions():void {
var cxml:XML = BBB.initConfigManager().config.getModuleConfig("ChatModule");
var cxml:XML = BBB.getConfigForModule("ChatModule");
if (cxml != null) {
chatOptions.privateEnabled = (cxml.@privateEnabled.toString().toUpperCase() == "TRUE") ? true : false;
}
@ -65,13 +65,9 @@ package org.bigbluebutton.modules.chat.maps {
// main application.
var event:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
event.window = _chatWindow;
globalDispatcher.dispatchEvent(event);
_chatWindowOpen = true;
dispatchTranslationOptions();
globalDispatcher.dispatchEvent(event);
_chatWindowOpen = true;
dispatchTranslationOptions();
}
public function closeChatWindow():void {

View File

@ -40,7 +40,7 @@ package org.bigbluebutton.modules.listeners.managers
dispatcher = new Dispatcher();
listenerOptions = new ListenerOptions();
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("ListenersModule");
var vxml:XML = BBB.getConfigForModule("ListenersModule");
if (vxml != null) {
listenerOptions.windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
}

View File

@ -1,7 +1,6 @@
package org.bigbluebutton.modules.phone
{
public class PhoneOptions
{
public class PhoneOptions {
[Bindable]
public var showButton:Boolean = true;

View File

@ -18,8 +18,7 @@
*/
package org.bigbluebutton.modules.phone.managers {
import com.asfusion.mate.events.Dispatcher;
import com.asfusion.mate.events.Dispatcher;
import flash.events.ActivityEvent;
import flash.events.AsyncErrorEvent;
import flash.events.IEventDispatcher;
@ -77,6 +76,8 @@ package org.bigbluebutton.modules.phone.managers {
options.echoPath = 128;
options.nonLinearProcessing = true;
mic['enhancedOptions'] = options;
} else {
}
mic.setUseEchoSuppression(true);

View File

@ -37,7 +37,7 @@ package org.bigbluebutton.modules.phone.maps
phoneButton = new ToolbarButton();
globalDispatcher = new Dispatcher();
phoneOptions = new PhoneOptions();
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("PhoneModule");
var vxml:XML = BBB.getConfigForModule("PhoneModule");
if (vxml != null) {
phoneOptions.showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
phoneOptions.autoJoin = (vxml.@autoJoin.toString().toUpperCase() == "TRUE") ? true : false;

View File

@ -38,7 +38,7 @@ package org.bigbluebutton.modules.videoconf.model
public var camQualityPicture:Number = 50;
public function parseOptions():void {
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("VideoconfModule");
var vxml:XML = BBB.getConfigForModule("VideoconfModule");
if (vxml != null) {
if (vxml.@showButton != undefined) {
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;

View File

@ -47,7 +47,7 @@ package org.bigbluebutton.modules.viewers.managers
viewerOptions = new ViewerOptions();
var vxml:XML = BBB.initConfigManager().config.getModuleConfig("ViewersModule");
var vxml:XML = BBB.getConfigForModule("ViewersModule");
if (vxml != null) {
viewerOptions.windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
}