flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1394884 - in /incubator/flex/utilities/trunk/installer/src: InstallApacheFlex.mxml org/apache/flex/packageflexsdk/resource/RuntimeLocale.as ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
Date Sat, 06 Oct 2012 01:16:35 GMT
Author: bigosmallm
Date: Sat Oct  6 01:16:34 2012
New Revision: 1394884

URL: http://svn.apache.org/viewvc?rev=1394884&view=rev
Log:
Added explicit license agreement to all components that are being installed.  

Modified:
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
    incubator/flex/utilities/trunk/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1394884&r1=1394883&r2=1394884&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Sat Oct  6 01:16:34
2012
@@ -35,7 +35,7 @@ variables are not required because the l
 <s:WindowedApplication xmlns:fx="http://ns.adobe.com/mxml/2009" 
 					   xmlns:s="library://ns.adobe.com/flex/spark" 
 					   xmlns:mx="library://ns.adobe.com/flex/mx"
-					   width="800" height="550" maxWidth="800" maxHeight="550" minWidth="800" minHeight="550"
+					   width="800" height="650" maxWidth="800" maxHeight="650" minWidth="800" minHeight="650"
 					   backgroundColor="0xDDDDDD"
 					   applicationComplete="handleApplicationComplete(event)" showStatusBar="false"
 					   skinClass="ws.tink.spark.skins.controls.InstallApacheFlexSkin" 
@@ -58,7 +58,7 @@ variables are not required because the l
 		import mx.managers.PopUpManager;
 		import mx.utils.StringUtil;
 		
-		import org.apache.flex.packageflexsdk.model.OptionalComponentVO;
+		import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
 		import org.apache.flex.packageflexsdk.resource.ViewResourceConstants;
 		import org.apache.flex.packageflexsdk.util.MD5CompareUtil;
 		import org.apache.flex.packageflexsdk.view.UpdaterDialog;
@@ -187,7 +187,8 @@ variables are not required because the l
 		
 		[Bindable] private var _viewResourceConstants:ViewResourceConstants;
 		[Bindable] private var _installationSteps:ArrayCollection = new ArrayCollection();
-		[Bindable] private var _optionalInstallsDataProvider:ArrayCollection = new ArrayCollection();
+//		[Bindable] private var _optionalInstallsDataProvider:ArrayCollection = new ArrayCollection();
+		[Bindable] private var _licensesDataProvider:ArrayCollection = new ArrayCollection();
 		[Bindable] public var _messages:ArrayCollection = new ArrayCollection();
 		
 		protected function handleApplicationComplete(event:FlexEvent):void
@@ -491,14 +492,16 @@ variables are not required because the l
 			_installationSteps = new ArrayCollection();
 			
 			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_CREATE_DIRECTORIES));
-			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK));
 			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_VERIFY_FLEX_SDK));
 			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_UNZIP_FLEX_SDK));
-			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK));
 			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_UNZIP_AIR_RUNTIME_KIT));
-			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC));
 			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_INSTALL_CONFIG_FILES));
-			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF));
+			_installationSteps.addItem(new StepItem(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF));
 		}
 		
 		protected function resetInstallStepsActivity():void
@@ -511,9 +514,9 @@ variables are not required because the l
 		
 		protected function addOptionalComponentsToInstallSteps():void
 		{
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
-				if(obj.selected)
+				if(!obj.required && obj.selected)
 				{
 					_installationSteps.addItem(new StepItem(obj.label));
 				}
@@ -522,19 +525,30 @@ variables are not required because the l
 		
 		protected function initializeOptionInstallsDataProvider():void
 		{
-			_optionalInstallsDataProvider = new ArrayCollection();
-			
-			_optionalInstallsDataProvider.addItem(
-				new OptionalComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,
-					_viewResourceConstants.ASK_TLF, true));
-			_optionalInstallsDataProvider.addItem(
-				new OptionalComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,
+			_licensesDataProvider = new ArrayCollection();
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK,
+					_viewResourceConstants.ASK_APACHE_FLEX, true));
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
+					_viewResourceConstants.ASK_ADOBE_FLASH_PLAYER_GLOBAL_SWC, true));
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK,
+					_viewResourceConstants.ASK_ADOBE_AIR_SDK, true));
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT,
+					_viewResourceConstants.ASK_SWFOBJECT, true));
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,
 					_viewResourceConstants.ASK_OSMF, true));
