svn commit: r1383632 - in /incubator/flex/utilities/trunk: common/src/org/apache/flex/utilities/common/Constants.as common/src/org/apache/flex/utilities/common/MirrorURLUtil.as installer/src/InstallApacheFlex.mxml

[bi...@apache.org]

Author: bigosmallm
Date: Tue Sep 11 21:53:18 2012
New Revision: 1383632

URL: http://svn.apache.org/viewvc?rev=1383632&view=rev
Log:
1.  Fixed link for "Disclaimer" button to http://incubator.apache.org/flex/about-binaries.html
2.  Removed unnecessary log message; "action"
3.  Fixed incorrect app version in log
4.  Fixed appearance of "Disclaimer" button
5.  Code cleanup

Modified:
    incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
    incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/MirrorURLUtil.as
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml

Modified: incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as?rev=1383632&r1=1383631&r2=1383632&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as (original)
+++ incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/Constants.as Tue Sep 11 21:53:18 2012
@@ -35,7 +35,7 @@ public class Constants
 	public static const APPLICATION_EXTENSION_WIN:String = ".exe";
 	
 	public static const CONFIG_XML_NAME:String = "sdk-installer-config.xml";
-	public static const DISCLAIMER_PATH:String = "installer-disclaimer.html";
+	public static const DISCLAIMER_PATH:String = "about-binaries.html";
 	
 	
 	public static const SDK_BINARY_FILE_NAME_PREFIX:String = "apache-flex-sdk-";

Modified: incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/MirrorURLUtil.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/MirrorURLUtil.as?rev=1383632&r1=1383631&r2=1383632&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/MirrorURLUtil.as (original)
+++ incubator/flex/utilities/trunk/common/src/org/apache/flex/utilities/common/MirrorURLUtil.as Tue Sep 11 21:53:18 2012
@@ -211,7 +211,7 @@ public class MirrorURLUtil implements IL
 	
 		_log = new ArrayCollection();
 		
-		_log.addItem(ACTION);
+		//_log.addItem(ACTION);
 
 		_internetUtil.fetch(fetchURL, fetchMirrorFromCGIResult);
 	}

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1383632&r1=1383631&r2=1383632&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Tue Sep 11 21:53:18 2012
@@ -54,7 +54,6 @@ variables are not required because the l
 		import mx.core.IFlexDisplayObject;
 		import mx.events.FlexEvent;
 		import mx.managers.PopUpManager;
-		import mx.rpc.events.ResultEvent;
 		import mx.utils.StringUtil;
 		
 		import org.apache.flex.packageflexsdk.model.OptionalComponentVO;
@@ -402,8 +401,6 @@ variables are not required because the l
 		
 		protected function main():void
 		{
-		    // Log the Installer version to help with any support issues that arise.
-		    log("Version" + " " + INSTALLER_VERSION + "." + INSTALLER_BUILD_NUMBER + " (" + _os + ")",0);
 			
 			initiateInstallStepsActivity();
 			initializeOptionInstallsDataProvider();
@@ -419,6 +416,9 @@ variables are not required because the l
 			var xmlns:Namespace = new Namespace(applicationDescriptor.namespace());
 			var currentVersion:String = applicationDescriptor.xmlns::versionNumber.toString();
 			
+			// Log the Installer version to help with any support issues that arise.
+			log("Version " + currentVersion + " (" + _os + ")" ,0);
+			
 			var availBuildNumbers:Array = _latestVersion.split(".");
 			var currentBuildNumbers:Array = currentVersion.split(".");
 			for (var i:int=0; i < currentBuildNumbers.length; i++)
@@ -1858,6 +1858,7 @@ variables are not required because the l
 		horizontalAlign="right">
 		<s:Button 
 			label="{_viewResourceConstants.BTN_DISCLAIMER}"
+			styleName="genericBtnStyle"
 			click="{showDisclaimer()}"
 			/>
 		<s:Spacer width="100%" />