Transferred from the Adobe Open Source Subversion Repository

Revision: 9115
Author:   rfrishbe@adobe.com
Date:     2009-08-05T20:25:32.332343Z

Log Message:
-----------
VideoPlayer/VideoElement fixes:

SDK-22196 – VideoElement Cannot Load Video During An Effect.
The issue’s really with FLVPlayback.  If you set width and height to something, it won’t load the video until the next frame.  During an animation, we are constantly setting the width/height in UDL(), so FLVPlayback never actually shows or loads the video.  The fix is just a workaround and we only set width/height on the FLVPlayback control if one of them has changed.

SDK-22182 - Clicking "Full Screen" button on the rotated video displays only artboard.
For rotated video, we weren’t correctly going in to fullscreen mode.  Now we use setLayoutBoundsSize and setLayoutBoundsPosition with postTransform=true and make sure to call invalidateSize() and invalidateDL();

SDK-22310: bufferedArea not showing in spark Video Player
This was an injection with some refactoring around how we handled the sizing of components in TrackBase.  The code was refactored, but pendingValue was used, when the passed in value should be used.

QE notes: -
Doc notes: -
Bugs: SDK-22196, SDK-22182, SDK-22310
Reviewer: Deepa
Tests run: checkintests, VideoPlayer and VideoElement mustella tests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/ScrubBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/VideoElement.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1281106 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/VideoDisplay.as
+++ frameworks/projects/spark/src/spark/components/VideoDisplay.as
@@ -11,11 +11,10 @@

 package spark.primitives
 {
-import fl.video.DynamicStream;
+
 import fl.video.DynamicStreamItem;
 import fl.video.MetadataEvent;
 import fl.video.NCManagerDynamicStream;
-import fl.video.VideoAlign;
 import fl.video.VideoError;
 import fl.video.VideoEvent;
 import fl.video.VideoPlayer;
@@ -28,14 +27,12 @@
 import flash.display.Sprite;
 import flash.events.Event;
 import flash.events.ProgressEvent;
-import flash.geom.Matrix;
 import flash.media.Video;

-import mx.core.AdvancedLayoutFeatures;
 import mx.core.mx_internal;

+import spark.components.mediaClasses.StreamItem;
 import spark.components.mediaClasses.StreamingVideoSource;
-import spark.components.mediaClasses.StreamItem;
 import spark.core.IGraphicElement;
 import spark.events.VideoEvent;
 import spark.primitives.supportClasses.GraphicElement;
@@ -884,8 +881,11 @@

         var flvPlayer:VideoPlayer = videoPlayer;

-        flvPlayer.width = Math.floor(unscaledWidth);
-        flvPlayer.height = Math.floor(unscaledHeight);
+        if (flvPlayer.width != Math.floor(unscaledWidth) || flvPlayer.height != Math.floor(unscaledHeight))
+        {
+            flvPlayer.width = Math.floor(unscaledWidth);
+            flvPlayer.height = Math.floor(unscaledHeight);
+        }
     }

     //--------------------------------------------------------------------------


Transferred from the Adobe Open Source Subversion Repository

Revision: 8
Author:   open-source-svn-admin@adobe.com
Date:     2007-12-15T01:49:31.087529Z

Log Message:
-----------
The beginning of the open-source Flex SDK.

Populated the flex/sdk/trunk directory with an open-source subset of files from //depot/flex/sdk/...@191097 in the Faramir Perforce server. This changelist is a bit past the 3.0rc0 build.

The Ant scripts will not successfully build yet. They need to be adapted to the open-source subset.

Modified Paths:
--------------
2532 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1259694 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/framework/src/mx/core/ScrollPolicy.as
+++ frameworks/projects/framework/src/mx/core/ScrollPolicy.as
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2006 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.core
+{
+
+/**
+ *  Values for the horizontalScrollPolicy and
+ *  verticalScrollPolicy properties
+ *  of the Container and ScrollControlBase classes.
+ *
+ *  @see mx.core.Container
+ *  @see mx.core.ScrollControlBase
+ */
+public final class ScrollPolicy
+{
+	include "../core/Version.as";
+
+	//--------------------------------------------------------------------------
+	//
+	//  Class constants
+	//
+	//--------------------------------------------------------------------------
+
+	/**
+	 *  Show the scrollbar if the children exceed the owner's dimension.
+	 *  The size of the owner is not adjusted to account
+	 *  for the scrollbars when they appear, so this may cause the
+	 *  scrollbar to obscure the contents of the control or container.
+	 */
+	public static const AUTO:String = "auto";
+
+	/**
+	 *  Never show the scrollbar.
+	 */
+	public static const OFF:String = "off";
+
+	/**
+	 *  Always show the scrollbar.
+	 *  The size of the scrollbar is automatically added to the size
+	 *  of the owner's contents to determine the size of the owner
+	 *  if explicit sizes are not specified.
+	 */
+	public static const ON:String = "on";
+}
+
+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 16895
Author:   rfrishbe@adobe.com
Date:     2010-07-13T01:22:42.893441Z

Log Message:
-----------
Mobile lists will be justified by default instead of content justified.  This will cause extra truncation but eliminate horizontal scrolling by default.

The mobile List skin checked in is the exact same as the spark one, except for this horizontalAlignment change.  Eventually this will become an AS skin.

QE notes: None
Doc notes: None
Bugs: FXM-90
Reviewer: None - will review with mobile list stuff later
Tests run: checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/defaults.css</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/MobileThemeClasses.as</path>
<path kind="file" action="A">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ListSkin.mxml</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1265045 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mobiletheme/src/MobileThemeClasses.as
+++ frameworks/projects/mobiletheme/src/MobileThemeClasses.as
@@ -23,10 +23,11 @@
  */
 import spark.skins.mobile.ActionBarSkin; ActionBarSkin;
 import spark.skins.mobile.ButtonSkin; spark.skins.mobile.ButtonSkin;
+import spark.skins.mobile.HScrollBarSkin; spark.skins.mobile.HScrollBarSkin;
+import spark.skins.mobile.ListSkin; spark.skins.mobile.ListSkin;
 import spark.skins.mobile.MobileApplicationSkin; MobileApplicationSkin;
 import spark.skins.mobile.SliderSkin; SliderSkin;
 import spark.skins.mobile.ViewNavigatorSkin; ViewNavigatorSkin;
-import spark.skins.mobile.HScrollBarSkin; spark.skins.mobile.HScrollBarSkin;
 import spark.skins.mobile.VScrollBarSkin; spark.skins.mobile.VScrollBarSkin;
 }
 }


Transferred from the Adobe Open Source Subversion Repository

Revision: 5797
Author:   jimurphy@adobe.com
Date:     2009-03-31T15:35:34.544076Z

Log Message:
-----------
Merged revisions 3.x 5505,5526-5527,5535,5540,5542,5572,5616-5617,5656-5657,5671,5674,5683,5687-5688,5690,5698,5708-5709,5713-5716,5719-5723,5726,5728-5729,5736,5752,5754,5761,5774,5780,5784 -> trunk

most of these are user submitted patches! very cool.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VideoDisplay.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/IResourceManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ToggleButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Menu.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/CalendarLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ProgressIndeterminateSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NavBar.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="D">/flex/sdk/trunk/modules/compiler/FlexCompilerShell-license.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/DividedBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/formatters/DateFormatter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/FormItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/SWFLoader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/NativeDragManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridColumn.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/validators/PhoneNumberValidator.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.x/frameworks/projects/framework/src/mx/validators/NumberValidatorDomainType.as" copyfrom-rev="5784" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/validators/NumberValidatorDomainType.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/PopUpButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ToolTipManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/ObjectUtil.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/validators/NumberValidator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/validators/CurrencyValidator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Form.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/CalendarLayoutChangeEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/DataGridEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/sliderClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/PopUpMenuButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Text.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1268400 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
+++ frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
@@ -133,7 +133,9 @@
  *    Properties
  *    dataDescriptor="instance of DefaultDataDescriptor"
  *    dataProvider="undefined"
