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

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

Revision: 344
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=344&view=rev
Author:   kjonas
Date:     2009-10-28 21:13:44 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Corrected BlockInformationWindow.as and InformationWindow.as to have the right data members.
InformationWindowCreator.as calls .invalidateDisplayList() when it updates.

appropriate changes in FisheryExperimentShell.mxml to reflect the above.

new swf files.

Modified Paths:
--------------
    mentalmodels/trunk/flex/src/FisheryExperimentShell.mxml
    mentalmodels/trunk/flex/src/actionscript/BlockInformationWindow.as
    mentalmodels/trunk/flex/src/actionscript/InformationWindow.as
    mentalmodels/trunk/flex/src/actionscript/InformationWindowCreator.as
    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/FisheryExperimentShell.mxml
===================================================================
--- mentalmodels/trunk/flex/src/FisheryExperimentShell.mxml	2009-10-28 21:10:12 UTC (rev 343)
+++ mentalmodels/trunk/flex/src/FisheryExperimentShell.mxml	2009-10-28 21:13:44 UTC (rev 344)
@@ -290,7 +290,7 @@
 						}
 						else
 						{
-							var windowID:int = (temp as BlockInformationWindow).infoWindowID;
+							var windowID:int = (temp as BlockInformationWindow).infoWindow.indexID;
 							tempArray.addItem(windowID);
 							str += "(id:" + windowID + ")";
 						}

Modified: mentalmodels/trunk/flex/src/actionscript/BlockInformationWindow.as
===================================================================
--- mentalmodels/trunk/flex/src/actionscript/BlockInformationWindow.as	2009-10-28 21:10:12 UTC (rev 343)
+++ mentalmodels/trunk/flex/src/actionscript/BlockInformationWindow.as	2009-10-28 21:13:44 UTC (rev 344)
@@ -5,11 +5,8 @@
 	[RemoteClass(alias="edu.asu.commons.mme.entity.BlockInformationWindow")]
 	public class BlockInformationWindow
 	{
-		
 		public var id:Number;
 		public var sequenceNo:int;
-		public var infoWindowID:int;
 		public var infoWindow:InformationWindow;
-		
 	}
 }
\ No newline at end of file

Modified: mentalmodels/trunk/flex/src/actionscript/InformationWindow.as
===================================================================
--- mentalmodels/trunk/flex/src/actionscript/InformationWindow.as	2009-10-28 21:10:12 UTC (rev 343)
+++ mentalmodels/trunk/flex/src/actionscript/InformationWindow.as	2009-10-28 21:13:44 UTC (rev 344)
@@ -5,13 +5,7 @@
 	public class InformationWindow
 	{
 		public var id:int;
-	
-		public var sequenceNo:int;
-	
+		public var indexID:int;
 		public var title:String;
-	
-		public var block:Block;
-
-
 	}
 }
\ No newline at end of file

Modified: mentalmodels/trunk/flex/src/actionscript/InformationWindowCreator.as
===================================================================
--- mentalmodels/trunk/flex/src/actionscript/InformationWindowCreator.as	2009-10-28 21:10:12 UTC (rev 343)
+++ mentalmodels/trunk/flex/src/actionscript/InformationWindowCreator.as	2009-10-28 21:13:44 UTC (rev 344)
@@ -38,40 +38,50 @@
 		
 		public function updateGoals(saved:ArrayCollection):void
 		{
-			(goals.getItemAt(0) as CategoricalQuestionC).load(saved.getItemAt(0) as ArrayCollection);
-			(goals.getItemAt(1) as CategoricalQuestionC).load(saved.getItemAt(1) as ArrayCollection);
-			(goals.getItemAt(2) as CategoricalQuestionC).load(saved.getItemAt(2) as ArrayCollection);
+			for(var i:int=0; i<3; i++)
+			{
+				(goals.getItemAt(i) as CategoricalQuestionC).load(saved.getItemAt(i) as ArrayCollection);
+				(goals.getItemAt(i) as CategoricalQuestionC).invalidateDisplayList();
+			}
 		}
 		
 		public function updateLearned(saved:ArrayCollection):void
 		{
-			(learned.getItemAt(0) as TextQuestionC).load(saved.getItemAt(0) as ArrayCollection);
-			(learned.getItemAt(1) as TextQuestionC).load(saved.getItemAt(1) as ArrayCollection);
-			(learned.getItemAt(2) as TextQuestionC).load(saved.getItemAt(2) as ArrayCollection);
+			for(var i:int=0; i<3; i++)
+			{
+				(learned.getItemAt(i) as TextQuestionC).load(saved.getItemAt(i) as ArrayCollection);
+				(learned.getItemAt(i) as TextQuestionC).invalidateDisplayList();
+			}
 		}
 		
 		public function updateLearnedWithCommunication(saved:ArrayCollection):void
 		{
-			(learnedComm.getItemAt(0) as TextQuestionC).load(saved.getItemAt(0) as ArrayCollection);
-			(learnedComm.getItemAt(1) as TextQuestionC).load(saved.getItemAt(1) as ArrayCollection);
-			(learnedComm.getItemAt(2) as TextQuestionC).load(saved.getItemAt(2) as ArrayCollection);
-			(learnedComm.getItemAt(3) as TextQuestionC).load(saved.getItemAt(3) as ArrayCollection);
+			for(var i:int=0; i<4; i++)
+			{
+				(learnedComm.getItemAt(i) as TextQuestionC).load(saved.getItemAt(i) as ArrayCollection);
+				(learnedComm.getItemAt(i) as TextQuestionC).invalidateDisplayList();
+			}
 		}
 		
 		public function updateStrategyDesign(saved:ArrayCollection):void
 		{
 			strategy.load(saved);
 			strategyResults.loadFromStrategy(saved);
+			
+			strategy.invalidateDisplayList();
+			strategyResults.invalidateDisplayList();
 		}
 		
 		public function updateForecasting(savedFish:ArrayCollection, savedPeople:ArrayCollection):void
 		{
 			forecasting.load(savedFish, savedPeople);
+			forecasting.invalidateDisplayList();
 		}
 		
 		public function updateDayByDayDecisions(saved:ArrayCollection):void
 		{
 			dayByDayResults.load(saved);
+			dayByDayResults.invalidateDisplayList();
 		}
 		
 		////

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.