incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1427300 - in /incubator/flex/utilities/trunk/installer: ./ src/ src/org/apache/flex/packageflexsdk/view/components/ src/org/apache/flex/packageflexsdk/view/events/ src/org/apache/flex/packageflexsdk/view/itemrenderers/
Date Tue, 01 Jan 2013 05:11:52 GMT
Author: bigosmallm
Date: Tue Jan  1 05:11:52 2013
New Revision: 1427300

URL: http://svn.apache.org/viewvc?rev=1427300&view=rev
Log:
Remove partial flex logo showing up in ConsoleWindow.mxml
Fix the UI for component selection screen (use standard check boxes)
Fix build.xml to exclude .p12 and .password files

Added:
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as
  (with props)
Modified:
    incubator/flex/utilities/trunk/installer/build.xml
    incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
    incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/itemrenderers/OptionalInstallItemRenderer.mxml

Modified: incubator/flex/utilities/trunk/installer/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.xml?rev=1427300&r1=1427299&r2=1427300&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.xml (original)
+++ incubator/flex/utilities/trunk/installer/build.xml Tue Jan  1 05:11:52 2013
@@ -322,8 +322,8 @@
         <mkdir dir="${BUILD_DIR}/temp"/>
         <copy todir="${BUILD_DIR}/temp/${COMMON_PROJECT_NAME}" includeEmptyDirs="false">
 			<fileset dir="${COMMON_PROJECT_DIR}">
-                <exclude name="certificate.p12"/>
-				<exclude name="temp.p12"/>
+				<exclude name="*.p12"/>
+				<exclude name="*.password"/>
                 <exclude name="rat.report"/>
                 <exclude name="libs/**"/>
 				<exclude name="bin/**"/>
@@ -339,8 +339,8 @@
 		
 		<copy todir="${BUILD_DIR}/temp/${INSTALLER_PROJECT_NAME}" includeEmptyDirs="false">
 			<fileset dir="${basedir}">
-                <exclude name="certificate.p12"/>
-				<exclude name="temp.p12"/>
+				<exclude name="*.p12"/>
+				<exclude name="*.password"/>				
                 <exclude name="rat.report"/>
                 <exclude name="libs/**"/>
 				<exclude name="bin/**"/>

Modified: incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml?rev=1427300&r1=1427299&r2=1427300&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml (original)
+++ incubator/flex/utilities/trunk/installer/src/InstallApacheFlex.mxml Tue Jan  1 05:11:52
2013
@@ -67,6 +67,7 @@ variables are not required because the l
 		import org.apache.flex.packageflexsdk.view.components.AdobeLicense;
 		import org.apache.flex.packageflexsdk.view.components.ConsoleWindow;
 		import org.apache.flex.packageflexsdk.view.components.MPLLicense;
+		import org.apache.flex.packageflexsdk.view.events.InstallItemSelectionEvent;
 		import org.apache.flex.utilities.common.Constants;
 		import org.apache.flex.utilities.common.MirrorURLUtil;
 		import org.apache.flex.utilities.common.interfaces.ILog;
@@ -1465,6 +1466,7 @@ variables are not required because the l
 			licenseLinkBtn.includeInLayout = true;
 			_currentLicenseLabel = selectedItem.licenseName;
 			_currentLicenseURL = selectedItem.licenseURL;
+			checkIfAllRequiredComponentsPromptsAnswered();
 			
 		}
 		
@@ -1473,18 +1475,18 @@ variables are not required because the l
 			navigateToURL(new URLRequest(_currentLicenseURL),"_blank");
 		}
 		
-		protected function handleInstallPermissionChange(event:Event):void
+		protected function handleInstallPermissionChange(event:InstallItemSelectionEvent):void
 		{
 			if(installComponentsList.selectedItem != null)
 			{
-				installComponentsList.selectedItem.selected = (event.target.selected);
+				installComponentsList.selectedItem.selected = (event.item.selected);
 				installComponentsList.selectedItem.answered = true;
 			}
 			else
 			{
 				for (var i:int=0; i<_installerComponentsDataProvider.length; i++)
 				{
-					_installerComponentsDataProvider.getItemAt(i).selected = event.target.selected;
+					_installerComponentsDataProvider.getItemAt(i).selected = event.item.selected;
 					_installerComponentsDataProvider.getItemAt(i).answered = true;
 				}
 			}
@@ -1817,6 +1819,11 @@ variables are not required because the l
 			navigateToURL(request, "_blank");
 		}
 		