-			_optionalInstallsDataProvider.addItem(
-				new OptionalComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_FONTSWF,
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,
+					_viewResourceConstants.ASK_TLF, true));
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_FONTSWF,
 					_viewResourceConstants.ASK_FONTSWF, false));
-			_optionalInstallsDataProvider.addItem(
-				new OptionalComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_BLAZEDS,
+			_licensesDataProvider.addItem(
+				new InstallerComponentVO(_viewResourceConstants.STEP_OPTIONAL_INSTALL_BLAZEDS,
 					_viewResourceConstants.ASK_BLAZEDS, false));
 		}
 		
@@ -543,17 +557,6 @@ variables are not required because the l
 			createDirectories();
 		}
 		
-		
-		protected function setCommandLineState():void
-		{
-			currentState = "commandLineState";
-		}
-		
-		protected function setGUIState():void
-		{
-			currentState = "guiState";
-		}
-		
 		// TODO Scan for Apache SDKs installed and check if allready modified?
 		protected function browseForSDK(event:MouseEvent):void
 		{
@@ -672,7 +675,7 @@ variables are not required because the l
 		
 		protected function downloadApacheFlexSDK():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK, StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK, StepItem.ACTIVE);
 			
 			try
 			{
@@ -682,7 +685,7 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK, StepItem.ERROR);
 				log(_viewResourceConstants.ERROR_UNABLE_TO_CREATE_TEMP_DIRECTORY + "(error: " + e.message);
 				abortInstallation();
 			}
@@ -697,11 +700,11 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK, StepItem.ERROR);
 				abortInstallation();
 			}
 			
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK, StepItem.COMPLETE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK, StepItem.COMPLETE);
 			
 			updateActivityStep(_viewResourceConstants.STEP_VERIFY_FLEX_SDK, StepItem.ACTIVE);
 
@@ -720,7 +723,7 @@ variables are not required because the l
 		}
 		
 		protected function handleApacheFlexSDKDownloadError(event:*=null):void{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLEX_SDK, StepItem.ERROR);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
 			log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_FLEX_SDK);
 			abortInstallation();
 		}
@@ -792,7 +795,7 @@ variables are not required because the l
 		
 		protected function downloadAIRRuntimeKitForWindows():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ACTIVE);
 			
 			try
 			{
@@ -802,14 +805,14 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
 				abortInstallation();
 			}
 		}
 		
 		protected function downloadAIRRuntimeKitForMac():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ACTIVE);
 			
 			try
 			{
@@ -819,7 +822,7 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
 				abortInstallation();
 			}
 		}
@@ -832,18 +835,18 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
 				abortInstallation();
 			}
 			
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.COMPLETE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.COMPLETE);
 			
 			unzipAdobeAIRSDK();
 		}
 		
 		protected function handleAIRSDKDownloadError(error:*=null):void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_AIR_RUNTIME_KIT, StepItem.ERROR);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK, StepItem.ERROR);
 			log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_AIR_SDK);
 			abortInstallation();
 		}
@@ -914,7 +917,7 @@ variables are not required because the l
 		
 		protected function downloadPlayerGlobalSWC():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC, StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
StepItem.ACTIVE);
 			
 			try
 			{
@@ -925,7 +928,7 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
StepItem.ERROR);
 				abortInstallation();
 			}
 		}