- *    labelField="null"
+ *    iconField="icon"
+ *    iconFunction="undefined"
+ *    labelField="label"
  *    labelFunction="undefined"
  *    showRoot="false|true"
  *
@@ -325,7 +327,7 @@
     {
         if (popUpMenu)
             return Menu(popUpMenu).dataProvider;
-        return null;
+        return _dataProvider;
     }

     /**
@@ -336,16 +338,111 @@
         _dataProvider = value;
         dataProviderChanged = true;

-        // In general we shouldn't create the popUp's until
-        // they are actually popped up. However, in this case
-        // the initial label, icon and action on the main button's
-        // click are to be borrowed from the popped menu.
-        // Moreover since PopUpMenuButton doesn't expose selectedIndex
-        // selectedItem etc., one should be able to access them
-        // prior to popping up the menu.
-        getPopUp();
-
         invalidateProperties();
+    }
+
+    //--------------------------------------------------------------------------
+    //  iconField
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     *  Storage for the iconField property.
+     */
+    private var _iconField:String = "icon";
+
+    [Bindable("iconFieldChanged")]
+    [Inspectable(category="Data", defaultValue="icon")]
+
+    /**
+     *  Name of the field in the dataProvider Array that contains the icon to
+     *  show for each menu item.
+     *  The iconFunction property, if set, overrides this property.
+     *
+     *
The renderers will look in the data provider object for a property of
+     *  the name supplied as the iconField.  If the value of the property is a
+     *  Class, it will instantiate that class and expect it to be an instance
+     *  of an IFlexDisplayObject. If the value of the property is a String,
+     *  it will look to see if a Class exists with that name in the application,
+     *  and if it can't find one, it will also look for a property on the
+     *  document with that name and expect that property to map to a Class.

+     *
+     *  If the data provider is an E4X XML object, you must set this property
+     *  explicitly; for example, use @icon to specify the icon attribute.
+     *
+     *  @default "icon"
+     */
+    public function get iconField():String
+    {
+        return _iconField;
+    }
+
+    /**
+     *  @private
+     */
+    public function set iconField(value:String):void
+    {
+        if (_iconField != value)
+        {
+            _iconField = value;
+
+            if (popUpMenu)
+                popUpMenu.iconField = _iconField;
+
+            dispatchEvent(new Event("iconFieldChanged"));
+        }
+    }
+
+    //--------------------------------------------------------------------------
+    //  iconFunction
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     *  Storage for the iconFunction property.
+     */
+    private var _iconFunction:Function;
+
+    [Inspectable(category="Data")]
+
+    /**
+     *  A function that determines the icon to display for each menu item.
+     *  If you omit this property, Flex uses the contents of the field or attribute
+     *  determined by the iconField property.
+     *  If you specify this property, Flex ignores any iconField
+     *  property value.
+     *
+     *  By default the menu does not try to display icons with the text
+     *  in the rows.  However, by specifying an icon function, you can specify
+     *  a Class for a graphic that will be created and displayed as an icon
+     *  in the row.
+     *
+     *
The iconFunction takes a single argument which is the item
+     *  in the data provider and returns a Class.

+     *
+     *

+     *  iconFunction(item:Object):Class
+     *

+     *
+     *  @default null
+     */
+    public function get iconFunction():Function
+    {
+        return _iconFunction;
+    }
+
+    /**
+     *  @private
+     */
+    public function set iconFunction(value:Function):void
+    {
+        if (_iconFunction != value)
+        {
+            _iconFunction = value;
+
+            if (popUpMenu)
+                popUpMenu.iconFunction = _iconFunction;
+        }
     }

     //--------------------------------------------------------------------------
