flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1370028 [43/43] - in /incubator/flex/whiteboard/cframpton/adobe.next: ./ frameworks/ frameworks/projects/advancedgrids/src/mx/collections/ frameworks/projects/advancedgrids/src/mx/controls/ frameworks/projects/airframework/src/mx/managers/...
Date Mon, 06 Aug 2012 21:26:02 GMT
Modified: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/spark-manifest.xml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/spark-manifest.xml?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/spark-manifest.xml (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/spark-manifest.xml Mon Aug  6 21:25:54 2012
@@ -25,7 +25,9 @@
 -->
 <componentPackage>
 
-	<!-- Flex4 Framework -->
+    <!-- Flex4 Framework -->
+    <component id="Accordion" class="spark.components.Accordion"/>
+    <component id="AccordionContent" class="spark.components.AccordionContent"/>
     <component id="AddAction" class="spark.effects.AddAction"/>
     <component id="Animate" class="spark.effects.Animate"/>
     <component id="AnimateColor" class="spark.effects.AnimateColor"/>
@@ -37,7 +39,8 @@
     <component id="Application" class="spark.components.Application"/>
     <component id="ArrayCollection" class="mx.collections.ArrayCollection" lookupOnly="true"/>
     <component id="ArrayList" class="mx.collections.ArrayList" lookupOnly="true"/>
-    <component id="AsyncListView" class="mx.collections.AsyncListView" lookupOnly="true"/>
+    <component id="AsyncListView" class="mx.collections.AsyncListView" lookupOnly="true"/> 
+    <component id="SubListView" class="spark.collections.SubListView"/> 
     <component id="BasicLayout" class="spark.layouts.BasicLayout"/>
     <component id="BevelFilter" class="spark.filters.BevelFilter"/>
     <component id="BitmapImage" class="spark.primitives.BitmapImage"/>
@@ -50,7 +53,7 @@
     <component id="ButtonBarButton" class="spark.components.ButtonBarButton"/>
     <component id="ButtonBarHorizontalLayout" class="spark.components.supportClasses.ButtonBarHorizontalLayout"/>
     <component id="ButtonBase" class="spark.components.supportClasses.ButtonBase"/>
-    <component id="CallAction" class="spark.effects.CallAction"/>
+      <component id="CallAction" class="spark.effects.CallAction"/>
     <component id="CellPosition" class="spark.components.gridClasses.CellPosition"/>
     <component id="CellRegion" class="spark.components.gridClasses.CellRegion"/>
     <component id="CheckBox" class="spark.components.CheckBox"/>
@@ -65,13 +68,18 @@
     <component id="ConstraintRow" class="mx.containers.utilityClasses.ConstraintRow" lookupOnly="true"/>
     <component id="ContentCache" class="spark.core.ContentCache"/> 
     <component id="ConvolutionFilter" class="spark.filters.ConvolutionFilter"/>
+    <component id="CreditCardValidator" class="mx.validators.CreditCardValidator" lookupOnly="true"/>
     <component id="CrossFade" class="spark.effects.CrossFade"/>
-	<component id="CurrencyFormatter" class="spark.formatters.CurrencyFormatter"/>
-	<component id="CurrencyValidator" class="spark.validators.CurrencyValidator"/>
-	<component id="DataGrid" class="spark.components.DataGrid"/>    
+    <component id="CurrencyFormatter" class="spark.formatters.CurrencyFormatter"/>
+    <component id="CurrencyValidator" class="spark.validators.CurrencyValidator"/>
+    <component id="DataGrid" class="spark.components.DataGrid"/>    
     <component id="DataGroup" class="spark.components.DataGroup"/>
     <component id="DataRenderer" class="spark.components.DataRenderer"/>
-	<component id="DateTimeFormatter" class="spark.formatters.DateTimeFormatter"/>
+    <component id="DateChooser" class="spark.components.DateChooser"/>
+    <component id="DateRange" class="spark.components.calendarClasses.DateRange"/>
+    <component id="DateItemRenderer" class="spark.components.calendarClasses.DateItemRenderer"/>
+    <component id="DateSet" class="spark.components.calendarClasses.DateSet"/>
+    <component id="DateTimeFormatter" class="spark.formatters.DateTimeFormatter"/>
     <component id="DefaultGridHeaderRenderer" class="spark.skins.spark.DefaultGridHeaderRenderer"/>
     <component id="DefaultGridItemRenderer" class="spark.skins.spark.DefaultGridItemRenderer"/>
     <component id="DisplacementMapFilter" class="spark.filters.DisplacementMapFilter"/>
@@ -82,6 +90,7 @@
     <component id="DynamicStreamingVideoItem" class="spark.components.mediaClasses.DynamicStreamingVideoItem"/>
     <component id="Elastic" class="spark.effects.easing.Elastic"/>
     <component id="Ellipse" class="spark.primitives.Ellipse"/>
+    <component id="EmailValidator" class="mx.validators.EmailValidator" lookupOnly="true"/>
     <component id="Fade" class="spark.effects.Fade"/>
     <component id="Form" class="spark.components.Form"/>
     <component id="FormHeading" class="spark.components.FormHeading"/>
@@ -100,9 +109,11 @@
     <component id="GridItemEditor" class="spark.components.gridClasses.GridItemEditor" />
     <component id="GridItemRenderer" class="spark.components.gridClasses.GridItemRenderer"/>
     <component id="GridLayer" class="spark.components.gridClasses.GridLayer"/>
+    <component id="GridView" class="spark.components.gridClasses.GridView"/>
     <component id="Group" class="spark.components.Group"/>
     <component id="GroupBase" class="spark.components.supportClasses.GroupBase"/>
     <component id="HGroup" class="spark.components.HGroup"/>
+    <component id="HorizontalAccordionLayout" class="spark.components.supportClasses.HorizontalAccordionLayout"/>
     <component id="HorizontalLayout" class="spark.layouts.HorizontalLayout"/>
     <component id="HSBInterpolator" class="spark.effects.interpolation.HSBInterpolator"/>
     <component id="HScrollBar" class="spark.components.HScrollBar"/>
@@ -115,7 +126,7 @@
     <component id="LayoutBase" class="spark.layouts.supportClasses.LayoutBase"/>
     <component id="Line" class="spark.primitives.Line"/>
     <component id="Linear" class="spark.effects.easing.Linear"/>
-	<component id="List" class="spark.components.List"/>
+    <component id="List" class="spark.components.List"/>
     <component id="ListBase" class="spark.components.supportClasses.ListBase"/>
     <component id="MaskType" class="spark.core.MaskType"/>
     <component id="MatchingCollator" class="spark.globalization.MatchingCollator"/>
@@ -123,6 +134,7 @@
     <component id="Matrix3D" class="flash.geom.Matrix3D" lookupOnly="true"/>
     <component id="Module" class="spark.modules.Module"/>
     <component id="ModuleLoader" class="spark.modules.ModuleLoader"/>
+    <component id="MonthGrid" class="spark.components.MonthGrid"/>
     <component id="MotionPath" class="spark.effects.animation.MotionPath"/>
     <component id="Move" class="spark.effects.Move"/>
     <component id="MovieClipSWFLoader" class="mx.controls.MovieClipSWFLoader" lookupOnly="true"/>
@@ -136,16 +148,20 @@
     <component id="NumberValidator" class="spark.validators.NumberValidator"/>
     <component id="NumericDataProvider" class="spark.collections.NumericDataProvider"/>
     <component id="NumericStepper" class="spark.components.NumericStepper"/>
+    <component id="ObjectTreeDataAdapter" class="spark.collections.ObjectTreeDataAdapter"/>
     <component id="Panel" class="spark.components.Panel"/>
     <component id="Path" class="spark.primitives.Path"/>
-	<component id="PopUpAnchor" class="spark.components.PopUpAnchor"/>
- 	<component id="PopUpPosition" class="spark.components.PopUpPosition"/>
+    <component id="PhoneFormatter" class="mx.formatters.PhoneFormatter" lookupOnly="true"/>
+    <component id="PhoneNumberValidator" class="mx.validators.PhoneNumberValidator" lookupOnly="true"/>
+    <component id="PopUpAnchor" class="spark.components.PopUpAnchor"/>
+    <component id="PopUpPosition" class="spark.components.PopUpPosition"/>
     <component id="Power" class="spark.effects.easing.Power"/>
-	<component id="RadioButton" class="spark.components.RadioButton"/>
+    <component id="RadioButton" class="spark.components.RadioButton"/>
     <component id="RadioButtonGroup" class="spark.components.RadioButtonGroup"/>
     <component id="Range" class="spark.components.supportClasses.Range"/>
     <component id="Rect" class="spark.primitives.Rect"/>
     <component id="RectangularDropShadow" class="spark.primitives.RectangularDropShadow"/>
+    <component id="RegExpValidator" class="mx.validators.RegExpValidator" lookupOnly="true"/>
     <component id="RemoveAction" class="spark.effects.RemoveAction"/>
     <component id="Resize" class="spark.effects.Resize"/>
     <component id="RGBInterpolator" class="spark.effects.interpolation.RGBInterpolator"/>
@@ -172,16 +188,21 @@
     <component id="SkinnablePopUpContainer" class="spark.components.SkinnablePopUpContainer"/>
     <component id="SkinnableTextBase" class="spark.components.supportClasses.SkinnableTextBase"/>
     <component id="SliderBase" class="spark.components.supportClasses.SliderBase"/>
+    <component id="SocialSecurityValidator" class="mx.validators.SocialSecurityValidator" lookupOnly="true"/>
     <component id="Sort" class="spark.collections.Sort"/>
     <component id="SortField" class="spark.collections.SortField"/>
     <component id="SortingCollator" class="spark.globalization.SortingCollator"/>
+    <component id="SoundEffect" class="mx.effects.SoundEffect" lookupOnly="true"/>
     <component id="Spacer" class="mx.controls.Spacer" lookupOnly="true"/>
     <component id="SparkButtonSkin" class="spark.skins.SparkButtonSkin"/>
     <component id="SparkSkin" class="spark.skins.SparkSkin"/>
     <component id="Spinner" class="spark.components.Spinner"/>
     <component id="SpriteVisualElement" class="spark.core.SpriteVisualElement"/>
     <component id="StringTools" class="spark.globalization.StringTools"/>
+    <component id="StringValidator" class="mx.validators.StringValidator" lookupOnly="true"/>
     <component id="StrokedElement" class="spark.primitives.supportClasses.StrokedElement"/>
+    <component id="SubListView" class="spark.collections.SubListView"/>
+    <component id="SwitchSymbolFormatter" class="mx.formatters.SwitchSymbolFormatter" lookupOnly="true"/>
     <component id="SWFLoader" class="mx.controls.SWFLoader" lookupOnly="true"/>
     <component id="TabBar" class="spark.components.TabBar"/>
     <component id="TextArea" class="spark.components.TextArea"/>
@@ -197,12 +218,15 @@
     <component id="TitleWindow" class="spark.components.TitleWindow"/>
     <component id="ToggleButton" class="spark.components.ToggleButton"/>
     <component id="ToggleButtonBase" class="spark.components.supportClasses.ToggleButtonBase"/>
+    <component id="ToolTip" class="spark.components.ToolTip"/>
     <component id="TrackBase" class="spark.components.supportClasses.TrackBase"/>
     <component id="Transform" class="mx.geom.Transform"/>
     <component id="TransformOffsets" class="mx.geom.TransformOffsets" lookupOnly="true"/>
     <component id="UITextFieldGridItemRenderer" class="spark.skins.spark.UITextFieldGridItemRenderer"/>
     <component id="VerticalAlign" class="spark.layouts.VerticalAlign"/>
+    <component id="VerticalAccordionLayout" class="spark.components.supportClasses.VerticalAccordionLayout"/>
     <component id="VerticalLayout" class="spark.layouts.VerticalLayout"/>
+    <component id="ViewStack" class="spark.components.ViewStack"/>
     <component id="VGroup" class="spark.components.VGroup"/>
     <component id="VideoDisplay" class="spark.components.VideoDisplay"/>
     <component id="VideoPlayer" class="spark.components.VideoPlayer"/>
@@ -211,44 +235,52 @@
     <component id="VSlider" class="spark.components.VSlider"/>
     <component id="Wipe" class="spark.effects.Wipe"/>
     <component id="XMLListCollection" class="mx.collections.XMLListCollection" lookupOnly="true"/>
+    <component id="XMLTreeDataAdapter" class="spark.collections.XMLTreeDataAdapter"/>
+    <component id="ZipCodeFormatter" class="mx.formatters.ZipCodeFormatter" lookupOnly="true"/>
+    <component id="ZipCodeValidator" class="mx.validators.ZipCodeValidator" lookupOnly="true"/>
 
     <!-- Special Components -->
     <component id="State" class="mx.states.State" lookupOnly="true"/>
-	<component id="AddItems" class="mx.states.AddItems" lookupOnly="true"/>
+    <component id="AddItems" class="mx.states.AddItems" lookupOnly="true"/>
     <component id="DataItem" class="spark.utils.DataItem"/>
 
-	<!-- airframework -->
+    <!-- airframework -->
     <component id="TitleBar" class="spark.components.windowClasses.TitleBar" lookupOnly="true"/>   
     <component id="Window" class="spark.components.Window" lookupOnly="true"/>
     <component id="WindowedApplication" class="spark.components.WindowedApplication" lookupOnly="true"/>
 
-	<!-- FTE text for MX components -->
-	<component id="FTEDataGridItemRenderer" class="mx.controls.dataGridClasses.FTEDataGridItemRenderer"/>
+    <!-- FTE text for MX components -->
+    <component id="FTEDataGridItemRenderer" class="mx.controls.dataGridClasses.FTEDataGridItemRenderer"/>
     <component id="MXFTETextInput" class="mx.controls.MXFTETextInput"/>
 
-	<!-- Text Layout Framework (TLF) -->
-	<component id="a" class="flashx.textLayout.elements.LinkElement" lookupOnly="true"/>
-	<component id="br" class="flashx.textLayout.elements.BreakElement" lookupOnly="true"/>
-	<component id="div" class="flashx.textLayout.elements.DivElement" lookupOnly="true"/>
-	<component id="img" class="flashx.textLayout.elements.InlineGraphicElement" lookupOnly="true"/>
-        <component id="list" class="flashx.textLayout.elements.ListElement" lookupOnly="true"/>
-        <component id="li" class="flashx.textLayout.elements.ListItemElement" lookupOnly="true"/>
-	<component id="p" class="flashx.textLayout.elements.ParagraphElement" lookupOnly="true"/>
-	<component id="span" class="flashx.textLayout.elements.SpanElement" lookupOnly="true"/>
-	<component id="tab" class="flashx.textLayout.elements.TabElement" lookupOnly="true"/>
-	<component id="tcy" class="flashx.textLayout.elements.TCYElement" lookupOnly="true"/>
-	<component id="ListMarkerFormat" class="flashx.textLayout.formats.ListMarkerFormat" lookupOnly="true"/>			         
-	<component id="g" class="flashx.textLayout.elements.SubParagraphGroupElement" lookupOnly="true"/>
-	<component id="TextFlow" class="flashx.textLayout.elements.TextFlow" lookupOnly="true"/>
-	<component id="TextLayoutFormat" class="flashx.textLayout.formats.TextLayoutFormat" lookupOnly="true"/>
+    <!-- Text Layout Framework (TLF) -->
+    <component id="a" class="flashx.textLayout.elements.LinkElement" lookupOnly="true"/>
+    <component id="br" class="flashx.textLayout.elements.BreakElement" lookupOnly="true"/>
+    <component id="div" class="flashx.textLayout.elements.DivElement" lookupOnly="true"/>
+    <component id="img" class="flashx.textLayout.elements.InlineGraphicElement" lookupOnly="true"/>
+    <component id="list" class="flashx.textLayout.elements.ListElement" lookupOnly="true"/>
+    <component id="li" class="flashx.textLayout.elements.ListItemElement" lookupOnly="true"/>
+    <component id="p" class="flashx.textLayout.elements.ParagraphElement" lookupOnly="true"/>
+    <component id="span" class="flashx.textLayout.elements.SpanElement" lookupOnly="true"/>
+    <component id="tab" class="flashx.textLayout.elements.TabElement" lookupOnly="true"/>
+    <component id="tcy" class="flashx.textLayout.elements.TCYElement" lookupOnly="true"/>
+    <component id="ListMarkerFormat" class="flashx.textLayout.formats.ListMarkerFormat" lookupOnly="true"/>			         
+    <component id="g" class="flashx.textLayout.elements.SubParagraphGroupElement" lookupOnly="true"/>
+    <component id="TextFlow" class="flashx.textLayout.elements.TextFlow" lookupOnly="true"/>
+    <component id="TextLayoutFormat" class="flashx.textLayout.formats.TextLayoutFormat" lookupOnly="true"/>
 
     <!-- rpc -->
     <component id="AMFChannel" class="mx.messaging.channels.AMFChannel" lookupOnly="true"/>
+    <component id="AsyncToken" class="mx.rpc.AsyncToken" lookupOnly="true"/>
     <component id="CallResponder" class="mx.rpc.CallResponder" lookupOnly="true"/>
     <component id="ChannelSet" class="mx.messaging.ChannelSet" lookupOnly="true"/>
     <component id="Consumer" class="mx.messaging.Consumer" lookupOnly="true"/>
     <component id="HTTPChannel" class="mx.messaging.channels.HTTPChannel" lookupOnly="true"/>
+    <component id="HTTPMultiService" class="mx.rpc.http.mxml.HTTPMultiService" lookupOnly="true"/>
+    <component id="HTTPOperation" class="mx.rpc.http.Operation" lookupOnly="true"/>
     <component id="HTTPService" class="mx.rpc.http.mxml.HTTPService" lookupOnly="true"/>
+    <component id="MultiTopicConsumer" class="mx.messaging.MultiTopicConsumer" lookupOnly="true"/>
+    <component id="MultiTopicProducer" class="mx.messaging.MultiTopicProducer" lookupOnly="true"/>
     <component id="Producer" class="mx.messaging.Producer" lookupOnly="true"/>
     <component id="RemoteObject" class="mx.rpc.remoting.mxml.RemoteObject" lookupOnly="true"/>
     <component id="RemoteObjectOperation" class="mx.rpc.remoting.mxml.Operation" lookupOnly="true"/>
@@ -266,7 +298,7 @@
     <!-- LCDS (formerly known as FDS) -->
     <component id="DataService" class="mx.data.mxml.DataService" lookupOnly="true"/>
 	
-	<!-- Flex 3 Graphics -->
+    <!-- Flex 3 Graphics -->
     <component id="BitmapFill" class="mx.graphics.BitmapFill" lookupOnly="true"/>
     <component id="BitmapFillMode" class="mx.graphics.BitmapFillMode" lookupOnly="true"/>
     <component id="CompoundTransform" class="mx.geom.CompoundTransform" lookupOnly="true"/>
@@ -290,7 +322,7 @@
     <component id="MiniDebugTarget" class="mx.logging.targets.MiniDebugTarget" lookupOnly="true"/>
     <component id="TraceTarget" class="mx.logging.targets.TraceTarget" lookupOnly="true"/>
 
-	<!-- MXItemRenderer -->
+    <!-- MXItemRenderer -->
     <component id="MXItemRenderer" class="mx.controls.listClasses.MXItemRenderer"/>
     <component id="MXTreeItemRenderer" class="mx.controls.treeClasses.MXTreeItemRenderer"/>
     <component id="MXDataGridItemRenderer" class="mx.controls.dataGridClasses.MXDataGridItemRenderer"/>

Modified: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests-config.xml?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests-config.xml (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests-config.xml Mon Aug  6 21:25:54 2012
@@ -72,6 +72,7 @@
         <symbol>spark.scripts.ButtonBarTestScript</symbol>
         <symbol>spark.scripts.TileGroupTestScript</symbol>
         <symbol>spark.scripts.TitleWindowTestScript</symbol>
+        <symbol>spark.scripts.VideoPlayerTestScript</symbol>
         <symbol>graphics.scripts.GraphicsTagsTestScript</symbol>
         <symbol>fxg.scripts.FXGCompileTestScript</symbol>
         <symbol>fxg.scripts.FXG2CompileTestScript</symbol>
@@ -81,6 +82,7 @@
 	    <symbol>dmv.scripts.ODGTestScript</symbol>
 	    <symbol>dmv.scripts.ChartsTestScript</symbol>	
         <symbol>spark.scripts.AnimateConstraintsTestScript</symbol>
+        <symbol>spark.scripts.RemoveUnusedRSLsTestScript</symbol>
         <symbol>spark.scripts.ImageTestScript</symbol>
         <symbol>spark.scripts.DateTimeFormatterTestScript</symbol> 
         <symbol>spark.scripts.AdvancedStyleClientTestScript</symbol>
@@ -92,6 +94,8 @@
 		<symbol>spark.scripts.CurrencyValidatorTestScript</symbol>
         <symbol>spark.scripts.NumberValidatorTestScript</symbol>
 	<symbol>spark.scripts.SortTestScript</symbol>
+        <symbol>spark.scripts.ViewStackTestScript</symbol>
+        <symbol>spark.scripts.AccordionTestScript</symbol>		
     <!--
     -->
         <symbol>ExitWhenDone</symbol>

Modified: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests.mxml?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests.mxml (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/BasicTests.mxml Mon Aug  6 21:25:54 2012
@@ -94,6 +94,7 @@
         <mx:State name="designLayerTest" />
         <mx:State name="styleManagerTest" />
         <mx:State name="fxg2RuntimeTest" />
+        <mx:State name="removeUnusedRSLsTest" />
         <mx:State name="imageTest" />
         <mx:State name="sparkDateTimeFormatterTest" />
         <mx:State name="sparkAdvancedStyleClientTest" />
@@ -102,9 +103,11 @@
         <mx:State name="sparkCollatorTest" />
         <mx:State name="sparkCurrencyFormatterTest" />
         <mx:State name="sparkDataGridTest" />
-		<mx:State name="sparkCurrencyValidatorTest" />
+	   <mx:State name="sparkCurrencyValidatorTest" />
         <mx:State name="sparkNumberValidatorTest" />
         <mx:State name="sparkSortTest" /> 
+        <mx:State name="sparkViewStackTest" /> 
+        <mx:State name="sparkAccordionTest" />
     </mx:states>
     
     <!--  STEP 2: Add an mxml component with the widgets for your test here -->
@@ -157,6 +160,7 @@
     <sparkviews:PanelControlBarTests id="sparkPanelControlBarTests" includeIn="sparkPanelControlBarTest" />    
     <sparkviews:ButtonBarTests id="sparkButtonBarTests" includeIn="sparkButtonBarTest" />    
     <sparkviews:TitleWindowTests id="sparkTitleWindowTests" includeIn="sparkTitleWindowTest" />
+    <sparkviews:VideoPlayerTests id="sparkVideoPlayerTests" includeIn="sparkVideoPlayerTest" />   
     <graphicsviews:GraphicsTagsTests id="graphicsTagsTests" includeIn="graphicsTagsTest" />    
     <fxgviews:FXGCompileTests id="fxgCompileTests" includeIn="fxgCompileTest" />
     <fxgviews:FXG2CompileTests id="fxg2CompileTests" includeIn="fxg2CompileTest" />    
@@ -165,6 +169,7 @@
     <dmvviews:ADGTests id="dmvADGTests" includeIn="dmvADGTest" />
     <dmvviews:ODGTests id="dmvODGTests" includeIn="dmvODGTest" />
     <dmvviews:ChartsTests id="dmvChartsTests" includeIn="dmvChartsTest" />
+    <sparkviews:RemoveUnusedRSLsTests id="removeUnusedRSLsTests" includeIn="removeUnusedRSLsTest" />
     <sparkviews:ImageTests id="imageTests" includeIn="imageTest" />
     <sparkviews:DateTimeFormatterTests id="sparkDateTimeFormatterTests" includeIn="sparkDateTimeFormatterTest" />
     <sparkviews:AdvancedStyleClientTests id="sparkAdvancedStyleClientTests" includeIn="sparkAdvancedStyleClientTest" />
@@ -176,7 +181,8 @@
 	<sparkviews:CurrencyValidatorTests id="sparkCurrencyValidatorTests" includeIn="sparkCurrencyValidatorTest" />
     <sparkviews:NumberValidatorTests id="sparkNumberValidatorTests" includeIn="sparkNumberValidatorTest" />
     <sparkviews:SortTests id="sparkSortTests" includeIn="sparkSortTest" />
-	
+    <sparkviews:ViewStackTests id="sparkViewStackTests" includeIn="sparkViewStackTest" />
+    <sparkviews:AccordionTests id="sparkAccordionTests" includeIn="sparkAccordionTest" />
 
     <!--  STEP 3: Add the testscript to BasicTests-config.xml -->
     

Added: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml?rev=1370028&view=auto
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml (added)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml Mon Aug  6 21:25:54 2012
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
+<UnitTester xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" testSWF="main.mxml">
+    
+    <!-- this set of lines form a template that must be in each unit test -->
+    <mx:Script>
+        <![CDATA[
+            public static function init(o:DisplayObject):void
+            {
+            }
+        ]]>
+    </mx:Script>
+    <mx:Metadata>
+        <![CDATA[
+        [Mixin]
+        ]]>
+    </mx:Metadata>
+    <!-- end of set of lines that must be in each unit test -->
+    
+    <testCases>
+        <TestCase testID="SetupSparkAccordion">
+            <body>
+                <SetProperty target = "" propertyName = "currentState" value = "sparkAccordionTest"
+                             waitEvent = "updateComplete" />
+                <AssertPropertyValue target="sparkAccordionTests.h_accordion" propertyName = "numElements" value = "3" />
+                <AssertPropertyValue target="sparkAccordionTests.v_accordion" propertyName = "numElements" value = "3" />
+                <AssertPropertyValue target="sparkAccordionTests.h_accordion" propertyName = "selectedIndex" value = "0" />
+                <AssertPropertyValue target="sparkAccordionTests.v_accordion" propertyName = "selectedIndex" value = "1" />
+            </body>
+        </TestCase>
+        
+        <TestCase testID="SparkAccordionTest1">
+            <body>
+                <DispatchMouseClickEvent target="sparkAccordionTests.h_accordion"  localX="10" localY="50" />
+                <DispatchMouseClickEvent target="sparkAccordionTests.v_accordion"  localX="50" localY="10" waitEvent="change" />
+                <AssertPropertyValue target="sparkAccordionTests.h_accordion" propertyName = "selectedIndex" value = "0" />
+                <AssertPropertyValue target="sparkAccordionTests.v_accordion" propertyName = "selectedIndex" value = "0" />
+            </body>
+        </TestCase>
+		
+        <TestCase testID="SparkAccordionTest2">
+            <body>
+                <SetProperty target = "sparkAccordionTests.h_accordion" propertyName = "requireSelection" value = "false"/>
+                <DispatchMouseClickEvent target="sparkAccordionTests.h_accordion"  localX="10" localY="50" waitEvent="change" />
+                <!--<SetProperty target = "sparkAccordionTests.v_accordion" propertyName = "allowMultipleSelection" value = "false"
+                             waitEvent = "valueCommit" />-->
+                <AssertPropertyValue target="sparkAccordionTests.h_accordion" propertyName = "selectedIndex" value = "-1" />
+                <AssertPropertyValue target="sparkAccordionTests.v_accordion" propertyName = "selectedIndex" value = "0" />
+            </body>
+        </TestCase>
+    </testCases>
+    
+</UnitTester>

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/AccordionTestScript.mxml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml?rev=1370028&view=auto
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml (added)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml Mon Aug  6 21:25:54 2012
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
+<UnitTester xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" testSWF="main.mxml">
+
+	<!-- this set of lines form a template that must be in each unit test -->
+	<mx:Script>
+	<![CDATA[
+	public static function init(o:DisplayObject):void
+	{
+	}
+	]]>
+	</mx:Script>
+	<mx:Metadata>
+	<![CDATA[
+		[Mixin]
+	]]>
+	</mx:Metadata>
+	<!-- end of set of lines that must be in each unit test -->
+
+	<mx:Script>
+	<![CDATA[
+	]]>
+	</mx:Script>
+
+	<testCases>
+<!--
+-->
+		<TestCase testID="SetupViewStackTest">
+			<body>
+				<SetProperty target="" propertyName="currentState" value="sparkViewStackTest" 
+                    waitEvent="updateComplete" />
+				<AssertPropertyValue target="sparkViewStackTests.viewStack" propertyName="numElements" value="3" />
+				<AssertPropertyValue target="sparkViewStackTests.testTabBar" propertyName="selectedIndex" value="0" />
+				<AssertPropertyValue target="sparkViewStackTests.viewStack.selectedElement.getElementAt(0)" propertyName="text" value="This is Page One" />
+			</body>
+		</TestCase>
+		<TestCase testID="SparkViewStackTest1">
+			<body>
+				<DispatchMouseEvent target="sparkViewStackTests.testTabBar" type="mouseOver" localX="100" localY="10" />
+				<DispatchMouseClickEvent target="sparkViewStackTests.testTabBar"  localX="100" localY="10" waitEvent="change" />
+				<AssertPropertyValue target="sparkViewStackTests.testTabBar" propertyName="selectedIndex" value="1" />
+				<AssertPropertyValue target="sparkViewStackTests.viewStack.selectedElement.getElementAt(0)" propertyName="text" value="This is Page Two" />
+			</body>
+		</TestCase>
+		<TestCase testID="SparkViewStackTest2">
+			<body>
+				<DispatchMouseEvent target="sparkViewStackTests.testTabBar" type="mouseOver" localX="200" localY="10" />
+				<DispatchMouseClickEvent target="sparkViewStackTests.testTabBar"  localX="200" localY="10" waitEvent="change" />
+				<AssertPropertyValue target="sparkViewStackTests.testTabBar" propertyName="selectedIndex" value="2" />
+				<AssertPropertyValue target="sparkViewStackTests.viewStack.selectedElement.getElementAt(0)" propertyName="text" value="This is Page Three" />
+			</body>
+		</TestCase>
+	</testCases>
+</UnitTester>

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/scripts/ViewStackTestScript.mxml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml?rev=1370028&view=auto
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml (added)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml Mon Aug  6 21:25:54 2012
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
+<s:SkinnableContainer 
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:s="library://ns.adobe.com/flex/spark"
+    xmlns:mx="library://ns.adobe.com/flex/mx"                >
+    
+    <fx:Script>
+        <![CDATA[
+            
+            import mx.collections.*;
+            import mx.controls.*;
+            import mx.events.*;
+            import mx.managers.*;
+        ]]>
+    </fx:Script>
+    <fx:Declarations>
+        <fx:Vector type = "int" id = "testVector" fixed="false">
+            <fx:int>-1</fx:int>
+            <fx:int>-2</fx:int>
+            <fx:int>1</fx:int>
+            <fx:int>2</fx:int>
+            <fx:int>3</fx:int>
+        </fx:Vector>
+    </fx:Declarations>
+    <s:layout>
+        <s:HorizontalLayout>
+            
+        </s:HorizontalLayout>
+    </s:layout>
+
+    <s:BorderContainer minWidth = "0" minHeight = "0" borderWeight="5">
+        <s:Accordion id="v_accordion" resizeToContent="true" requireSelection="false" selectedIndex="1">
+            <s:AccordionContent id = "sc1" label="v_content1" elementDestructionPolicy="always">
+                <s:layout>
+                    <s:VerticalLayout paddingTop="5" gap = "5">
+                        
+                    </s:VerticalLayout>
+                </s:layout>
+                <s:Label text="Accordion container panel 1"/>
+                <s:Button id = "next" label = "Click me" width = "100" height = "50"/>
+            </s:AccordionContent>
+            <s:AccordionContent id = "sc2" label="v_content2" elementDestructionPolicy="never">
+                <s:Scroller width = "100%" height = "100%">
+                    
+                    <s:Group width = "200" height = "200">
+                        <s:layout>
+                            <s:VerticalLayout paddingTop="5" paddingBottom="5" gap="0"  />
+                        </s:layout>
+                        <s:VGroup width="100%" height="100%">
+                            
+                            <s:Label text="Accordion container panel 3"/>
+                            
+                            
+                            <s:TextInput id = "ti3" text = "omg"/>
+                            <s:DataGrid id="dataGrid"  left="10" right="10" editable="true" selectionMode="multipleRows">
+                                <s:columns>
+                                    <s:ArrayList>
+                                        <s:GridColumn dataField="key" headerText="Key" editable="true">
+                                            <s:itemRenderer>
+                                                <fx:Component>
+                                                    <s:DefaultGridItemRenderer styleName="myText"/>                                            
+                                                </fx:Component>
+                                            </s:itemRenderer>
+                                        </s:GridColumn>
+                                        <s:GridColumn dataField="name" headerText="Name" />
+                                        <s:GridColumn dataField="price" headerText="Price">
+                                            <s:itemEditor>
+                                                <fx:Component>
+                                                    <s:DefaultGridItemEditor/>                            
+                                                </fx:Component>
+                                            </s:itemEditor>
+                                            
+                                        </s:GridColumn>
+                                        <s:GridColumn dataField="call" headerText="Rating" editable="true">
+                                            <s:itemEditor>
+                                                <fx:Component>
+                                                    <s:ComboBoxGridItemEditor>
+                                                        <s:dataProvider>
+                                                            <s:ArrayList>
+                                                                <fx:int>1</fx:int>
+                                                                <fx:int>2</fx:int>
+                                                                <fx:int>3</fx:int>
+                                                                <fx:int>4</fx:int>
+                                                                <fx:int>5</fx:int>
+                                                            </s:ArrayList>
+                                                        </s:dataProvider>
+                                                    </s:ComboBoxGridItemEditor>
+                                                </fx:Component>
+                                            </s:itemEditor>
+                                        </s:GridColumn>
+                                    </s:ArrayList>
+                                </s:columns>
+                                
+                                <s:ArrayCollection>
+                                    <s:DataItem key="1000" name="Abrasive" price="100.11" call="4"/>
+                                    <s:DataItem key="1001" name="Brush" price="110.01" call="3"/>
+                                    <s:DataItem key="1002" name="Clamp" price="120.02" call="4"/>
+                                    <s:DataItem key="1003" name="Drill" price="130.03" call="4"/>
+                                    <s:DataItem key="1004" name="Epoxy" price="140.04" call="5"/>
+                                    <s:DataItem key="1005" name="File" price="150.05" call="1"/>
+                                    <s:DataItem key="1006" name="Gouge" price="160.06" call="2"/>
+                                    <s:DataItem key="1007" name="Hook" price="170.07" call="4"/>
+                                    <s:DataItem key="1008" name="Ink" price="180.08" call="5"/>
+                                    <s:DataItem key="1009" name="Jack" price="190.09" call="4"/>             
+                                </s:ArrayCollection>
+                            </s:DataGrid>    
+                        </s:VGroup>
+                    </s:Group>                        
+                </s:Scroller>
+            </s:AccordionContent>
+            <s:AccordionContent id = "sc3" label="v_content3" elementDestructionPolicy="auto">
+                <s:Label id="pageLabel3" text="This is Page Three" height = "50"/>
+            </s:AccordionContent >
+        </s:Accordion>
+    </s:BorderContainer>
+    
+    <s:BorderContainer minWidth = "0" minHeight = "0" borderWeight="5">
+        <s:Accordion id="h_accordion" resizeToContent="false" requireSelection="true"
+                     selectedIndex = "0" skinClass="spark.skins.spark.HorizontalAccordionSkin">
+            <s:AccordionContent label="h_content1" elementCreationPolicy="all"
+                                skinClass="spark.skins.spark.HorizontalAccordionContentSkin" width = "200" height = "200">
+                <s:HGroup paddingTop = "5">
+                    <s:Label id="pageLabel1" text="This is Page One" />
+                    <s:List id = "testList" allowMultipleSelection="true"> 
+                        <mx:ArrayCollection >
+                            <fx:String>Flash</fx:String> 
+                            <fx:String>Director</fx:String> 
+                            <fx:String>Dreamweaver</fx:String> 
+                            <fx:String>ColdFusion</fx:String> 
+                        </mx:ArrayCollection>
+                    </s:List>
+                </s:HGroup>
+            </s:AccordionContent>
+            <s:AccordionContent label="h_content2" elementCreationPolicy="auto"
+                                skinClass="spark.skins.spark.HorizontalAccordionContentSkin">
+                <s:Label paddingTop = "5" id="pageLabel2" text="This is Page Two" />
+            </s:AccordionContent>
+            <s:AccordionContent label="h_content3" elementCreationPolicy="none"
+                                skinClass="spark.skins.spark.HorizontalAccordionContentSkin">
+                <s:HGroup paddingTop = "5">
+                    <s:Label id="pageLabel4" text="This is Page Three" />
+                    <s:Accordion id = "nestedAccordion" selectedIndex="1">
+                        <s:AccordionContent label = "c1">
+                            <s:Button label = "aContent" />
+                        </s:AccordionContent>
+                        <s:AccordionContent label = "c2">
+                            <s:VGroup>
+                                <s:Button label = "moreContent" />
+                                <s:CheckBox label = "checkme" />
+                            </s:VGroup>
+                        </s:AccordionContent>
+                    </s:Accordion>
+                </s:HGroup>
+            </s:AccordionContent >
+        </s:Accordion>
+    </s:BorderContainer>
+    
+</s:SkinnableContainer>
\ No newline at end of file

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/AccordionTests.mxml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml?rev=1370028&view=auto
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml (added)
+++ incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml Mon Aug  6 21:25:54 2012
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
+<s:SkinnableContainer 
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:s="library://ns.adobe.com/flex/spark"
+    xmlns:mx="library://ns.adobe.com/flex/mx"                >
+
+<fx:Script>
+<![CDATA[
+
+    import mx.collections.*;
+    import mx.controls.*;
+    import mx.events.*;
+    import mx.managers.*;
+]]>
+</fx:Script>
+
+    <s:layout>
+        <s:VerticalLayout />
+    </s:layout>
+
+    <s:TabBar id="testTabBar" dataProvider="{viewStack}" />
+    <s:ViewStack id="viewStack">
+        <s:NavigatorContent label="First Page" width="250" height="200" >
+            <s:Label id="pageLabel1" text="This is Page One" />
+        </s:NavigatorContent>
+        <s:NavigatorContent label="Second Page" width="250" height="200" >
+            <s:Label id="pageLabel2" text="This is Page Two" />
+        </s:NavigatorContent>
+        <s:NavigatorContent label="Third Page" width="250" height="200" >
+            <s:Label id="pageLabel3" text="This is Page Three" />
+        </s:NavigatorContent >
+    </s:ViewStack>
+
+</s:SkinnableContainer>

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/whiteboard/cframpton/adobe.next/frameworks/tests/basicTests/spark/views/ViewStackTests.mxml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/RuntimeSharedLibraryPath.java
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/RuntimeSharedLibraryPath.java?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/RuntimeSharedLibraryPath.java (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/RuntimeSharedLibraryPath.java Mon Aug  6 21:25:54 2012
@@ -19,9 +19,6 @@
 
 package flex.ant.types;
 
-import flex.ant.config.ConfigString;
-import flex.ant.config.ConfigVariable;
-import flex.ant.config.NestedAttributeElement;
 import flex.ant.config.OptionSource;
 import flex.ant.config.OptionSpec;
 import java.util.ArrayList;
@@ -41,7 +38,7 @@ public final class RuntimeSharedLibraryP
     private static OptionSpec urlSpec = new OptionSpec("url");
 
     private String pathElement;
-    private ArrayList urlElements = new ArrayList();
+    private ArrayList<URLElement> urlElements = new ArrayList<URLElement>();
 
     public RuntimeSharedLibraryPath()
     {
@@ -49,15 +46,26 @@ public final class RuntimeSharedLibraryP
 
     public void addToCommandline(Commandline commandLine)
     {
-        commandLine.createArgument().setValue(RUNTIME_SHARED_LIBRARY_PATH);
-        commandLine.createArgument().setValue(pathElement);
+        StringBuilder rslOption = new StringBuilder();
+        
+        rslOption.append(RUNTIME_SHARED_LIBRARY_PATH);
+        rslOption.append("=");
+        rslOption.append(pathElement);
 
-        Iterator it = urlElements.iterator();
+        Iterator<URLElement> it = urlElements.iterator();
 
         while (it.hasNext())
         {
-            ((OptionSource) it.next()).addToCommandline(commandLine);
+        URLElement option = it.next();
+            rslOption.append(",");
+            rslOption.append(option.getRslURL());
+            rslOption.append(",");
+
+            String policyFileURL = option.getPolicyFileURL(); 
+            rslOption.append(policyFileURL != null ? policyFileURL : "");
         }
+        
+        commandLine.createArgument().setValue(rslOption.toString());
     }
 
     public Object createDynamicElement(String name)

Modified: incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/URLElement.java
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/URLElement.java?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/URLElement.java (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/modules/antTasks/src/flex/ant/types/URLElement.java Mon Aug  6 21:25:54 2012
@@ -19,15 +19,13 @@
 
 package flex.ant.types;
 
-import flex.ant.config.OptionSource;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DynamicAttribute;
-import org.apache.tools.ant.types.Commandline;
 
 /**
  * Supports the nested URL based tags of RuntimeSharedLibraryPath.
  */
-public class URLElement implements DynamicAttribute, OptionSource
+public class URLElement implements DynamicAttribute
 {
     private static final String RSL_URL = "rsl-url";
     private static final String POLICY_FILE_URL = "policy-file-url";
@@ -52,16 +50,23 @@ public class URLElement implements Dynam
         }
     }
 
-    public void addToCommandline(Commandline commandLine)
+    /**
+     * 
+     * @return the RSL URL.
+     */
+    public String getRslURL() 
     {
-        if (rslURL != null)
-        {
-            commandLine.createArgument().setValue(rslURL);
-        }
+        return rslURL;
+    }
 
-        if (policyFileURL != null)
-        {
-            commandLine.createArgument().setValue(policyFileURL);
-        }
+    /**
+     * 
+     * @return the policy file URL.
+     */
+    public String getPolicyFileURL() 
+    {
+        return policyFileURL;
     }
+
+    
 }
\ No newline at end of file

Modified: incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/AIRLaunchInfo.java
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/AIRLaunchInfo.java?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/AIRLaunchInfo.java (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/AIRLaunchInfo.java Mon Aug  6 21:25:54 2012
@@ -122,4 +122,11 @@ public class AIRLaunchInfo
 	 * -XdeviceExtDir argument of ADL.
 	 */
 	public String deviceExtDir;
-}
+	
+	/**
+	 * ADL supports sensor and event input simulation through the use of the -simulation command line option. 
+	 * Examples of simulated events are device orientation changes and accelerometer measurements.
+	 * Usage : -simulation [<controllerIP>:]<controllerPort>
+	 */
+	public String simulation;
+}
\ No newline at end of file

Modified: incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSessionManager.java?rev=1370028&r1=1370027&r2=1370028&view=diff
==============================================================================
--- incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSessionManager.java (original)
+++ incubator/flex/whiteboard/cframpton/adobe.next/modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSessionManager.java Mon Aug  6 21:25:54 2012
@@ -564,6 +564,11 @@ public class PlayerSessionManager implem
 			cmdList.add(airLaunchInfo.deviceExtDir);
 		}
 		
+		if (airLaunchInfo.simulation != null && airLaunchInfo.simulation.length() > 0) {
+			cmdList.add("-Xsimulation"); //$NON-NLS-1$
+			cmdList.add(airLaunchInfo.simulation);
+		}
+		
 		// If it's a "file:" URL, then pass the actual filename; otherwise, use the URL
 		// ok, its not an http: type request therefore we should be able to see
 		// it on the file system, right?  If not then it's probably not valid
@@ -1132,4 +1137,4 @@ public class PlayerSessionManager implem
 	{
 		return m_localizationManager;
 	}
-}
+}
\ No newline at end of file



Mime
View raw message