@@ -939,16 +942,16 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
StepItem.ERROR);
 				abortInstallation();
 			}
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC, StepItem.COMPLETE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
StepItem.COMPLETE);
 			copyConfigFiles();
 		}
 		
 		protected function handlePlayerGlobalDownloadError(event:ErrorEvent=null):void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_DOWNLOAD_FLASHPLAYER_SWC, StepItem.ERROR);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC,
StepItem.ERROR);
 			log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_FLASH_PLAYER_SWC);
 			abortInstallation();
 		}
@@ -994,7 +997,7 @@ variables are not required because the l
 		
 		protected function downloadSwfObject():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.ACTIVE);
 			
 			try
 			{
@@ -1003,7 +1006,7 @@ variables are not required because the l
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.ERROR);
 				abortInstallation();
 			}
 		}
@@ -1018,7 +1021,7 @@ variables are not required because the l
 		
 		protected function handleSWFObjectDownloadError(event:ErrorEvent=null):void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.ERROR);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.ERROR);
 			log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_SWF_OBJECT);
 			abortInstallation();
 		}
@@ -1037,13 +1040,14 @@ variables are not required because the l
 				var swfObjectDir:File = _flexHomeDir.resolvePath("swfobject");
 				swfObjectDir.deleteDirectory(true);
 				
-				updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.COMPLETE);
-				installNextOptionalComponent();
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.COMPLETE);
+//				installNextOptionalComponent();
+				installOSMF();
 
 			}
 			catch(e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.ERROR);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.ERROR);
 				log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_SWF_OBJECT);
 				abortInstallation();
 			}
@@ -1052,14 +1056,14 @@ variables are not required because the l
 		
 		protected function handleSWFObjectZipFileUnzipError(event:Event):void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_INSTALL_SWF_OBJECT, StepItem.ERROR);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_SWFOBJECT, StepItem.ERROR);
 			log(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_SWF_OBJECT);
 			abortInstallation();
 		}
 		
 		protected function installNextOptionalComponent():void
 		{
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
 				if(obj.selected && !obj.installed && !obj.aborted)
 				{
@@ -1077,18 +1081,6 @@ variables are not required because the l
 							return;
 							break;
 						}
-						case _viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF:
-						{
-							installOSMF();
-							return;
-							break;
-						}
-						case _viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF:
-						{
-							installTLF();
-							return;
-							break;
-						} 
 						default:
 						{
 							break;
@@ -1239,7 +1231,7 @@ variables are not required because the l
 		
 		protected function installOSMF():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,StepItem.ACTIVE);
 			downloadOSMFFile();
 		}
 		
@@ -1258,22 +1250,22 @@ variables are not required because the l
 				copyFileToLibDir(_osmfFile);
 				clearData(URLLoader(event.target));
 				
-				updateOptionalComponentInstallStatus(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,true);
-				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,false);
-				updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF, StepItem.COMPLETE);
-				installNextOptionalComponent();
+				updateOptionalComponentInstallStatus(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,true);
+				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,false);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.COMPLETE);
+				installTLF();
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF, StepItem.ERROR);
-				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,true);
-				installNextOptionalComponent();
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.ERROR);
+				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,true);
+				abortInstallation();
 			}
 		}
 		
 		protected function installTLF():void
 		{
-			updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,StepItem.ACTIVE);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,StepItem.ACTIVE);
 			downloadTLFFile();
 		}
 		
@@ -1292,15 +1284,15 @@ variables are not required because the l
 				copyFileToLibDir(_tlfFile);
 				clearData(URLLoader(event.target));
 				
-				updateOptionalComponentInstallStatus(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,true);
-				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,false);
-				updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF, StepItem.COMPLETE);
+				updateOptionalComponentInstallStatus(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,true);
+				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,false);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF, StepItem.COMPLETE);
 				installNextOptionalComponent();
 			}
 			catch (e:Error)
 			{
-				updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF, StepItem.ERROR);
-				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,true);
+				updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF, StepItem.ERROR);
+				updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,true);
 				installNextOptionalComponent();
 			}
 		}