@@ -540,6 +637,18 @@
      */
     override protected function commitProperties():void
     {
+    	if (dataProviderChanged && !popUpMenu)
+    	{
+    		// In general we shouldn't create the popUp until
+	        // they are actually popped up. However, in this case
+	        // the initial label, icon and action on the main button's
+	        // click are to be borrowed from the popped menu.
+	        // Moreover since PopUpMenuButton doesn't expose selectedIndex
+	        // selectedItem etc., one should be able to access them
+	        // prior to popping up the menu.
+	        getPopUp();
+    	}
+
         if (_showRootChanged)
         {
             _showRootChanged = false;
@@ -629,6 +738,8 @@
         if (!popUpMenu || !super.popUp)
         {
             popUpMenu = new Menu();
+            popUpMenu.iconField = _iconField;
+            popUpMenu.iconFunction = _iconFunction;
             popUpMenu.labelField = _labelField;
             popUpMenu.labelFunction = _labelFunction;
             popUpMenu.showRoot = _showRoot;


Transferred from the Adobe Open Source Subversion Repository

Revision: 2520
Author:   kelin@adobe.com
Date:     2008-07-17T20:36:21.699750Z

Log Message:
-----------
Initial TrackBase, Slider, HSlider, and VSlider checkin (with wireframe skins!).

TrackBase is a subclass of Range that provides thumb dragging functionality along a track. Slider and eventually ScrollBar will subclass TrackBase. Slider subclasses TrackBase and adds Slider-specific functionality like keyboard handling and track-click handling. HSlider and VSlider are initial implementations with tentative wireframe skins. Note: ScrollBar has not been changed to subclass TrackBase yet.

-Updated manifest/css files
-Added slider examples to flex4test

Reviewer: Jason
Bugs: -
QA: Yes

Modified Paths:
--------------
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/HSlider.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/HSliderSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/HSliderThumbSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/VSliderTrackSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/TrackBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/Flex4Classes.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/mxml-2009-manifest.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/gumbo-manifest.xml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/VSlider.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/VSliderSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/VSliderThumbSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/manifest.xml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/skin/HSliderTrackSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/development/eclipse/flex/flex4test/src/flex4test.mxml</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1281294 13f79535-47bb-0310-9956-ffa450edef68


Transferred from the Adobe Open Source Subversion Repository

Revision: 8487
Author:   smgilson@adobe.com
Date:     2009-07-09T18:57:21.985536Z

Log Message:
-----------
final checkin to update the namespace in ASDoc MXML syntax descriptions for Spark components

QE Notes: None
Doc Notes: None
Bugs: -
Checkintests: passed

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/EaseInOutBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Fade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/animation/MotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ColorMatrixFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Power.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/BlurFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/DisplacementMapFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ShaderFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/DropShadowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/CallAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientBevelFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Scale3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Animate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransitionShader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Rotate3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AddAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Scale.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/Graphic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Move3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Rotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/BasicLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Resize.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransform3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Wipe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Sine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GlowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/HorizontalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/TileLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ConvolutionFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Linear.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/animation/Keyframe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientGlowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/SetAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/RemoveAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/BevelFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientFilter.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1285675 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/primitives/Graphic.as
+++ frameworks/projects/spark/src/spark/primitives/Graphic.as
@@ -66,7 +66,7 @@
  *
  *  @mxml
  *
- *
The <mx:Graphic> tag inherits all of the tag attributes
+ *
The <s:Graphic> tag inherits all of the tag attributes
  *  of its superclass, and adds the following tag attributes:

  *
  *


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1285682 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/primitives/Graphic.as
+++ frameworks/projects/spark/src/spark/primitives/Graphic.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2008 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package spark.primitives
 {


vpaid changes need to work on size

vpaid changes need to work on size

--- plugins/vastPlugin/src/com/kaltura/kdpfl/plugin/component/VastLinearAdProxy.as
+++ plugins/vastPlugin/src/com/kaltura/kdpfl/plugin/component/VastLinearAdProxy.as
@@ -4,6 +4,7 @@
 	import com.kaltura.kdpfl.model.MediaProxy;
 	import com.kaltura.kdpfl.model.SequenceProxy;
 	import com.kaltura.kdpfl.model.type.SequenceContextType;
+	import com.kaltura.kdpfl.view.RootMediator;
 	import com.kaltura.osmf.proxy.KSwitchingProxyElement;

 	import flash.events.Event;
@@ -20,6 +21,8 @@
 	import org.osmf.events.LoaderEvent;
 	import org.osmf.events.MediaErrorEvent;
 	import org.osmf.events.MediaPlayerCapabilityChangeEvent;
+	import org.osmf.events.MetadataEvent;
+	import org.osmf.events.PlayEvent;
 	import org.osmf.events.TimeEvent;
 	import org.osmf.media.MediaElement;
 	import org.osmf.media.MediaFactory;
@@ -30,11 +33,14 @@
 	import org.osmf.vast.loader.VASTLoadTrait;
 	import org.osmf.vast.loader.VASTLoader;
 	import org.osmf.vast.media.CompanionElement;
+	import org.osmf.vast.media.VAST2TrackingProxyElement;
 	import org.osmf.vast.media.VASTMediaGenerator;
 	import org.osmf.vast.model.VASTDataObject;
 	import org.osmf.vast.model.VASTDocument;
 	import org.osmf.vast.model.VASTUrl;
 	import org.osmf.vast.parser.base.VAST2CompanionElement;
+	import org.osmf.vpaid.elements.VPAIDElement;
+	import org.osmf.vpaid.metadata.VPAIDMetadata;
 	import org.puremvc.as3.patterns.proxy.Proxy;

 	public class VastLinearAdProxy extends Proxy implements IEventDispatcher
@@ -127,6 +133,17 @@
 				sendNotification( "VASTAdFailed", "load URL is empty")
 			}
 		}
+
+		public function resizeAd(width:Number,height:Number):void
+		{
+			var vpaidMetadata:VPAIDMetadata = getVPAIDMetadata();
+			if (vpaidMetadata)
+			{
+				vpaidMetadata.addValue("width",width);
+				vpaidMetadata.addValue("height",height);
+
+			}
+		}

 		/**
@@ -183,7 +200,6 @@
 				{
 					if (mediaElement is ProxyElement)
 					{
-
 						_playingAd = mediaElement;
 					}
 					if (mediaElement is CompanionElement) {
@@ -250,6 +266,9 @@
 		{
 			playerMediator["player"].addEventListener(MediaErrorEvent.MEDIA_ERROR, onVastAdError);
 			playerMediator["cleanMedia"]();
+
+
+
 			//_playingAd.addEventListener("traitAdd", onAdPlayable);
 			var sequenceProxy : Object = facade.retrieveProxy("sequenceProxy");

@@ -259,11 +278,35 @@
 			//playerMediator.player.addEventListener(TimeEvent.COMPLETE, onAdComplete);
 			//playerMediator["playContent"]();
 			//TODO track stats
-			sendNotification("adStart",
-							 {timeSlot: getContextString(_currentSequenceContext)});
+			sendNotification("adStart",	 {timeSlot: getContextString(_currentSequenceContext)});
 			(playerMediator["player"] as MediaPlayer).addEventListener( MediaPlayerCapabilityChangeEvent.CAN_PLAY_CHANGE , onAdPlayable );
 			(playerMediator["player"] as MediaPlayer).addEventListener(TimeEvent.DURATION_CHANGE, onAdDurationReceived,false, int.MIN_VALUE);
 			playerMediator["player"]["media"] = _playingAd;
+
+
+			var vpaidMetadata:VPAIDMetadata = getVPAIDMetadata();
+			if (vpaidMetadata)
+			{
+				vpaidMetadata.addEventListener(MetadataEvent.VALUE_ADD, function(event:MetadataEvent):void
+				{
+					trace (event.key)
+					if (event.key == "adUserClose")
+					{
+						(playerMediator["player"] as MediaPlayer).removeEventListener(TimeEvent.DURATION_CHANGE, onAdDurationReceived );
+						signalEnd();
+					}
+				});
+			}
+
+
+
+
+
+
+
+
+
+
 		}

 		/**
@@ -402,6 +445,17 @@
 			}
 		}

+		private function getVPAIDMetadata():VPAIDMetadata
+		{
+			if (_playingAd is VAST2TrackingProxyElement && ProxyElement((_playingAd as VAST2TrackingProxyElement).proxiedElement && ProxyElement((_playingAd as VAST2TrackingProxyElement).proxiedElement).proxiedElement)
+			{
+				var vpaidElement:VPAIDElement =ProxyElement((_playingAd as VAST2TrackingProxyElement).proxiedElement).proxiedElement as VPAIDElement;
+				var vpaidMetadata:VPAIDMetadata = vpaidElement.getMetadata(vpaidElement.metadataNamespaceURLs[0]) as VPAIDMetadata;
+				return vpaidMetadata;
+			}
+			return null;
+		}
+
 		private function constructClickTrackings ( vast1ClickTrackings : Vector.<VASTUrl> ) : Array
 		{
 			var clickTrackings : Array = new Array();


Change OSMF NetStreamCodes to utils package

--- src/main/actionscript/com/castlabs/dash/utils/SmoothMonitor.as
+++ src/main/actionscript/com/castlabs/dash/utils/SmoothMonitor.as
@@ -12,7 +12,7 @@
 import flash.events.EventDispatcher;
 import flash.events.NetStatusEvent;

-import org.osmf.net.NetStreamCodes;
+import com.castlabs.dash.utils.NetStreamCodes;

 public class SmoothMonitor {
     private static const ACCEPTED_BUFFERING_COUNT:uint = 1;


Transferred from the Adobe Open Source Subversion Repository

Revision: 6317
Author:   dloverin@adobe.com
Date:     2009-04-28T12:06:11.250167Z

Log Message:
-----------
Update Halo Application ASDoc for backgroundGradientColors

Change backgroundGradientColors from white to undefined.

QE Notes: None.
Doc Notes: None.
Bugs: SDK-19993
Reviewer:
tests: checkintests

Modified Paths:
--------------
/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1269195 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mx/src/mx/core/Application.as
+++ frameworks/projects/mx/src/mx/core/Application.as
@@ -95,7 +95,7 @@
  *  A value of undefined means background gradient is generated
  *  based on the backgroundColor property.
  *
- *  @default [0xFFFFFF, 0xFFFFFF]
+ *  @default undefined
  *
  *  @langversion 3.0
  *  @playerversion Flash 9
@@ -217,7 +217,7 @@
  *
  *    Styles
  *    backgroundGradientAlphas="[ 1.0, 1.0 ]"
- *    backgroundGradientColors="[0xFFFFFF, 0xFFFFFF]"
+ *    backgroundGradientColors="undefined"
  *    horizontalAlign="center|left|right"
  *    horizontalGap="8"
  *    modalTransparency="0.5"


Adds m4v to valid file type allowed <= 10MB

--- flexEditor/src/org/arisgames/editor/components/GameEditorMediaPickerUploadFormView.as
+++ flexEditor/src/org/arisgames/editor/components/GameEditorMediaPickerUploadFormView.as
@@ -183,7 +183,7 @@
 				{
 					trace("File to Upload: Name = '" + fileChooser.fileList[k].name + "'");
 					fileChosen = fileChooser.fileList[k];
-					if(fileChosen.type == "mov"){
+					if(fileChosen.type == "mov" || fileChosen.type == "m4v"){
 						if(fileChosen.size <= AppConstants.MAX_VIDEO_UPLOAD_SIZE){
 							fileName.text = fileChosen.name;
 							fileOK = true;


removed method descriptions, shouldn't have added it


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1265152 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
+++ frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2010 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package spark.skins.mobile
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 88
Author:   open-source-svn-admin@adobe.com
Date:     2008-01-03T22:47:56.499469Z

Log Message:
-----------
Perforce Change 191925 by proberts@proberts-laptop-flex on 2008/01/03 16:47:12 Severity: ignore Details: doc additions/clean up for FlexNativeMenu. Also FLEXDOCS-320 (update documentation for FlexNativeMenuEvent.MENU_SHOW to explain that the index, label, and item properties are null) Affected files ...

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/in/air/air_version.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/Consumer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/NoChannelAvailableError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemHistoryButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/DirectHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemTree.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/HTML.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/config/ServerConfig.as</path>
<path kind="file" action="M">/flex/sdk/trunk/in/air/mac/AIR Integration Kit.tbz2</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingConnectionHandler.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/HTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/MessagingError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/InvalidChannelError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXDecoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractProducer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/MessageSerializationError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/config/ConfigMap.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/Channel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/in/air/win/AIR Integration Kit.zip</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractConsumer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXContext.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/AMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/events/FlexNativeMenuEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/PollingChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/lib/flex-messaging-common.jar</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/NetConnectionChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/remoting/mxml/RemoteObject.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Tree.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/Grammar.jj</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ConsumerMessageDispatcher.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/InvalidDestinationError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXResult.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXEncoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ChannelSet.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FlexNativeMenu.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractMessageStore.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1273691 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/rpc/src/mx/messaging/channels/StreamingConnectionHandler.as
+++ frameworks/projects/rpc/src/mx/messaging/channels/StreamingConnectionHandler.as
@@ -1,21 +1,14 @@
-/*************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * __________________
- *
- *  [2002] - [2007] Adobe Systems Incorporated
- *  All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated
- * and its suppliers and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- */
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2007 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 package mx.messaging.channels
 {

@@ -622,4 +615,4 @@
     }
 }

-}+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 23246
Author:   cframpto@adobe.com
Date:     2011-12-20T17:40:08.069454Z

