incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1428212 - in /incubator/flex/utilities/trunk/installer: .actionScriptProperties src/InstallApacheFlex.mxml src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as
Date Thu, 03 Jan 2013 08:21:36 GMT
Author: bigosmallm
Date: Thu Jan  3 08:21:36 2013
New Revision: 1428212

URL: http://svn.apache.org/viewvc?rev=1428212&view=rev
Log:
Fixed issue with license screen where changing locales would cause already selected installer
items to get deselected.  

Modified:
    incubator/flex/utilities/trunk/installer/.actionScriptProperties
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as

Modified: incubator/flex/utilities/trunk/installer/.actionScriptProperties
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/.actionScriptProperties?rev=1428212&r1=1428211&r2=1428212&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/.actionScriptProperties (original)
+++ incubator/flex/utilities/trunk/installer/.actionScriptProperties Thu Jan  3 08:21:36 2013
@@ -18,7 +18,7 @@
 
 -->
 <actionScriptProperties analytics="false" mainApplicationPath="InstallApacheFlex.mxml"
projectUUID="151f0ac8-8811-45cd-b935-d7c2b0949fa3" version="10">
-  <compiler additionalCompilerArguments="-define=INSTALLER::buildNumber,3 -define=INSTALLER::releaseVersion,'0.8'"
autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Apache Flex 4.8.0" fteInMXComponents="false"
generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false"
htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true"
sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true"
verifyDigests="true" warn="true">
+  <compiler additionalCompilerArguments="-define=INSTALLER::buildNumber,3 -define=INSTALLER::releaseVersion,'0.8'"
autoRSLOrdering="true" copyDependentFiles="true" flexSDK="Apache Flex 4.9.0 FP11.1 en_US"
fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false"
htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug"
removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true"
useDebugRSLSwfs="true" verifyDigests="true" warn="true">
     <compilerSourcePath>
       <compilerSourcePathEntry kind="1" linkType="1" path="${APACHE_FLEX_UTILITIES_ROOT}/common/src"/>
     </compilerSourcePath>

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1428212&r1=1428211&r2=1428212&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Thu Jan  3 08:21:36
2013
@@ -580,6 +580,7 @@ variables are not required because the l
 					_viewResourceConstants.ASK_APACHE_FLEX,
 					_viewResourceConstants.LICENSE_APACHE_V2,
 					_viewResourceConstants.LICENSE_URL_APACHE_V2,
+					"STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK",
 					true
 				));
 			_installerComponentsDataProvider.addItem(
@@ -587,36 +588,42 @@ variables are not required because the l
 					_viewResourceConstants.ASK_ADOBE_AIR_SDK, 
 					_viewResourceConstants.LICENSE_ADOBE_AIR_SDK,
 					_viewResourceConstants.LICENSE_URL_ADOBE_AIR_SDK,
+					"STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK",
 					true));
 			_installerComponentsDataProvider.addItem(
 				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
 					_viewResourceConstants.ASK_ADOBE_FLASH_PLAYER_GLOBAL_SWC, 
 					_viewResourceConstants.LICENSE_ADOBE_SDK,
 					_viewResourceConstants.LICENSE_URL_ADOBE_SDK,
+					"STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC",
 					true));
 			_installerComponentsDataProvider.addItem(
 				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT,
 					_viewResourceConstants.ASK_SWFOBJECT, 
 					_viewResourceConstants.LICENSE_SWFOBJECT,
 					_viewResourceConstants.LICENSE_URL_SWFOBJECT,
+					"STEP_REQUIRED_INSTALL_SWFOBJECT",
 					true));
 			_installerComponentsDataProvider.addItem(
 				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,
 					_viewResourceConstants.ASK_OSMF, 
 					_viewResourceConstants.LICENSE_OSMF,
 					_viewResourceConstants.LICENSE_URL_OSMF,
+					"STEP_REQUIRED_INSTALL_OSMF",
 					true));
 			_installerComponentsDataProvider.addItem(
 				new InstallerComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_FONTSWF,
 					_viewResourceConstants.ASK_FONTSWF, 
 					_viewResourceConstants.LICENSE_FONTSWF,
 					_viewResourceConstants.LICENSE_URL_FONTSWF,
+					"STEP_OPTIONAL_INSTALL_FONTSWF",
 					false));
 			_installerComponentsDataProvider.addItem(
 				new InstallerComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_BLAZEDS,
 					_viewResourceConstants.ASK_BLAZEDS, 
 					_viewResourceConstants.LICENSE_BLAZEDS,
 					_viewResourceConstants.LICENSE_URL_BLAZEDS,
+					"STEP_OPTIONAL_INSTALL_BLAZEDS",
 					false));
 		}
 		
@@ -1421,9 +1428,32 @@ variables are not required because the l
 			
 			if (_viewResourceConstants)
 			{
+				rememberInstallerComponents();
 				updateWindowTitle();
 				initiateInstallStepsActivity();
 				initializeInstallerComponentsDataProvider();
+				recallInstallerComponents();
+			}
+		}
+		
+		private var _selectedInstallerComponents:Vector.<InstallerComponentVO>;
+		protected function rememberInstallerComponents():void
+		{
+			_selectedInstallerComponents = new Vector.<InstallerComponentVO>;
+			for each(var item:InstallerComponentVO in _installerComponentsDataProvider)
+			{
+				if(item.selected)
+				{
+					_selectedInstallerComponents.push(item);
+				}
+			}
+		}
+		
+		protected function recallInstallerComponents():void
+		{
+			for each(var item:InstallerComponentVO in _selectedInstallerComponents)
+			{
+				getInstallerComponentFromLabel(item.key).selected = true;
 			}
 		}
 
@@ -1784,6 +1814,17 @@ variables are not required because the l
 			return null;
 		}
 		
+		protected function getInstallerComponentFromLabel(key:String):InstallerComponentVO
+		{
+			for each (var s:InstallerComponentVO in _installerComponentsDataProvider)
+			{
+				if (s.key == key)
+					return s;
+			}
+			
+			return null;
+		}
+		
 		protected function updateActivityStep(stepLabel:String, status:String):void
 		{
 			var step:StepItem = getStepItemFromStepLabel(stepLabel);

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as?rev=1428212&r1=1428211&r2=1428212&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/model/InstallerComponentVO.as
Thu Jan  3 08:21:36 2013
@@ -31,11 +31,13 @@ package org.apache.flex.packageflexsdk.m
 		public var answered:Boolean = false;
 		public var licenseName:String;
 		public var licenseURL:String;
+		public var key:String;
 		
 		public function InstallerComponentVO(label:String,
 											 message:String,
 											 licenseName:String,
 											 licenseURL:String,
+											 key:String,
 											 required:Boolean,
 											 selected:Boolean=false,
 											 installed:Boolean=false,
@@ -45,6 +47,7 @@ package org.apache.flex.packageflexsdk.m
 		{
 			this.label = label;
 			this.message = message;
+			this.key = key;
 			this.required = required;
 			this.selected = selected;
 			this.installed = installed;



Mime
View raw message