[virtualcommons-svn] SF.net SVN: virtualcommons:[349] mentalmodels/trunk

[<kj...@us...>]

Revision: 349
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=349&view=rev
Author:   kjonas
Date:     2009-10-29 23:15:38 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Trying to code the passing of the list of locations so that it can be passed later in the experiment if something goes wrong (with small delay only)

Modified Paths:
--------------
    mentalmodels/trunk/flex/src/custom/FisheryExperimentCore.mxml
    mentalmodels/trunk/flex/src/custom/InstructionPage.mxml
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java
    mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.swf
    mentalmodels/trunk/src/main/webapp/InitialiseDatabase.swf
    mentalmodels/trunk/src/main/webapp/StartGame.swf
    mentalmodels/trunk/src/main/webapp/test.swf

Modified: mentalmodels/trunk/flex/src/custom/FisheryExperimentCore.mxml
===================================================================
--- mentalmodels/trunk/flex/src/custom/FisheryExperimentCore.mxml	2009-10-29 22:38:51 UTC (rev 348)
+++ mentalmodels/trunk/flex/src/custom/FisheryExperimentCore.mxml	2009-10-29 23:15:38 UTC (rev 349)
@@ -17,7 +17,7 @@
 		<mx:State name="instructionsLoad">
 			<mx:AddChild relativeTo="{content}">
 				<comp:InstructionPage id="instructions" initialize="gotoInstructions()" x="0" y="0"
-					preinitialize="instructions.locations=locations"/>
+					preinitialize="instructions.setLocations(locations)"/>
 			</mx:AddChild>
 		</mx:State>
 		
@@ -422,7 +422,12 @@
 			{
 				if(event.result is ArrayCollection)
 				{
+					Alert.show(""+(event.result as ArrayCollection).length,"locations received");
 					locations = event.result as ArrayCollection;
+					if(instructions != null)
+					{
+						instructions.setLocations(locations);
+					}
 				}
 			}
 			private function strategyResultHandler(event:ResultEvent):void

Modified: mentalmodels/trunk/flex/src/custom/InstructionPage.mxml
===================================================================
--- mentalmodels/trunk/flex/src/custom/InstructionPage.mxml	2009-10-29 22:38:51 UTC (rev 348)
+++ mentalmodels/trunk/flex/src/custom/InstructionPage.mxml	2009-10-29 23:15:38 UTC (rev 349)
@@ -222,6 +222,15 @@
 				return block;
 			}
 			
+			public function setLocations(newLocations:ArrayCollection):void
+			{
+				locations = newLocations;
+				if(pageDisplay != null)
+				{
+					pageDisplay.locations = newLocations;
+				}
+			}
+			
 		]]>
 	</mx:Script>
 	

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java	2009-10-29 22:38:51 UTC (rev 348)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/GameService.java	2009-10-29 23:15:38 UTC (rev 349)
@@ -143,7 +143,7 @@
 		{
 			assignGroups(game);
 			getLogger().debug("system has assigned groups. ");
-			//pushBlock(game);
+			pushBlock(game);
 			flag = true;
 		}
 		else

Modified: mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.swf
===================================================================
(Binary files differ)

Modified: mentalmodels/trunk/src/main/webapp/InitialiseDatabase.swf
===================================================================
(Binary files differ)

Modified: mentalmodels/trunk/src/main/webapp/StartGame.swf
===================================================================
(Binary files differ)

Modified: mentalmodels/trunk/src/main/webapp/test.swf
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.