Log Message:
-----------
Rollback 23243.  If comment followed header it was stripped as well.

Modified Paths:
--------------
2361 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1248453 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/advancedgrids/src/mx/collections/IHierarchicalCollectionViewCursor.as
+++ frameworks/projects/advancedgrids/src/mx/collections/IHierarchicalCollectionViewCursor.as
@@ -1,3 +1,13 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2009 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.collections
 {


Miscellaneous cleanup.

Miscellaneous cleanup.

--- driver/src/main/flex/org/postgresql/febe/FEBEConnection.as
+++ driver/src/main/flex/org/postgresql/febe/FEBEConnection.as
@@ -43,8 +43,6 @@
         private var _brokerFactory:MessageBrokerFactory;
 		private var _broker:MessageBroker;

-        private var _cancelBroker:MessageBroker;
-
         private var _authenticated:Boolean;
         private var _connecting:Boolean;
         private var _connected:Boolean;
@@ -118,8 +116,7 @@
         }

         private function handleUnexpectedMessage(msg:IBEMessage):void {
-            // TODO: this should probably be an error event since it's
-            // happening asynchronously
+            // TODO: this should probably be an error event since it's happening asynchronously
         	throw new ProtocolError("Unexpected message: " + msg.type);
         }

@@ -193,7 +190,7 @@
             if (_queryHandler) {
                 _queryHandler.handleError(msg.fields);
             } else {
-					LOGGER.debug("Non-query error:");
+				LOGGER.debug("Non-query error:");
                 for (var key:String in msg.fields) {
                     LOGGER.debug(key, msg.fields[key]);
                 }
@@ -251,10 +248,10 @@
         	flushPendingResults();
         }

-        // executeSimpleQuery and executeQuery should both notify caller when commandComplete
-        // returns a result set. when rfq, the nesting Connection should issue another query.
-
-        // since these will only have one outstanding statement at any given time, perhaps
+        // Methods executeSimpleQuery and executeQuery should both notify caller when commandComplete
+        // returns a result set. When rfq, the nesting Connection should issue another query.
+
+        // Since these will only have one outstanding statement at any given time, perhaps
         // we should keep that as a member variable while the call is being executed. We
         // need to have some concept of 'outstanding statement' (which could lead to more
         // than one result set for a simple query), and we still need to process notices


Transferred from the Adobe Open Source Subversion Repository

Revision: 17520
Author:   hmuller@adobe.com
Date:     2010-08-30T20:47:16.318727Z

Log Message:
-----------
Added support for dataTips: Grid/DataGrid showDataTips, dataTipField, and dataTipFunction properties.

QE notes: Should have no affect on existing code.
Doc notes:
Bugs: SDK-27063
Reviewer: Darrell
Tests run: checkin, mustella cyclone
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Grid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridColumn.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/DataGrid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DefaultGridItemRenderer.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1278537 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/DataGrid.as
+++ frameworks/projects/spark/src/spark/components/DataGrid.as
@@ -21,6 +21,7 @@

 import mx.collections.IList;
 import mx.core.IFactory;
+import mx.core.IToolTip;
 import mx.core.IVisualElement;
 import mx.core.mx_internal;
 import mx.events.FlexEvent;
@@ -433,8 +434,11 @@
         requestedMinRowCount: uint(1 << 5),
         requestedMinColumnCount: uint(1 << 6),
         rowHeight: uint(1 << 7),
-        typicalItem: uint(1 << 8),
-        variableRowHeight: uint(1 << 9)
+        showDataTips: uint(1 << 8),
+        typicalItem: uint(1 << 9),
+        variableRowHeight: uint(1 << 10),
+        dataTipField: uint(1 << 11),
+        dataTipFunction: uint(1 << 12)
     };

     /**
@@ -463,8 +467,11 @@
         requestedMinRowCount: int(-1),
         requestedMinColumnCount: int(-1),
         rowHeight: NaN,
+        showDataTips: false,
         typicalItem: null,
-        variableRowHeight: true
+        variableRowHeight: true,
+        dataTipField: null,
+        dataTipFunction:null
     };

     /**
@@ -648,6 +655,62 @@
     }

     //----------------------------------
+    //  dataTipField (delegates to grid.dataTipField)
+    //----------------------------------
+
+    [Bindable("dataTipFieldChanged")]
+
+    /**
+     *  @copy spark.components.Grid#dataTipField
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4.5
+     */
+    public function get dataTipField():IFactory
+    {
+        return getGridProperty("dataTipField");
+    }
+
+    /**
+     *  @private
+     */
+    public function set dataTipField(value:IFactory):void
+    {
+        if (setGridProperty("dataTipField", value))
+            dispatchChangeEvent("dataTipFieldChanged");
+    }
+
+    //----------------------------------
+    //  dataTipFunction (delegates to grid.dataTipFunction)
+    //----------------------------------
+
+    [Bindable("dataTipFunctionChanged")]
+
+    /**
+     *  @copy spark.components.Grid#dataTipFunction
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4.5
+     */
+    public function get dataTipFunction():IFactory
+    {
+        return getGridProperty("dataTipFunction");
+    }
+
+    /**
+     *  @private
+     */
+    public function set dataTipFunction(value:IFactory):void
+    {
+        if (setGridProperty("dataTipFunction", value))
+            dispatchChangeEvent("dataTipFunctionChanged");
+    }
+
+    //----------------------------------
     //  gridDimensions (private, read-only)
     //----------------------------------

@@ -682,7 +745,7 @@
     }

     //----------------------------------
-    //  itemRenderer delegates to (delegates to grid.itemRenderer)
+    //  itemRenderer (delegates to grid.itemRenderer)
     //----------------------------------

     [Bindable("itemRendererChanged")]
@@ -950,7 +1013,38 @@
     {
         const mode:String = selectionMode;
         return mode == GridSelectionMode.SINGLE_CELL || mode == GridSelectionMode.MULTIPLE_CELLS;
-    }
+    }
+
+    //----------------------------------
+    //  showDataTips
+    //----------------------------------
+
+    [Bindable("showDataTipsChanged")]
+    [Inspectable(category="Data", defaultValue="false")]
+
+    /**
+     *  @copy spark.components.Grid#showDataTips
+     *
+     *  @default false
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 2.0
+     *  @productversion Flex 4.5
+     */
+    public function get showDataTips():Boolean
+    {
+        return getGridProperty("showDataTips");
+    }
+
+    /**
+     *  @private
+     */
+    public function set showDataTips(value:Boolean):void
+    {
+        if (setGridProperty("showDataTips", value))
+            dispatchChangeEvent("showDataTipsChanged");
+    }

     //----------------------------------
     //  typicalItem delegates to (delegates to grid.typicalItem)