+		protected function installComponentsList_creationCompleteHandler(event:FlexEvent):void
+		{
+			installComponentsList.addEventListener(InstallItemSelectionEvent.INSTALL_ITEM_SELECTION_CHANGED,handleInstallPermissionChange);

+		}
+		
 	]]></fx:Script>
 	
 	<fx:Declarations>
@@ -1960,7 +1967,7 @@ variables are not required because the l
 					height="100%"
 					itemRenderer="org.apache.flex.packageflexsdk.view.itemrenderers.OptionalInstallItemRenderer"
 					dataProvider="{_installerComponentsDataProvider}" 
-					change="handleOptionalInstallsChange(event)">
+					change="handleOptionalInstallsChange(event)" creationComplete="installComponentsList_creationCompleteHandler(event)"
>
 				<s:layout>
 					<s:VerticalLayout />
 				</s:layout>
@@ -1992,7 +1999,7 @@ variables are not required because the l
 			<s:CheckBox id="installChkBx"
 						label="{_viewResourceConstants.INSTALL_AGREE_ALL}" 
 						selected="false" 
-						change="handleInstallPermissionChange(event)"/>
+						visible="false"/>
 		</s:HGroup>
 	</s:Panel>
 	<s:Panel id="thirdStepGroup" 

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml?rev=1427300&r1=1427299&r2=1427300&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
Tue Jan  1 05:11:52 2013
@@ -21,7 +21,7 @@ limitations under the License.
 		  xmlns:s="library://ns.adobe.com/flex/spark" 
 		  xmlns:mx="library://ns.adobe.com/flex/mx"
 		  title="Install Log" width="600" height="300" showStatusBar="false"
-		  skinClass="ws.tink.spark.skins.controls.InstallApacheFlexSkin">
+		  >
 	
 	<fx:Script>
 		<![CDATA[

Added: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as?rev=1427300&view=auto
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as
(added)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as
Tue Jan  1 05:11:52 2013
@@ -0,0 +1,36 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package org.apache.flex.packageflexsdk.view.events
+{
+	import flash.events.Event;
+	
+	import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
+	
+	public class InstallItemSelectionEvent extends Event
+	{
+		public static var INSTALL_ITEM_SELECTION_CHANGED:String = "installItemSelectionChanged";
+		public var item:InstallerComponentVO;
+		
+		public function InstallItemSelectionEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+	}
+}
\ No newline at end of file

Propchange: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/events/InstallItemSelectionEvent.as
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/itemrenderers/OptionalInstallItemRenderer.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/itemrenderers/OptionalInstallItemRenderer.mxml?rev=1427300&r1=1427299&r2=1427300&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/itemrenderers/OptionalInstallItemRenderer.mxml
(original)
+++ incubator/flex/utilities/trunk/installer/src/org/apache/flex/packageflexsdk/view/itemrenderers/OptionalInstallItemRenderer.mxml
Tue Jan  1 05:11:52 2013
@@ -24,7 +24,25 @@ limitations under the License.
 	<s:layout>
 		<s:HorizontalLayout verticalAlign="middle" gap="5" />
 	</s:layout>
-	<s:CheckBox selected="{data.selected}" enabled="false" skinClass="ws.tink.spark.skins.controls.ColorCheckBoxSkin"
/>
+	<fx:Metadata>
+		[Event(name="installItemSelectionChanged", type="org.apache.flex.packageflexsdk.view.events.InstallItemSelectionEvent")]
+	</fx:Metadata>
+	
+	<fx:Script>
+		<![CDATA[
+			import org.apache.flex.packageflexsdk.model.InstallerComponentVO;
+			import org.apache.flex.packageflexsdk.view.events.InstallItemSelectionEvent;
+			protected function checkbox1_changeHandler(event:Event):void
+			{
+				var e:InstallItemSelectionEvent = new InstallItemSelectionEvent(InstallItemSelectionEvent.INSTALL_ITEM_SELECTION_CHANGED,true);
+				data.selected = event.target.selected; 
+				e.item = InstallerComponentVO(data);
+				dispatchEvent(e);
+			}
+		]]>
+	</fx:Script>
+	
+	<s:CheckBox id="checkbox1" selected="{data.selected}" enabled="true" change="checkbox1_changeHandler(event)"
skinClass="ws.tink.spark.skins.controls.ColorCheckBoxSkin" />
 	<s:Label text="{data.label}" fontSize="12"/>
 	
 </s:ItemRenderer>



Mime
View raw message