@@ -1334,22 +1326,22 @@ variables are not required because the l
 		}
 		
 		protected function handleOSMFInstallError(event:*=null):void{
-			updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF, StepItem.ERROR);
-			updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_OSMF,true);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF, StepItem.ERROR);
+			updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_OSMF,true);
 			log(StringUtil.substitute(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_FILE,["OSMF"]));
 			installNextOptionalComponent();
 		}
 		
 		protected function handleTLFInstallError(event:*=null):void{
-			updateActivityStep(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF, StepItem.ERROR);
-			updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_OPTIONAL_INSTALL_TLF,true);
+			updateActivityStep(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF, StepItem.ERROR);
+			updateOptionalComponentInstallStatusAborted(_viewResourceConstants.STEP_REQUIRED_INSTALL_TLF,true);
 			log(StringUtil.substitute(_viewResourceConstants.ERROR_UNABLE_TO_DOWNLOAD_FILE,["TLF"]));
 			installNextOptionalComponent();
 		}
 		
 		protected function updateOptionalComponentInstallStatus(label:String,isInstalled:Boolean):void
 		{
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
 				if(obj.label == label)
 				{
@@ -1360,7 +1352,7 @@ variables are not required because the l
 		
 		protected function updateOptionalComponentInstallStatusAborted(label:String,isAborted:Boolean):void
 		{
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
 				if(obj.label == label)
 				{
@@ -1372,9 +1364,9 @@ variables are not required because the l
 		protected function checkAndHandleAllOptionalComponentsInstalled():void
 		{
 			var allComponentsInstalled:Boolean = true;
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
-				if(obj.selected && !(obj.installed || obj.aborted))
+				if(!obj.required && obj.selected && !(obj.installed || obj.aborted))
 				{
 					allComponentsInstalled = false;
 				}
@@ -1462,7 +1454,7 @@ variables are not required because the l
 		
 		protected function handleOptionalInstallsChange(event:IndexChangeEvent):void
 		{
-			var selectedItem:OptionalComponentVO = OptionalComponentVO(event.target.selectedItem);
+			var selectedItem:InstallerComponentVO = InstallerComponentVO(event.target.selectedItem);
 			optionalInstallsTxtArea.text = selectedItem.message;
 			installChkBx.label = _viewResourceConstants.INSTALL_AGREE;
 			if(selectedItem.answered)
@@ -1501,10 +1493,10 @@ variables are not required because the l
 			}
 			else
 			{
-				for (var i:int=0; i<_optionalInstallsDataProvider.length; i++)
+				for (var i:int=0; i<_licensesDataProvider.length; i++)
 				{
-					_optionalInstallsDataProvider.getItemAt(i).selected = event.target.selected;
-					_optionalInstallsDataProvider.getItemAt(i).answered = true;
+					_licensesDataProvider.getItemAt(i).selected = event.target.selected;
+					_licensesDataProvider.getItemAt(i).answered = true;
 				}
 			}
 			checkIfAllRequiredComponentsPromptsAnswered();
@@ -1513,7 +1505,7 @@ variables are not required because the l
 		protected function checkIfAllRequiredComponentsPromptsAnswered():void
 		{
 			var success:Boolean = true;
-			for each (var obj:OptionalComponentVO in _optionalInstallsDataProvider)
+			for each (var obj:InstallerComponentVO in _licensesDataProvider)
 			{
 				if(obj.required && !obj.selected)
 				{
@@ -1902,7 +1894,7 @@ variables are not required because the l
 			 title="{_viewResourceConstants.INFO_SELECT_DIRECTORY_INSTALL}" 
 			 width="640" 
 			 height="200" 
-			 top="280" 
+			 top="380" 
 			 x="{firstStepGroup.x = this.width/2 - firstStepGroup.width/2}"
 			 visible="true" 
 			 visible.optionsState="false" 
@@ -1941,7 +1933,7 @@ variables are not required because the l
 	<s:Panel id="secondStepGroup" 
 			 title="{_viewResourceConstants.INFO_LICENSE_AGREEMENTS}"
 			 width="720" 
-			 height="200" 
+			 height="300" 
 			 top="280" 
 			 visible="false" 
 			 visible.optionsState="true" 
@@ -1972,7 +1964,7 @@ variables are not required because the l
 					width="50%" 
 					height="100%"
 					itemRenderer="org.apache.flex.packageflexsdk.view.itemrenderers.OptionalInstallItemRenderer"
-					dataProvider="{_optionalInstallsDataProvider}" 
+					dataProvider="{_licensesDataProvider}" 
 					change="handleOptionalInstallsChange(event)">
 				<s:layout>
 					<s:VerticalLayout />
@@ -2006,12 +1998,11 @@ variables are not required because the l
 					  includeInLayout="true" />
 		</s:HGroup>
 	</s:Panel>
-	
 	<s:Panel id="thirdStepGroup" 
 			 title="{_viewResourceConstants.INFO_INSTALLING}"  
 			 width="640" 
 			 height="200" 
-			 top="280" 
+			 top="380" 
 			 visible="false" 
 			 visible.installState="true" 
 			 backgroundAlpha="0">

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as?rev=1394884&r1=1394883&r2=1394884&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
Sat Oct  6 01:16:34 2012
@@ -296,8 +296,13 @@ public class RuntimeLocale
 		var content:Object = resource.content;
 		content["ASK_BLAZEDS"]="Apache Flex can optionally integrate with Adobe BlazeDS. This feature
requires flex-messaging-common.jar from the Adobe Flex SDK. The Adobe SDK license agreement
for Adobe Flex 4.6 applies to this jar. This license is not compatible with the Apache v2
license. Do you want to install this jar from the Adobe Flex SDK?"
 		content["ASK_FONTSWF"]="Apache Flex can optionally integrate with Adobe's embedded font
support. This feature requires a few font jars from the Adobe Flex SDK. The Adobe SDK license
agreement for Adobe Flex 4.6 applies to these jars. This license is not compatible with the
Apache v2 license. Do you want to install these jars from the Adobe Flex SDK?";
-		content["ASK_OSMF"]="The Open Source Media Framework (OSMF) used by the video components
is licensed under the Mozilla Public License Version 1.1.";
-		content["ASK_TLF"]="The Adobe Text Layout Framework (TLF) used by the Spark text components
is licensed under the Mozilla Public License Version 1.1.";
+		content["ASK_OSMF"]="The Open Source Media Framework (OSMF) used by the video components
is licensed under the Mozilla Public License Version 1.1.  Do you want to install The Open
Source Media Framework (OSMF)?";
+		content["ASK_TLF"]="The Adobe Text Layout Framework (TLF) used by the Spark text components
is licensed under the Mozilla Public License Version 1.1.  Do you want to install The Adobe
Text Layout Framework (TLF)?";
+		content["ASK_APACHE_FLEX"]="The Apache License v2 applies to the Apache Flex SDK.  Do you
want to install the Apache Flex SDK?";
+		content["ASK_ADOBE_AIR_SDK"]="The Adobe SDK license agreement applies to the Adobe AIR
SDK.  Do you want to install the Adobe AIR SDK?";
+		content["ASK_ADOBE_FLASH_PLAYER_GLOBAL_SWC"]="The Adobe SDK license agreement applies to
the Adobe Flash Player playerglobal.swc.  Do you want to install the Adobe Flash Player playerglobal.swc?";
+		content["ASK_SWFOBJECT"]="The The MIT License (MIT) applies to the SWFObject utility. 
Do you want to install the SWFObject utility?";
+		
 		content["BTN_LABEL_ADOBE_LICENSE"]="SHOW ADOBE LICENSE";
 		content["BTN_LABEL_BROWSE"]="BROWSE";
 		content["BTN_LABEL_CLOSE"]="CLOSE";
@@ -358,7 +363,7 @@ public class RuntimeLocale
 		content["INFO_INSTALLING_PLAYERGLOBAL_SWC"]="Installing Adobe Flash Player playerglobal.swc
from: ";
 		content["INFO_INVOKED_GUI_MODE"]="invoked in GUI mode";
 		content["INFO_LICENSE_AGREEMENTS"]="License Agreements";
-		content["INFO_NEED_TO_READ_AND_AGREE_TO_LICENSE"]="These components have license agreements
other than Apache License, Version 2.0. Please click on each item on the left, read the license
and confirm that you agree to the terms of each license.";
+		content["INFO_NEED_TO_READ_AND_AGREE_TO_LICENSE"]="These components have license agreements
other than Apache License v2. Please click on each item on the left, read the license and
confirm that you agree to the terms of each license.";
 		content["INFO_SELECT_DIRECTORY"]="Select the directory where you want to install the Flex
SDK";
 		content["INFO_SELECT_DIRECTORY_INSTALL"]="Select installation directory";
 		content["INFO_UNZIPPING"]="Uncompressing: ";
@@ -369,15 +374,20 @@ public class RuntimeLocale
 		content["INSTALL_DISAGREE"] = "I Disagree, Don't Install"
 		content["SELECT_PATH_PROMPT"]="Where do you want to install the Apache Flex SDK?";
 		content["STEP_CREATE_DIRECTORIES"]="Create Directories";
-		content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
-		content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
-		content["STEP_DOWNLOAD_FLEX_SDK"]="Download Apache Flex SDK";
+		content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Required)";
+		content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Required)";
+		content["STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC"]="Adobe Flash Player playerglobal.swc
(Required)";
+		content["STEP_REQUIRED_INSTALL_SWFOBJECT"]="SwfObject (Required)";
 		content["STEP_INSTALL_CONFIG_FILES"]="Install Framework Configuration Files";
-		content["STEP_INSTALL_SWF_OBJECT"]="Download SWFObject";
+		content["STEP_REQUIRED_INSTALL_OSMF"]="OSMF (Required)";
+		content["STEP_REQUIRED_INSTALL_TLF"]="Adobe Text Layout Framework (Required)";
 		content["STEP_OPTIONAL_INSTALL_BLAZEDS"]="BlazeDS (Optional)";
 		content["STEP_OPTIONAL_INSTALL_FONTSWF"]="Adobe Embedded Font Libraries and Utilities (Optional)";
-		content["STEP_OPTIONAL_INSTALL_OSMF"]="OSMF (Required)";
-		content["STEP_OPTIONAL_INSTALL_TLF"]="Adobe Text Layout Framework (Required)";
+
+		
+		
+		
+		content["STEP_REQUIRED_UNZIP_AIR_RUNTIME_KIT"]="Uncompress Adobe AIR Runtime Kit";
 		content["STEP_UNZIP_AIR_RUNTIME_KIT"]="Uncompress Adobe AIR Runtime Kit";
 		content["STEP_UNZIP_FLEX_SDK"]="Uncompress Apache Flex SDK";
 		content["STEP_VERIFY_FLEX_SDK"]="Verifying Apache Flex SDK MD5 Signature";

Modified: incubator/flex/utilities/trunk/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml?rev=1394884&r1=1394883&r2=1394884&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
(original)
+++ incubator/flex/utilities/trunk/installer/src/ws/tink/spark/skins/controls/InstallApacheFlexSkin.mxml
Sat Oct  6 01:16:34 2012
@@ -82,7 +82,7 @@ limitations under the License.
     </s:states>
 
     <!-- layer 1: background fill -->
-	<s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" width="100%" height="100%"
scaleMode="stretch" />
+	<s:BitmapImage source="@Embed('/assets/icons/bg_logo.png')" top="0" left="0"  scaleMode="letterbox"
/>
 
     <!-- layer 2: content + status bar -->
     <s:Group left="0" right="0" top="0" bottom="0" minHeight="24" minWidth="0" >



Mime
View raw message