@@ -2789,7 +2883,7 @@
             // positions.
             setSelectionAnchorCaret(rowIndex, columnIndex);
         }
-    }
+    }

     //--------------------------------------------------------------------------
     //


Transferred from the Adobe Open Source Subversion Repository

Revision: 22114
Author:   eday@adobe.com
Date:     2011-08-19T22:14:35.761876Z

Log Message:
-----------
Backing out two most recent changes

QE notes:
Doc notes:
Bugs:
Reviewer:
Tests run:
Is noteworthy for integration: no

Modified Paths:
--------------
/private/flex/sdk/branches/4.y/frameworks/projects/spark/src/spark/components/Scroller.as

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1280537 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/Scroller.as
+++ frameworks/projects/spark/src/spark/components/Scroller.as
@@ -1422,11 +1422,6 @@
         else if (canScrollVertically)
             scrollProperty = VERTICAL_SCROLL_POSITION;

-        // If there's an animation playing, we need
-        // to stop it before we snap the element into
-        // position.
-        stopAnimations();
-
         if (animate)
         {
             if (!snapElementAnimation)
@@ -1448,18 +1443,6 @@
 			return null;
         }
     }
-
-    /**
-     *  @private
-     */
-    private function stopAnimations():void
-    {
-        if (throwEffect && throwEffect.isPlaying)
-            throwEffect.stop();
-        if (snapElementAnimation && snapElementAnimation.isPlaying)
-            snapElementAnimation.stop();
-    }
-

     //--------------------------------------------------------------------------
     //
