Index: lams_flash/src/central/flash/main2.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/main2.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/main2.as	20 Oct 2008 05:02:06 -0000	1.4
+++ lams_flash/src/central/flash/main2.as	21 Oct 2008 03:08:58 -0000	1.5
@@ -1,98 +1,98 @@
-import org.lamsfoundation.lams.learner.Application;
-import org.lamsfoundation.lams.common.util.StringUtils;
-import com.macromedia.javascript.JavaScriptProxy;
-import org.lamsfoundation.lams.common.util.Debugger;
-
-// Temp values to be removed / repplaced at deployment
-_global.myRoot = this;
-
-if(StringUtils.isEmpty(lcId)){
-	Debugger.log('lcId is not defined, actionscript will not be able to communicate with javascript',Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(presenceServerUrl)){
-	_root.presenceServerUrl = "192.168.1.1";
-	Debugger.log('presenceServerUrl is not defined, using defualt:'+_root.presenceServerUrl ,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(serverURL)){
-	_root.serverURL = "http://localhost:8080/lams/";
-	Debugger.log('serverURL is not defined, using defualt:'+_root.serverURL ,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(userID)){
-	_root.userID = 4;
-	Debugger.log('userID is not defined, using defualt:'+_root.userID ,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(firstName)){
-	_root.firstName = "firstName";
-	Debugger.log('firstName is not defined, using defualt:'+_root.firstName ,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(lastName)){
-	_root.lastName = "lastName";
-	Debugger.log('lastName is not defined, using defualt:'+_root.lastName ,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(mode)){
-	_root.mode = 1;
-	Debugger.log('Mode is not defined, using defualt:'+_root.mode,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(lessonID)){
-	_root.lessonID = 1;
-	Debugger.log('Lesson ID is not defined, using defualt:'+_root.lessonID,Debugger.CRITICAL,'main','ROOT');			
-}
-
-if(StringUtils.isEmpty(uniqueID)){
-	_root.uniqueID = 0;
-	Debugger.log('Unique ID is not defined.',Debugger.CRITICAL,'main','ROOT');
-}
-
-if(StringUtils.isEmpty(langDate)){
-	_root.langDate = "01-01-1970";
-}
-
-Debugger.log("PRESENCE: connection info from controlFrame - " + userID + " " + firstName + " " + lastName + " " + presenceServerUrl, Debugger.MED,'main','ROOT');
-
-//Set stage alignment to top left and prent scaling
-Stage.align = "TL";
-Stage.scaleMode = "noScale";
-
-
-//Start the application, passing in the top level clip, i.e. _root
-var app:Application = Application.getInstance();
-app.main(this);
-
-//Local connection to JSPs for progress data
-var receive_lc = new LocalConnection();
-//Functions to setProgress data, called by the LocalConnection object in learner JSPs
-receive_lc.setProgressData = function(attempted, completed, current, lessonID, version, refresh) {
-	Debugger.log(arguments.toString(), Debugger.CRITICAL, 'learnerProgress_lc.setProgressData', 'ROOT');
-	app.refreshProgress(attempted, completed, current, lessonID, version);
-	myRoot.refresh = refresh;
-};
-
-var success = receive_lc.connect("learnerProgress_lc_" + uniqueID);
-
-//Declaration of proxy object for javascript integration kit
-var proxy:JavaScriptProxy = new JavaScriptProxy(_root.lcId, this);
-_root.proxy = proxy;
-
-function sendMessageToFlash(msg:String){
-	Debugger.log("PRESENCE: from javascript - " + msg, Debugger.MED, 'sendMessageToFlash', 'ROOT');
-}
-
-function attemptRegistration(){
-	Debugger.log("PRESENCE: registration caught in main", Debugger.MED, 'sendMessageToFlash', 'ROOT');
-	app.getPresence().attemptRegistration();
-}
-
-function sendUsersToFlash(users:Array){
-	Debugger.log('PRESENCE: ' + users, Debugger.MED, 'sendUsersToFlash', 'ROOT');
-	app.getPresence().setupDataGrid(users);
-}
-
-//Make app listener for stage resize events
-Stage.addListener(app);
+import org.lamsfoundation.lams.learner.Application;
+import org.lamsfoundation.lams.common.util.StringUtils;
+import com.macromedia.javascript.JavaScriptProxy;
+import org.lamsfoundation.lams.common.util.Debugger;
+
+// Temp values to be removed / repplaced at deployment
+_global.myRoot = this;
+
+if(StringUtils.isEmpty(lcId)){
+	Debugger.log('lcId is not defined, actionscript will not be able to communicate with javascript',Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(presenceServerUrl)){
+	_root.presenceServerUrl = "192.168.1.1";
+	Debugger.log('presenceServerUrl is not defined, using defualt:'+_root.presenceServerUrl ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(serverURL)){
+	_root.serverURL = "http://localhost:8080/lams/";
+	Debugger.log('serverURL is not defined, using defualt:'+_root.serverURL ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(userID)){
+	_root.userID = 4;
+	Debugger.log('userID is not defined, using defualt:'+_root.userID ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(firstName)){
+	_root.firstName = "firstName";
+	Debugger.log('firstName is not defined, using defualt:'+_root.firstName ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(lastName)){
+	_root.lastName = "lastName";
+	Debugger.log('lastName is not defined, using defualt:'+_root.lastName ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(mode)){
+	_root.mode = 1;
+	Debugger.log('Mode is not defined, using defualt:'+_root.mode,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(lessonID)){
+	_root.lessonID = 1;
+	Debugger.log('Lesson ID is not defined, using defualt:'+_root.lessonID,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(uniqueID)){
+	_root.uniqueID = 0;
+	Debugger.log('Unique ID is not defined.',Debugger.CRITICAL,'main','ROOT');
+}
+
+if(StringUtils.isEmpty(langDate)){
+	_root.langDate = "01-01-1970";
+}
+
+Debugger.log("PRESENCE: connection info from controlFrame - " + userID + " " + firstName + " " + lastName + " " + presenceServerUrl, Debugger.MED,'main','ROOT');
+
+//Set stage alignment to top left and prent scaling
+Stage.align = "TL";
+Stage.scaleMode = "noScale";
+
+
+//Start the application, passing in the top level clip, i.e. _root
+var app:Application = Application.getInstance();
+app.main(this);
+
+//Local connection to JSPs for progress data
+var receive_lc = new LocalConnection();
+//Functions to setProgress data, called by the LocalConnection object in learner JSPs
+receive_lc.setProgressData = function(attempted, completed, current, lessonID, version, refresh) {
+	Debugger.log(arguments.toString(), Debugger.CRITICAL, 'learnerProgress_lc.setProgressData', 'ROOT');
+	app.refreshProgress(attempted, completed, current, lessonID, version);
+	myRoot.refresh = refresh;
+};
+
+var success = receive_lc.connect("learnerProgress_lc_" + uniqueID);
+
+//Declaration of proxy object for javascript integration kit
+var proxy:JavaScriptProxy = new JavaScriptProxy(_root.lcId, this);
+_root.proxy = proxy;
+
+function sendMessageToFlash(msg:String){
+	Debugger.log("PRESENCE: from javascript - " + msg, Debugger.MED, 'sendMessageToFlash', 'ROOT');
+}
+
+function attemptRegistration(){
+	Debugger.log("PRESENCE: registration caught in main", Debugger.MED, 'sendMessageToFlash', 'ROOT');
+	app.getPresence().attemptRegistration();
+}
+
+function sendUsersToFlash(users:Array){
+	Debugger.log('PRESENCE: ' + users, Debugger.MED, 'sendUsersToFlash', 'ROOT');
+	app.getPresence().setupDataGrid(users);
+}
+
+//Make app listener for stage resize events
+Stage.addListener(app);