@@ -2541,12 +2524,6 @@
             {
                 installTouchListeners();

-                // Need to make sure the scroll ranges are updated now, since they may
-                // not have been if the scroller was in non-touch mode when the content
-                // was created/changed.
-                scrollRangesChanged = true;
-                invalidateProperties();
-
                 if (!touchScrollHelper)
                 {
                     touchScrollHelper = new TouchScrollHelper();
@@ -2669,14 +2646,12 @@

         if (pageScrollingChanged)
         {
-            stopAnimations();
             determineCurrentPageScrollPosition();
             pageScrollingChanged = false;
         }

         if (snappingModeChanged)
         {
-            stopAnimations();
             snapContentScrollPosition();
             snappingModeChanged = false;
         }
@@ -3030,12 +3005,6 @@
     private function mouseDownHandler(event:MouseEvent):void
     {
         stopThrowEffectOnMouseDown();
-
-        // If the snap animation is playing, we need to stop it
-        // before watching for a scroll and potentially beginning
-        // a new touch interaction.
-        if (snapElementAnimation && snapElementAnimation.isPlaying)
-            snapElementAnimation.stop();

         captureNextClick = false;


No Automatic Bitrate Changing Fix (Issue #21) Added some simple code converting data related to bandwidth from bits to kilobits because OSMF works in kilobits. This now enables automatic bitrate changing to occur normally.

--- HLSPlugin/src/com/kaltura/hls/manifest/HLSManifestStream.as
+++ HLSPlugin/src/com/kaltura/hls/manifest/HLSManifestStream.as
@@ -51,7 +51,8 @@
 							newNote.programId = parseInt(accum);
 							break;
 						case "BANDWIDTH":
-							newNote.bandwidth = parseInt(accum);
+							// We devide this value by 1000 to convert into Kilobits
+							newNote.bandwidth = parseInt(accum) / 1000;
 							break;
 						case "CODECS":
 							newNote.codecs = accum;


mold -> element

mold -> element

--- exporter/src/main/as/flump/xfl/XflLibrary.as
+++ exporter/src/main/as/flump/xfl/XflLibrary.as
@@ -90,8 +90,8 @@
         return getErrors(ParseError.CRIT).length == 0;
     }

-    public function addError(mold :LibraryElement, severity :String, message :String, e :Object=null) :void {
-        _errors.push(new ParseError(mold.location, severity, message, e));
+    public function addError(element :LibraryElement, severity :String, message :String, e :Object=null) :void {
+        _errors.push(new ParseError(element.location, severity, message, e));
     }

     public function toMold (atlases :Vector.<Atlas>) :LibraryMold {


Transferred from the Adobe Open Source Subversion Repository

Revision: 21645
Author:   chiedozi@adobe.com
Date:     2011-07-20T17:26:18.680467Z

Log Message:
-----------
Reverting checkin 21626 due to mustella failures

QE notes:
Doc notes:
Bugs:
Reviewer:
Tests run:
Is noteworthy for integration:

Modified Paths:
--------------
/private/flex/sdk/branches/4.y/frameworks/projects/mobilecomponents/src/spark/components/TabbedViewNavigator.as

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1264093 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/mobilecomponents/src/spark/components/TabbedViewNavigator.as
+++ frameworks/projects/mobilecomponents/src/spark/components/TabbedViewNavigator.as
@@ -43,6 +43,8 @@
 import spark.events.RendererExistenceEvent;

 use namespace mx_internal;
+
+[DefaultProperty("navigators")]

 //--------------------------------------
 //  Events
@@ -170,8 +172,7 @@
     {
         super();

-        addEventListener(ElementExistenceEvent.ELEMENT_ADD, elementAddHandler);
-        addEventListener(ElementExistenceEvent.ELEMENT_REMOVE, elementRemoveHandler);
+        _navigators = new Vector.<ViewNavigatorBase>();
     }

     //--------------------------------------------------------------------------
@@ -342,6 +343,8 @@
     //  navigators
     //----------------------------------

+    private var _navigators:Vector.<ViewNavigatorBase>;
+
     /**
      *  The view navigators that are managed by this TabbedViewNavigator.
      *  Each view navigator is represented as a tab in the tab bar
@@ -360,17 +363,7 @@
      */
     public function get navigators():Vector.<ViewNavigatorBase>
     {
-        var mxmlContent:Array = currentContentGroup.getMXMLContent();
-
-        if (!mxmlContent)
-            return null;
-
-        // When this class was first released, navigators was typed Vector
-        // and not Array.  In 4.5.2, TabbedViewNavigator moved away from this
-        // model and uses mxmlContent to manage children.  To maintain backwards
-        // compatibility, the return type for this method remained the same.
-        // As a result, the mxmlContent array will need to converted.
-        return Vector.<ViewNavigatorBase>(mxmlContent);
+        return _navigators;
     }

     /**
@@ -378,18 +371,38 @@
      */
     public function set navigators(value:Vector.<ViewNavigatorBase>):void
     {
-        // When this class was first released, navigators was typed Vector
-        // and not Array.  In 4.5.2, TabbedViewNavigator moved away from this
-        // model and uses mxmlContent to manage children.  To maintain backwards
-        // compatibility, the return type for this method remained the same.
-        // As a result, the value vector needs to be converted to an array
-        var contentArray:Array = new Array();
-
-        for each (var navigator:ViewNavigatorBase in value)
-            contentArray.push(navigator);
-
-        mxmlContent = contentArray;
-
+        var i:int;
+        var navigator:ViewNavigatorBase;
+
+        // These flags are updated at the beginning of the method so
+        // that the selectedIndex setter doesn't ignore passed in value
+        dataProviderChanged = true;
+        invalidateProperties();
+
+        // Clean up and remove all the previous navigators from the display list
+        if (_navigators)
+        {
+            for (i = 0; i < _navigators.length; ++i)
+            {
+                navigator = _navigators[i];
+
+                cleanUpNavigator(navigator);
+                removeElement(navigator);
+            }
+        }
+
+        _navigators = value ? value.concat() : null;
+
+        if (value)
+        {
+            for (i = 0; i < value.length; ++i)
+            {
+                navigator = _navigators[i];
+                addElement(navigator);
+                setupNavigator(navigator);
+            }
+        }
+
         if (value && value.length > 0)
         {
             // Reset selectedIndex to -1 and proposed index to 0 so that the appropriate
@@ -404,10 +417,6 @@
         // The proposed selected index is reset because it is no longer valid
         // since the array of navigators has changed.
         selectedIndexChanged = false;
-
-        // Invalidate property flags
-        dataProviderChanged = true;
-        invalidateProperties();

         // Notify listeners that the collection changed
         internalDispatchEvent(CollectionEventKind.RESET);
@@ -431,10 +440,10 @@
      */
     public function get selectedNavigator():ViewNavigatorBase
     {
-        if (length == 0 || selectedIndex < 0 || selectedIndex >= length)
+        if (!navigators || length == 0 || selectedIndex < 0)
             return null;

-        return getElementAt(selectedIndex) as ViewNavigatorBase;
+        return navigators[selectedIndex];
     }

     //--------------------------------------------------------------------------
@@ -602,28 +611,6 @@

     /**
      *  @private
-     */
-    private function addNavigatorListeners(navigator:ViewNavigatorBase):void
-    {
-        navigator.addEventListener("viewChangeComplete", navigator_viewChangeCompleteHandler);
-        navigator.addEventListener("viewChangeStart", navigator_viewChangeStartHandler);
-        navigator.addEventListener(ElementExistenceEvent.ELEMENT_ADD, navigator_elementAddHandler);
-        navigator.addEventListener(ElementExistenceEvent.ELEMENT_REMOVE, navigator_elementRemoveHandler);
-    }
-
-    /**
-     *  @private
-     */
-    private function removeNavigatorListeners(navigator:ViewNavigatorBase):void
-    {
-        navigator.removeEventListener("viewChangeComplete", navigator_viewChangeCompleteHandler);
-        navigator.removeEventListener("viewChangeStart", navigator_viewChangeStartHandler);
-        navigator.removeEventListener(ElementExistenceEvent.ELEMENT_ADD, navigator_elementAddHandler);
-        navigator.removeEventListener(ElementExistenceEvent.ELEMENT_REMOVE, navigator_elementRemoveHandler);
-    }
-
-    /**
-     *  @private
      */
     private function setupNavigator(navigator:ViewNavigatorBase):void
     {
@@ -654,7 +641,11 @@
                 view_propertyChangeHandler);
         }

-        removeNavigatorListeners(navigator);
+        navigator.removeEventListener(ElementExistenceEvent.ELEMENT_ADD,
+            navigator_elementAddHandler);
+        navigator.removeEventListener(ElementExistenceEvent.ELEMENT_REMOVE,
+            navigator_elementRemoveHandler);
+
         stopTrackingUpdates(navigator);
     }

@@ -678,9 +669,9 @@

             // If the data provider has changed, the navigator elements have
             // already been removed, so the following code doesn't need to run
-            if (!selectedIndexAdjusted && !dataProviderChanged && _selectedIndex >= 0 && _selectedIndex < length)
+            if (!selectedIndexAdjusted && !dataProviderChanged && _selectedIndex >= 0)
             {
-                navigator = getElementAt(_selectedIndex) as ViewNavigatorBase;
+                navigator = navigators[_selectedIndex];
                 navigator.setActive(false, !maintainNavigationStack);
                 navigator.visible = false;
                 navigator.includeInLayout = false;
@@ -689,20 +680,28 @@
                     navigator.activeView.removeEventListener(PropertyChangeEvent.PROPERTY_CHANGE,
                                                                 view_propertyChangeHandler);

-                removeNavigatorListeners(navigator);
+                // Private event dispatched when a view has finished transitioning
+                navigator.removeEventListener("viewChangeComplete", navigator_viewChangeCompleteHandler);
+                navigator.removeEventListener("viewChangeStart", navigator_viewChangeStartHandler);
+                navigator.removeEventListener(ElementExistenceEvent.ELEMENT_ADD, navigator_elementAddHandler);
+                navigator.removeEventListener(ElementExistenceEvent.ELEMENT_REMOVE, navigator_elementRemoveHandler);
             }

             commitSelection();

             if (_selectedIndex >= 0)
             {
-                navigator = getElementAt(_selectedIndex) as ViewNavigatorBase;
+                navigator = navigators[_selectedIndex];
+
+                navigator.addEventListener("viewChangeComplete", navigator_viewChangeCompleteHandler);
+                navigator.addEventListener("viewChangeStart", navigator_viewChangeStartHandler);
+                navigator.addEventListener(ElementExistenceEvent.ELEMENT_ADD, navigator_elementAddHandler);
+                navigator.addEventListener(ElementExistenceEvent.ELEMENT_REMOVE, navigator_elementRemoveHandler);
+
                 navigator.setActive(true);
                 navigator.visible = true;
                 navigator.includeInLayout = true;
-
-                addNavigatorListeners(navigator);
-
+
                 // Update the states of the controls on the newly activated view navigator.
                 // The updateControlsForView() method will automatically bubble up to all
                 // parents of the navigator.
@@ -712,7 +711,7 @@
                 // occurring in cases where multiple validation passes are required
                 // to completely validate a view
                 if (initialized)
-                    currentContentGroup.validateNow();
+                    contentGroup.validateNow();

                 if (navigator.activeView)
                 {
@@ -998,14 +997,9 @@

         if (savedStacks)
         {
-            var navigator:ViewNavigatorBase;
             var len:Number = Math.min(savedStacks.length, length);
-
-            for (var i:int = 0; i < len; i++)
-            {
-                navigator = getElementAt(i) as ViewNavigatorBase;
-                navigator.loadViewData(savedStacks[i]);
-            }
+            for (var i:int = 0; i < len; ++i)
+                navigators[i].loadViewData(savedStacks[i]);
         }
     }

@@ -1015,16 +1009,20 @@
     override public function saveViewData():Object
     {
         var savedData:Object = super.saveViewData();
-        var childrenStates:Vector.<Object> = new Vector.<Object>();
-
-        for (var i:int = 0; i < length; i++)
-            childrenStates.push((getElementAt(i) as ViewNavigatorBase).saveViewData());
-
-        if (!savedData)
-            savedData = {};
-
-        savedData.selectedIndex = selectedIndex;
-        savedData.childrenStates = childrenStates;
+
+        if (navigators)
+        {
+            var childrenStates:Vector.<Object> = new Vector.<Object>();
+
+            for (var i:int = 0; i < navigators.length; ++i)
+                childrenStates.push(navigators[i].saveViewData());
+
+            if (!savedData)
+                savedData = {};
+
+            savedData.selectedIndex = selectedIndex;
+            savedData.childrenStates = childrenStates;
+        }

         return savedData;
     }
@@ -1075,24 +1073,6 @@
     {
         if (!indexCanChange(event.newIndex))
             event.preventDefault();
-    }
-
-    /**
-     *  @private
-     */
-    private function elementRemoveHandler(event:ElementExistenceEvent):void
-    {
-        cleanUpNavigator(event.element as ViewNavigatorBase);
-        internalDispatchEvent(CollectionEventKind.REMOVE, event.element, event.index);
-    }
-
-    /**
-     *  @private
-     */
-    private function elementAddHandler(event:ElementExistenceEvent):void
-    {
-        setupNavigator(event.element as ViewNavigatorBase);
-        internalDispatchEvent(CollectionEventKind.ADD, event.element, event.index);
     }

     /**
@@ -1330,7 +1310,10 @@
      */
     public function get length():int
     {
-        return numElements;
+        if (!_navigators)
+            return 0;
+
+        return _navigators.length;
     }

     /**
@@ -1382,8 +1365,12 @@
             throw new RangeError(message);
         }

+        navigators.splice(index, 0, item);
+
         setupNavigator(ViewNavigatorBase(item));
         addElementAt(ViewNavigatorBase(item), index);
+
+        internalDispatchEvent(CollectionEventKind.ADD, item, index);

         if (selectedIndex == NO_PROPOSED_SELECTION)
         {
@@ -1421,7 +1408,7 @@
             throw new RangeError(message);
         }

-        return getElementAt(index);
+        return navigators[index];
     }

     /**
@@ -1438,7 +1425,7 @@
      */
     public function getItemIndex(item:Object):int
     {
-        return getElementIndex(item as ViewNavigatorBase);
+        return navigators.indexOf(item);
     }

     /**
@@ -1486,12 +1473,27 @@
      */
     public function removeAll():void
     {
+        var item:IVisualElement;
+        var len:int = length;
+
         // Deactive the active navigator and its view
         if (selectedNavigator)
             selectedNavigator.setActive(false);

-        // Remove all navigators
-        navigators = null;
+        for (var i:int = 0; i < len; i++)
+        {
+            item = _navigators[i];
+            cleanUpNavigator(ViewNavigatorBase(item));
+            removeElement(item);
+        }
+
+        navigators.length = 0;
+        selectedIndex = NO_PROPOSED_SELECTION;
+        dataProviderChanged = true;
+
+        invalidateProperties();
+
+        internalDispatchEvent(CollectionEventKind.RESET);
     }

     /**
@@ -1523,7 +1525,13 @@
             selectedIndexAdjusted = true;
         }

-        var removed:Object = removeElementAt(index);
+        var removed:Object = _navigators.splice(index, 1)[0];
+
+        cleanUpNavigator(ViewNavigatorBase(removed));
+        removeElement(IVisualElement(removed));
+
+        internalDispatchEvent(CollectionEventKind.REMOVE, removed, index);
+
         return removed;
     }

@@ -1558,8 +1566,11 @@
             throw new RangeError(message);
         }

-        var oldItem:Object = removeElementAt(index);
-        addElementAt(item as ViewNavigatorBase, index);
+        var oldItem:Object = _navigators[index];
+        _navigators[index] = item as ViewNavigatorBase;
+
+        cleanUpNavigator(ViewNavigatorBase(oldItem));
+        setupNavigator(ViewNavigatorBase(item));

         if (hasEventListener(CollectionEvent.COLLECTION_CHANGE))
         {
@@ -1589,7 +1600,15 @@
      */
     public function toArray():Array
     {
-        return contentGroup.getMXMLContent();
+        var n:int = _navigators.length;
+        var arraySource:Array = new Array(n);
+
+        for (var i:int = 0; i < n; i++)
+        {
+            arraySource[i] = _navigators[i];
+        }
+
+        return arraySource;
     }

     /**


Bugfix: user cookies should be validated as serializable.
This breaks UD's current cookie mechanism, but it's easily fixed.

git-svn-id: a3e1eb16dde062992de22c830ed8045c8013209a@350 c613c5cb-e716-0410-b11b-feb51c14d237

--- src/as/com/threerings/ezgame/client/GameControlBackend.as
+++ src/as/com/threerings/ezgame/client/GameControlBackend.as
@@ -432,6 +432,7 @@
     public function setUserCookie_v1 (cookie :Object) :Boolean
     {
         validateConnected();
+        validateValue(cookie);
         var ba :ByteArray =
             (EZObjectMarshaller.encode(cookie, false) as ByteArray);
         if (ba.length > MAX_USER_COOKIE) {


tests

tests

--- src/com/kemsky/impl/Stream.as
+++ src/com/kemsky/impl/Stream.as
@@ -190,8 +190,11 @@
             var dict:Dictionary = new Dictionary(weak);
             for each (var item:* in source)
             {
-                var value:* = item[property];
-                dict[value] = item;
+                if(item.hasOwnProperty(property))
+                {
+                    var value:* = item[property];
+                    dict[value] = item;
+                }
             }
             return dict;
         }
@@ -206,8 +209,11 @@
             var dict:Object = {};
             for each (var item:* in source)
             {
-                var value:* = item[property];
-                dict[value] = item;
+                if(item.hasOwnProperty(property))
+                {
+                    var value:* = item[property];
+                    dict[value] = item;
+                }
             }
             return dict;
         }


Transferred from the Adobe Open Source Subversion Repository

Revision: 23247
Author:   cframpto@adobe.com
Date:     2011-12-20T19:21:13.134833Z

Log Message:
-----------
Remove ADOBE SYSTEMS license and replace with Apache license in headers - frameworks.  A 2nd pass will be needed to get the files not handled up by the scripts.

Modified Paths:
--------------
4959 paths were modified

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1251666 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation/src/mx/automation/tabularData/OLAPDataGridTabularData.as
+++ frameworks/projects/automation/src/mx/automation/tabularData/OLAPDataGridTabularData.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2009 Adobe Systems Incorporated
-//  All Rights Reserved.
-//
-//  NOTICE: Adobe permits you to use, modify, and distribute this file
-//  in accordance with the terms of the license agreement accompanying it.
+//  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.
 //
 ////////////////////////////////////////////////////////////////////////////////


Transferred from the Adobe Open Source Subversion Repository

Revision: 1098
Author:   jimurphy@adobe.com
Date:     2008-04-03T21:50:39.896200Z

Log Message:
-----------
Merge 3.0.x -- 362:394, 427:429, 603:608, 644:645, 651:663, 672:676, 755:756, 763:766, 785:790, 812:814, 854:861, 862:866, 866:933,971:1009, 1050:1056 --> trunk

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/treeClasses/DefaultDataDescriptor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VRule.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/AsyncRequest.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/IList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/LayoutManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingConnectionHandler.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IRepeaterClient.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/videoClasses/VideoError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/ObjectProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/messages/HTTPRequestMessage.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/Locale.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/effectClasses/ParallelInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/Responder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/MessageSerializationError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/messages/SOAPMessage.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IBrowserManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ComponentDescriptor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/FaultEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridColumn.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/IViewCursor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/AbstractWebService.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Tween.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/DragManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/menuClasses/IMenuItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/MessageResponder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/preloaders/Preloader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ILayoutManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Spacer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/Fault.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/XMLListCollection.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/EffectTargetFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/SliderEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/AsyncToken.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/core/Window.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/ResourceManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/ScrollEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/http/mxml/HTTPService.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/videoClasses/CuePointManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/NumericStepperEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/BrowserManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/events/ChannelFaultEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/CursorBookmark.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/xml/IXMLEncoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/http/HTTPService.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/WSDLLoadEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/LoadEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ListCollectionView.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/FlexClient.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/SubscriptionInfo.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/DescribeTypeCache.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/logging/LogLogger.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/MessageAgent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/build_framework.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/WindowedSystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/HeaderEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/build.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridDragProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/preloaders/DownloadProgressBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/treeClasses/ITreeDataDescriptor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/remoting/RemoteObject.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListItemDragProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ChannelSet.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1274284 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/rpc/src/mx/rpc/remoting/RemoteObject.as
+++ frameworks/projects/rpc/src/mx/rpc/remoting/RemoteObject.as
@@ -151,7 +151,7 @@
      * important properties such as the destination id and the set of
      * channels assigned.
      *
-     * @return A String representing an instance of a RemoteObject.
+     * @return Returns a String representing an instance of a RemoteObject.
      */
     public function toString():String
     {
@@ -164,4 +164,4 @@
     }
 }

-}+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 12324
Author:   smgilson@adobe.com
Date:     2009-12-01T16:08:24.785393Z

Log Message:
-----------
ASDoc updates in preparation for localization

QE notes: -
Doc notes: -
Bugs: -
Reviewer: -
Tests run: - checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DropDownList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Group.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/BorderContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataGroup.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1278397 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/ButtonBar.as
+++ frameworks/projects/spark/src/spark/components/ButtonBar.as
@@ -78,6 +78,15 @@
  *          <s:Label text="Account Info"/>
  *          </s:NavigatorContent>
  *      </mx:ViewStack>

+ *
+ *
The ButtonBar control has the following default characteristics:

+ *

+ *
Characteristic	Description

+ *
Default size	Large enough to display all buttons

+ *
Minimum size	0 pixels

+ *
Maximum size	No limit

+ *
Default skin class	spark.skins.spark.ButtonBarSkin

+ *

  *
  *  @mxml
The <s:ButtonBar> tag inherits all of the tag
  *  attributes of its superclass and adds the following tag attributes:


Transferred from the Adobe Open Source Subversion Repository

Revision: 8487
Author:   smgilson@adobe.com
Date:     2009-07-09T18:57:21.985536Z

Log Message:
-----------
final checkin to update the namespace in ASDoc MXML syntax descriptions for Spark components

QE Notes: None
Doc Notes: None
Bugs: -
Checkintests: passed

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/EaseInOutBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Fade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/animation/MotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ColorMatrixFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Power.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/BlurFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/DisplacementMapFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ShaderFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/DropShadowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/CallAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientBevelFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Scale3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Animate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransitionShader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Rotate3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AddAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Scale.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/Graphic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Move3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Rotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/BasicLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Resize.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransform3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Wipe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Sine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GlowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/HorizontalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/TileLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/ConvolutionFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Linear.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/animation/Keyframe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientGlowFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/SetAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/RemoveAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/BevelFilter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/filters/GradientFilter.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1283440 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/effects/AnimateColor.as
+++ frameworks/projects/spark/src/spark/effects/AnimateColor.as
@@ -22,7 +22,7 @@
  *
  *  @mxml
  *
- *
The <mx:AnimateColor> tag
+ *
The <s:AnimateColor> tag
  *  inherits all of the tag attributes of its superclass,
  *  and adds the following tag attributes:

  *


- Prevent weirdness when trying to remove our child.. someone we may get
  a ROLL_OUT without having first got a ROLL_OVER?
- Clicks that land on the video control should be stopped there and not
  allowed to trickle back up, potentially triggering the furni action that
  someone's set on the video.

git-svn-id: a1a4b28b82a3276cc491891159dd9963a0a72fae@4611 542714f4-19e9-0310-aa3c-eee0fc999fb1

--- src/as/com/threerings/util/VideoDisplayer.as
+++ src/as/com/threerings/util/VideoDisplayer.as
@@ -123,11 +123,16 @@

     protected function handleRollOut (event :MouseEvent) :void
     {
-        removeChild(_pauser);
+        if (_pauser.parent) {
+            removeChild(_pauser);
+        }
     }

     protected function handleClick (event :MouseEvent) :void
     {
+        // the buck stops here!
+        event.stopImmediatePropagation();
+
         if (_paused) {
             _netStream.resume();
             _paused = false;


adjusted callLater priority

adjusted callLater priority

--- WeaveData/src/weave/data/DataSources/AbstractDataSource.as
+++ WeaveData/src/weave/data/DataSources/AbstractDataSource.as
@@ -171,7 +171,8 @@
 			if (initializationComplete)
 			{
 				_proxyColumns[column] = false; // no longer pending
-				WeaveAPI.StageUtils.callLater(column, requestColumnFromSourceLater, [column]);
+				// immediate priority because we want to start the async column tasks as soon as possible.
+				WeaveAPI.StageUtils.callLater(column, requestColumnFromSourceLater, [column], WeaveAPI.TASK_PRIORITY_IMMEDIATE);
 			}
 			else
 			{


Transferred from the Adobe Open Source Subversion Repository

Revision: 20845
Author:   mhorn@adobe.com
Date:     2011-03-14T15:29:23.391952Z

Log Message:
-----------
merge 20756,20790,20712,20805

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/formatters/NumberFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/CSSCondition.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ISortField.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/formatters/CurrencyFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/BitmapFill.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/formatters/DateTimeFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/charts/src/mx/charts/chartClasses/CartesianChart.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/GradientStroke.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ArrayList.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/GradientBase.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/charts/src/mx/charts/chartClasses/PolarChart.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodgeShader.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/charts/src/mx/charts/chartClasses/PolarDataCanvas.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/charts/src/mx/charts/series/PlotSeries.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/OnDemandEventDispatcher.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/TabBar.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/SolidColorStroke.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/CSSStyleDeclaration.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/advancedgrids/src/mx/collections/HierarchicalCollectionViewCursor.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/Transform.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/globalization/StringTools.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/StringUtil.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/charts/src/mx/charts/series/CandlestickSeries.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/FlexEvent.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/CompoundTransform.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as</path>
<path kind="dir" action="M">/private/flex/sdk/trunk</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/binding/utils/ChangeWatcher.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/LinearGradientStroke.as</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1248431 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/advancedgrids/src/mx/collections/HierarchicalCollectionViewCursor.as
+++ frameworks/projects/advancedgrids/src/mx/collections/HierarchicalCollectionViewCursor.as
@@ -304,6 +304,9 @@
     /**
      *  @inheritDoc
      *
+     *
Note that for this class, the view does not need to be sorted in order to
+     *  call this method.

+     *
      *  @langversion 3.0
      *  @playerversion Flash 9
      *  @playerversion AIR 1.1
@@ -340,6 +343,9 @@
     /**
      *  @inheritDoc
      *
+     *
Note that for this class, the view does not need to be sorted in order to
+     *  call this method.

+     *
      *  @langversion 3.0
      *  @playerversion Flash 9
      *  @playerversion AIR 1.1
@@ -352,6 +358,9 @@

     /**
      *  @inheritDoc
+     *
+     *
Note that for this class, the view does not need to be sorted in order to
+     *  call this method.

      *
      *  @langversion 3.0
      *  @playerversion Flash 9
@@ -421,8 +430,8 @@
                     try
                     {
                         currentNode = childCursor.current;
-						// update parent map
-						updateParentMap(currentNode);
+                        // update parent map
+                        updateParentMap(currentNode);
                     }
                     catch (e:ItemPendingError)
                     {
@@ -580,8 +589,8 @@
                 }
             }
         }
-
-		updateParentMap(currentNode);
+
+        updateParentMap(currentNode);

         currentIndex++;
         return true;
@@ -739,7 +748,7 @@
             }
         }

-		updateParentMap(currentNode);
+        updateParentMap(currentNode);

         currentIndex--;
         return true;
@@ -899,20 +908,20 @@
         }
         return true;
     }
-
-	/**
-	 * @private
-	 * Update the parent map.
-	 */
-	private function updateParentMap(currentNode:Object):void
-	{
-		if (currentNode != null)
-		{
-			var uid:String = UIDUtil.getUID(currentNode);
-			if (!collection.parentMap.hasOwnProperty(uid))
-				collection.parentMap[uid] = parentNodes[parentNodes.length - 1];
-		}
-	}
+
+    /**
+     * @private
+     * Update the parent map.
+     */
+    private function updateParentMap(currentNode:Object):void
+    {
+        if (currentNode != null)
+        {
+            var uid:String = UIDUtil.getUID(currentNode);
+            if (!collection.parentMap.hasOwnProperty(uid))
+                collection.parentMap[uid] = parentNodes[parentNodes.length - 1];
+        }
+    }

     /**
      *  @private
@@ -1298,14 +1307,14 @@
             // dispatch CURSOR_UPDATE event
             collection.dispatchEvent(new FlexEvent(FlexEvent.CURSOR_UPDATE));
         }
-		else if (event.kind == CollectionEventKind.REFRESH)
-		{
-			// find the correct index of the item
-			if (!(beforeFirst || afterLast))
-			{
-				findFirst(current);
-			}
-		}
+        else if (event.kind == CollectionEventKind.REFRESH)
+        {
+            // find the correct index of the item
+            if (!(beforeFirst || afterLast))
+            {
+                findFirst(current);
+            }
+        }
     }
 }