332 lining up naming conventions. functions that assume their out param exists begin with 'set'. functions that create a new object if their out param is null begin with 'make'.  also changed * (1/255) back to / 255, I really don't think it's going to be a bottleneck, ever

--- raw/src/org/yellcorp/lib/color/ColorTransformUtil.as
+++ raw/src/org/yellcorp/lib/color/ColorTransformUtil.as
@@ -6,7 +6,263 @@

 public class ColorTransformUtil
 {
-    public static function copyColorMatrix(m:Array, out:ColorTransform = null):ColorTransform
+    public static function clear(out:ColorTransform):ColorTransform
+    {
+        out.redMultiplier   =
+        out.greenMultiplier =
+        out.blueMultiplier  =
+        out.alphaMultiplier = 1;
+        out.redOffset       =
+        out.greenOffset     =
+        out.blueOffset      =
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeNegative(out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        out.redMultiplier   = -1;
+        out.greenMultiplier = -1;
+        out.blueMultiplier  = -1;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = 255;
+        out.greenOffset     = 255;
+        out.blueOffset      = 255;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeMultiply(c:uint, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var r:Number = (c >> 16) & 0xFF;
+        var g:Number = (c >>  8) & 0xFF;
+        var b:Number = c & 0xFF;
+
+        out.redMultiplier   = r / 255;
+        out.greenMultiplier = g / 255;
+        out.blueMultiplier  = b / 255;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       =
+        out.greenOffset     =
+        out.blueOffset      =
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeAdd(c:uint, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var r:Number = (c >> 16) & 0xFF;
+        var g:Number = (c >>  8) & 0xFF;
+        var b:Number = c & 0xFF;
+
+        out.redMultiplier   =
+        out.greenMultiplier =
+        out.blueMultiplier  =
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = r;
+        out.greenOffset     = g;
+        out.blueOffset      = b;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeScreen(c:uint, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var r:int = (c >> 16) & 0xFF;
+        var g:int = (c >>  8) & 0xFF;
+        var b:int = c & 0xFF;
+
+        out.redMultiplier   = 1 - r / 255;
+        out.greenMultiplier = 1 - g / 255;
+        out.blueMultiplier  = 1 - b / 255;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = r;
+        out.greenOffset     = g;
+        out.blueOffset      = b;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeTint(c:uint, amount:Number = 1.0, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var r:int = (c >> 16) & 0xFF;
+        var g:int = (c >>  8) & 0xFF;
+        var b:int = c & 0xFF;
+
+        out.redMultiplier   =
+        out.greenMultiplier =
+        out.blueMultiplier  = 1 - amount;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = r * amount;
+        out.greenOffset     = g * amount;
+        out.blueOffset      = b * amount;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeMap(newBlack:uint, newWhite:uint, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var br:int = (newBlack >> 16) & 0xFF;
+        var bg:int = (newBlack >>  8) & 0xFF;
+        var bb:int = newBlack & 0xFF;
+
+        var wr:int = (newWhite >> 16) & 0xFF;
+        var wg:int = (newWhite >>  8) & 0xFF;
+        var wb:int = newWhite & 0xFF;
+
+        out.redMultiplier   = (wr - br) / 255;
+        out.greenMultiplier = (wg - bg) / 255;
+        out.blueMultiplier  = (wb - bb) / 255;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = br;
+        out.greenOffset     = bg;
+        out.blueOffset      = bb;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeRangeMap(fromLow:uint, fromHigh:uint,
+                                        toLow:uint,   toHigh:uint,
+                                        out:ColorTransform = null):ColorTransform
+    {
+
+        var fr0:int = (fromLow >> 16) & 0xFF;
+        var fg0:int = (fromLow >>  8) & 0xFF;
+        var fb0:int = fromLow & 0xFF;
+
+        var fr1:int = (fromHigh >> 16) & 0xFF;
+        var fg1:int = (fromHigh >>  8) & 0xFF;
+        var fb1:int = fromHigh & 0xFF;
+
+        var tr0:int = (toLow >> 16) & 0xFF;
+        var tg0:int = (toLow >>  8) & 0xFF;
+        var tb0:int = toLow & 0xFF;
+
+        var tr1:int = (toHigh >> 16) & 0xFF;
+        var tg1:int = (toHigh >>  8) & 0xFF;
+        var tb1:int = toHigh & 0xFF;
+
+        if (!out) out = new ColorTransform();
+
+        // this elaborate dance is to absorb div/0 errors.  considered
+        // throwing an exception or letting NaNs propagate, but because the
+        // output range is clamped, +/-Inf can be swapped for any
+        // appropriately out-of-range finite number.  this plus plenty of
+        // conceivable use cases where inRange = 0 makes it possible to
+        // fix the input values instead of rejecting them
+
+        var scaleR:Number = (fr1 - fr0);
+        var scaleG:Number = (fg1 - fg0);
+        var scaleB:Number = (fb1 - fb0);
+
+        // this magic number is taken from the maximum multiplier before
+        // ColorMatrixFilter ditches SSE acceleration.  even though this
+        // is a ColorTransform instead but it's a reasonable assumption
+
+        // this number means a 1 or -1 difference in the target range will
+        // scale to +/-4000, then get divided by 255 to get a multiplier of
+        // +/-15.686.  SSE is ditched at +/-15.99
+        if (scaleR == 0) scaleR = 0.00025;
+        if (scaleG == 0) scaleG = 0.00025;
+        if (scaleB == 0) scaleB = 0.00025;
+
+        scaleR = (tr1 - tr0) / scaleR;
+        scaleG = (tg1 - tg0) / scaleG;
+        scaleB = (tb1 - tb0) / scaleB;
+
+        out.redMultiplier   = ((255 - fr0) * scaleR + tr0) / 255;
+        out.greenMultiplier = ((255 - fg0) * scaleG + tg0) / 255;
+        out.blueMultiplier  = ((255 - fb0) * scaleB + tb0) / 255;
+        out.alphaMultiplier = 1;
+
+        out.redOffset       = -fr0 * scaleR + tr0;
+        out.greenOffset     = -fg0 * scaleG + tg0;
+        out.blueOffset      = -fb0 * scaleB + tb0;
+        out.alphaOffset     = 0;
+
+        return out;
+    }
+
+    public static function makeLevels(blackPoint:Number, whitePoint:Number, channels:uint = 7, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var factor:Number = 255 / (whitePoint - blackPoint);
+        var offset:Number = -blackPoint * factor;
+
+        if (channels & BitmapDataChannel.RED)
+        {
+            out.redMultiplier = factor;
+            out.redOffset = offset;
+        }
+        else
+        {
+            out.redMultiplier = 1;
+            out.redOffset = 0;
+        }
+
+        if (channels & BitmapDataChannel.GREEN)
+        {
+            out.greenMultiplier = factor;
+            out.greenOffset = offset;
+        }
+        else
+        {
+            out.greenMultiplier = 1;
+            out.greenOffset = 0;
+        }
+
+        if (channels & BitmapDataChannel.BLUE)
+        {
+            out.blueMultiplier = factor;
+            out.blueOffset = offset;
+        }
+        else
+        {
+            out.blueMultiplier = 1;
+            out.blueOffset = 0;
+        }
+
+        if (channels & BitmapDataChannel.ALPHA)
+        {
+            out.alphaMultiplier = factor;
+            out.alphaOffset = offset;
+        }
+        else
+        {
+            out.alphaMultiplier = 1;
+            out.alphaOffset = 0;
+        }
+
+        return out;
+    }
+
+    public static function makeFromColorMatrix(m:Array, out:ColorTransform = null):ColorTransform
     {
         if (!out) out = new ColorTransform();

@@ -22,258 +278,24 @@
         return out;
     }

-    public static function clear(out:ColorTransform):ColorTransform
-    {
-        out.redMultiplier   =
-        out.greenMultiplier =
-        out.blueMultiplier  =
-        out.alphaMultiplier = 1;
-        out.redOffset       =
-        out.greenOffset     =
-        out.blueOffset      =
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setInvert(out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        out.redMultiplier   = -1;
-        out.greenMultiplier = -1;
-        out.blueMultiplier  = -1;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = 255;
-        out.greenOffset     = 255;
-        out.blueOffset      = 255;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setMultiply(c:uint, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var r:Number = (c >> 16) & 0xFF;
-        var g:Number = (c >>  8) & 0xFF;
-        var b:Number = c & 0xFF;
-
-        out.redMultiplier   = r * 0.00392156862745098;
-        out.greenMultiplier = g * 0.00392156862745098;
-        out.blueMultiplier  = b * 0.00392156862745098;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       =
-        out.greenOffset     =
-        out.blueOffset      =
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setAdd(c:uint, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var r:Number = (c >> 16) & 0xFF;
-        var g:Number = (c >>  8) & 0xFF;
-        var b:Number = c & 0xFF;
-
-        out.redMultiplier   =
-        out.greenMultiplier =
-        out.blueMultiplier  =
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = r;
-        out.greenOffset     = g;
-        out.blueOffset      = b;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setScreen(c:uint, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var r:int = (c >> 16) & 0xFF;
-        var g:int = (c >>  8) & 0xFF;
-        var b:int = c & 0xFF;
-
-        out.redMultiplier   = 1 - r * 0.00392156862745098;
-        out.greenMultiplier = 1 - g * 0.00392156862745098;
-        out.blueMultiplier  = 1 - b * 0.00392156862745098;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = r;
-        out.greenOffset     = g;
-        out.blueOffset      = b;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setTint(c:uint, amount:Number = 1.0, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var r:int = (c >> 16) & 0xFF;
-        var g:int = (c >>  8) & 0xFF;
-        var b:int = c & 0xFF;
-
-        out.redMultiplier   =
-        out.greenMultiplier =
-        out.blueMultiplier  = 1 - amount;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = r * amount;
-        out.greenOffset     = g * amount;
-        out.blueOffset      = b * amount;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setMap(newBlack:uint, newWhite:uint, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var br:int = (newBlack >> 16) & 0xFF;
-        var bg:int = (newBlack >>  8) & 0xFF;
-        var bb:int = newBlack & 0xFF;
-
-        var wr:int = (newWhite >> 16) & 0xFF;
-        var wg:int = (newWhite >>  8) & 0xFF;
-        var wb:int = newWhite & 0xFF;
-
-        out.redMultiplier   = (wr - br) * 0.00392156862745098;
-        out.greenMultiplier = (wg - bg) * 0.00392156862745098;
-        out.blueMultiplier  = (wb - bb) * 0.00392156862745098;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = br;
-        out.greenOffset     = bg;
-        out.blueOffset      = bb;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setRangeMap(fromLow:uint, fromHigh:uint,
-                                       toLow:uint,   toHigh:uint,
-                                       out:ColorTransform = null):ColorTransform
-    {
-
-        var fr0:int = (fromLow >> 16) & 0xFF;
-        var fg0:int = (fromLow >>  8) & 0xFF;
-        var fb0:int = fromLow & 0xFF;
-
-        var fr1:int = (fromHigh >> 16) & 0xFF;
-        var fg1:int = (fromHigh >>  8) & 0xFF;
-        var fb1:int = fromHigh & 0xFF;
-
-        var tr0:int = (toLow >> 16) & 0xFF;
-        var tg0:int = (toLow >>  8) & 0xFF;
-        var tb0:int = toLow & 0xFF;
-
-        var tr1:int = (toHigh >> 16) & 0xFF;
-        var tg1:int = (toHigh >>  8) & 0xFF;
-        var tb1:int = toHigh & 0xFF;
-
-        if (!out) out = new ColorTransform();
-
-        // this elaborate dance is to absorb div/0 errors.  considered
-        // throwing an exception or letting NaNs propagate, but because the
-        // output range is clamped, +/-Inf can be swapped for any
-        // appropriately out-of-range finite number.  this plus plenty of
-        // conceivable use cases where inRange = 0 makes it possible to
-        // fix the input values instead of rejecting them
-
-        var scaleR:Number = (fr1 - fr0);
-        var scaleG:Number = (fg1 - fg0);
-        var scaleB:Number = (fb1 - fb0);
-
-        // this magic number is taken from the maximum multiplier before
-        // ColorMatrixFilter ditches SSE acceleration.  even though this
-        // is a ColorTransform instead but it's a reasonable assumption
-
-        // this number means a 1 or -1 difference in the target range will
-        // scale to +/-4000, then get divided by 255 to get a multiplier of
-        // +/-15.686.  SSE is ditched at +/-15.99
-        if (scaleR == 0) scaleR = 0.00025;
-        if (scaleG == 0) scaleG = 0.00025;
-        if (scaleB == 0) scaleB = 0.00025;
-
-        scaleR = (tr1 - tr0) / scaleR;
-        scaleG = (tg1 - tg0) / scaleG;
-        scaleB = (tb1 - tb0) / scaleB;
-
-        out.redMultiplier   = ((255 - fr0) * scaleR + tr0) * 0.00392156862745098;
-        out.greenMultiplier = ((255 - fg0) * scaleG + tg0) * 0.00392156862745098;
-        out.blueMultiplier  = ((255 - fb0) * scaleB + tb0) * 0.00392156862745098;
-        out.alphaMultiplier = 1;
-
-        out.redOffset       = -fr0 * scaleR + tr0;
-        out.greenOffset     = -fg0 * scaleG + tg0;
-        out.blueOffset      = -fb0 * scaleB + tb0;
-        out.alphaOffset     = 0;
-
-        return out;
-    }
-
-    public static function setLevels(blackPoint:Number, whitePoint:Number, channels:uint = 7, out:ColorTransform = null):ColorTransform
-    {
-        if (!out) out = new ColorTransform();
-
-        var factor:Number = 255 / (whitePoint - blackPoint);
-        var offset:Number = -blackPoint * factor;
-
-        if (channels & BitmapDataChannel.RED)
-        {
-            out.redMultiplier = factor;
-            out.redOffset = offset;
-        }
-        else
-        {
-            out.redMultiplier = 1;
-            out.redOffset = 0;
-        }
-
-        if (channels & BitmapDataChannel.GREEN)
-        {
-            out.greenMultiplier = factor;
-            out.greenOffset = offset;
-        }
-        else
-        {
-            out.greenMultiplier = 1;
-            out.greenOffset = 0;
-        }
-
-        if (channels & BitmapDataChannel.BLUE)
-        {
-            out.blueMultiplier = factor;
-            out.blueOffset = offset;
-        }
-        else
-        {
-            out.blueMultiplier = 1;
-            out.blueOffset = 0;
-        }
-
-        if (channels & BitmapDataChannel.ALPHA)
-        {
-            out.alphaMultiplier = factor;
-            out.alphaOffset = offset;
-        }
-        else
-        {
-            out.alphaMultiplier = 1;
-            out.alphaOffset = 0;
-        }
+    public static function invert(ct:ColorTransform, out:ColorTransform = null):ColorTransform
+    {
+        if (!out) out = new ColorTransform();
+
+        var irm:Number = 1 / ct.redMultiplier;
+        var igm:Number = 1 / ct.greenMultiplier;
+        var ibm:Number = 1 / ct.blueMultiplier;
+        var iam:Number = 1 / ct.alphaMultiplier;
+
+        out.redMultiplier =   irm;
+        out.greenMultiplier = igm;
+        out.blueMultiplier =  ibm;
+        out.alphaMultiplier = iam;
+
+        out.redOffset *=   -irm;
+        out.greenOffset *= -igm;
+        out.blueOffset *=  -ibm;
+        out.alphaOffset *= -iam;

         return out;
     }


Transferred from the Adobe Open Source Subversion Repository

Revision: 5101
Author:   gauravj@adobe.com
Date:     2009-02-27T05:22:45.887116Z

Log Message:
-----------
Update action script files with asdoc version tags.

QE Notes: None.
Doc Notes: Please review and update as necessary.
tests: checkintests

Modified Paths:
--------------
663 paths were modified

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

--- frameworks/projects/framework/src/mx/managers/SystemRawChildrenList.as
+++ frameworks/projects/framework/src/mx/managers/SystemRawChildrenList.as
@@ -45,6 +45,11 @@

 	/**
 	 *  Constructor.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function SystemRawChildrenList(owner:SystemManager)
 	{
@@ -72,6 +77,11 @@

 	/**
 	 *  @copy mx.core.IChildList#numChildren
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function get numChildren():int
 	{
@@ -80,6 +90,11 @@

 	/**
 	 *  @copy mx.core.IChildList#getChildAt
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
   	public function getChildAt(index:int):DisplayObject
   	{
@@ -88,6 +103,11 @@

 	/**
 	 *  @copy mx.core.IChildList#addChild
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function addChild(child:DisplayObject):DisplayObject
   	{
@@ -96,6 +116,11 @@

 	/**
 	 *  @copy mx.core.IChildList#addChildAt
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function addChildAt(child:DisplayObject, index:int):DisplayObject
   	{
@@ -104,6 +129,11 @@

 	/**
 	 *  @copy mx.core.IChildList#removeChild
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function removeChild(child:DisplayObject):DisplayObject
   	{
@@ -112,6 +142,11 @@

 	/**
 	 *  @copy mx.core.IChildList#removeChildAt
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function removeChildAt(index:int):DisplayObject
   	{
@@ -120,6 +155,11 @@

 	/**
 	 *  @copy mx.core.IChildList#getChildByName
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
   	public function getChildByName(name:String):DisplayObject
   	{
@@ -128,6 +168,11 @@

 	/**
 	 *  @copy mx.core.IChildList#getChildIndex
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
   	public function getChildIndex(child:DisplayObject):int
   	{
@@ -136,6 +181,11 @@

 	/**
 	 *  @copy mx.core.IChildList#setChildIndex
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function setChildIndex(child:DisplayObject, newIndex:int):void
   	{
@@ -144,6 +194,11 @@

 	/**
 	 *  @copy mx.core.IChildList#getObjectsUnderPoint
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function getObjectsUnderPoint(point:Point):Array
 	{
@@ -152,6 +207,11 @@

 	/**
 	 *  @copy mx.core.IChildList#contains
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 9
+	 *  @playerversion AIR 1.1
+	 *  @productversion Flex 3
 	 */
 	public function contains(child:DisplayObject):Boolean
 	{


Transferred from the Adobe Open Source Subversion Repository

Revision: 2506
Author:   jimurphy@adobe.com
Date:     2008-07-16T13:25:03.893431Z

Log Message:
-----------
Merged 3.0.x revisions [2417,2458,2504] -> trunk
-I also manually updated modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java to implement flex2.linker.LinkerConfiguration due to a name change in trunk
-removed player 9 stuff

Modified Paths:
--------------
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework/.project" copyfrom-rev="2504" action="R">/flex/sdk/trunk/development/eclipse/flex/airframework/.project</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/DependencyChecker.java</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/managers/dragClasses/DragProxy.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework/.actionScriptProperties" copyfrom-rev="2504" action="R">/flex/sdk/trunk/development/eclipse/flex/airframework/.actionScriptProperties</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/air-config.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/Channel.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="A">/flex/sdk/trunk/in/player/mac/Install Flash Player 10 UB.dmg</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework/.settings/org.eclipse.core.resources.prefs" copyfrom-rev="2504" action="R">/flex/sdk/trunk/development/eclipse/flex/airframework/.settings/org.eclipse.core.resources.prefs</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/FlexModuleFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/FrameworkSwcDependencyRules.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/DragManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/SWFLoader.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework/.flexLibProperties" copyfrom-rev="2504" action="R">/flex/sdk/trunk/development/eclipse/flex/airframework/.flexLibProperties</path>
<path kind="file" action="D">/flex/sdk/trunk/in/player/lnx/install_flash_player_9_linux.tar.gz</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/LibrariesNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/DependencyNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/xml/XMLDecoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/scrollClasses/ScrollBar.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="D">/flex/sdk/trunk/in/player/win/Install Flash Player 9 Plugin.exe</path>
<path kind="file" action="D">/flex/sdk/trunk/in/player/mac/Install Flash Player 9 UB.dmg</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/MarshalMouseEvent.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/resources/LocaleSorter.as" copyfrom-rev="2504" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/LocaleSorter.as</path>
<path kind="file" action="D">/flex/sdk/trunk/in/player/win/Install Flash Player 9 ActiveX.exe</path>
<path kind="dir" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework" copyfrom-rev="2504" action="A">/flex/sdk/trunk/development/eclipse/flex/airframework</path>
<path kind="file" action="M">/flex/sdk/trunk/build.xml</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/controls/scrollClasses/ScrollThumb.as</path>
<path kind="file" action="A">/flex/sdk/trunk/in/player/win/Install Flash Player 10 Plugin.exe</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/DefNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as</path>
<path kind="file" action="A">/flex/sdk/trunk/in/player/win/Install Flash Player 10 ActiveX.exe</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/LibraryNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/ScriptNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/asc/src/java/macromedia/asc/util/ContextStatics.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/CursorManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/flex/tools/dependencychecker/nodes/DepNode.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ChannelSet.as</path>
<path kind="dir" copyfrom-path="/flex/sdk/branches/3.0.x/development/eclipse/flex/airframework/.settings" copyfrom-rev="2504" action="R">/flex/sdk/trunk/development/eclipse/flex/airframework/.settings</path>
<path kind="file" action="D">/flex/sdk/trunk/in/player/10/lnx/Flash Player.app.zip</path>
<path kind="dir" action="D">/flex/sdk/trunk/frameworks/libs/player/9</path>

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

--- frameworks/projects/framework/src/mx/managers/dragClasses/DragProxy.as
+++ frameworks/projects/framework/src/mx/managers/dragClasses/DragProxy.as
@@ -21,6 +21,7 @@
 import flash.events.MouseEvent;
 import flash.geom.Point;
 import flash.system.ApplicationDomain;
+import flash.utils.getQualifiedClassName;
 import mx.core.DragSource;
 import mx.core.IUIComponent;
 import mx.core.mx_internal;
@@ -98,11 +99,7 @@
 		super.initialize();

 		// in case we go offscreen
-		dragInitiator.systemManager.addEventListener(MarshalMouseEvent.MOUSE_MOVE,
-												     stage_mouseMoveHandler);
-
-		// in case we go offscreen
-		dragInitiator.systemManager.addEventListener(MarshalMouseEvent.MOUSE_UP,
+		ISystemManager2(dragInitiator.systemManager).getSandboxRoot().addEventListener(MarshalMouseEvent.MOUSE_UP,
 													 mouseLeaveHandler);

 		// Make sure someone has focus, otherwise we
@@ -346,9 +343,8 @@
 		// in trusted mode, the target could be in another application domain
 		// in untrusted mode, the mouse events shouldn't work so we shouldn't be here

-		var appDom:ApplicationDomain = target.loaderInfo.applicationDomain;
 		// same domain
-		if (isSameSandbox(appDom))
+		if (isSameSandbox(target))
 			target.dispatchEvent(event);
 		else
 		{
@@ -363,14 +359,16 @@
 		}
 	}

-	private function isSameSandbox(ad:ApplicationDomain):Boolean
+	private function isSameSandbox(target:Object):Boolean
 	{
-		if (ad == ApplicationDomain.currentDomain) return true;
-
-		if (ad.hasDefinition("mx.managers.dragClasses.DragProxy"))
+		var ad:ApplicationDomain = ApplicationDomain.currentDomain;
+
+		var cn:String = getQualifiedClassName(target);
+
+		if (ad.hasDefinition(cn))
 		{
-			var c:Class = Class(ad.getDefinition("mx.managers.dragClasses.DragProxy"));
-			if (this is c)
+			var c:Class = Class(ad.getDefinition(cn));
+			if (target is c)
 				return true;
 		}
 		return false;
@@ -534,10 +532,6 @@
 		ed.removeEventListener(MouseEvent.MOUSE_MOVE,
                                mouseMoveHandler, true);

-		// in case we go offscreen
-		sm.removeEventListener(MarshalMouseEvent.MOUSE_MOVE,
-							stage_mouseMoveHandler);
-
         ed.removeEventListener(MouseEvent.MOUSE_UP,
                                mouseUpHandler, true);

@@ -545,7 +539,7 @@
                                keyDownHandler);

 		// in case we go offscreen
-		sm.removeEventListener(MarshalMouseEvent.MOUSE_UP,
+		ed.removeEventListener(MarshalMouseEvent.MOUSE_UP,
 							   mouseLeaveHandler);

         ed.removeEventListener(KeyboardEvent.KEY_UP,


Transferred from the Adobe Open Source Subversion Repository

Revision: 11675
Author:   hmuller@adobe.com
Date:     2009-11-12T00:25:39.300334Z

Log Message:
-----------
Added minValue,maxValue,etc Style/Inspectable metadata tags for tools.

QE notes:
Doc notes:
Bugs: sdk-24100
Reviewer: Glenn
Tests run:
Is noteworthy for integration: yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/supportClasses/GraphicElement.as</path>
<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/styles/metadata/BasicInheritingTextStyles.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/components/supportClasses/ButtonBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Effect.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Spinner.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/framework/src/mx/graphics/GradientStroke.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/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/VideoElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/animation/Animation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/SolidColorStroke.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.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/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/Rect.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/styles/metadata/BasicNonInheritingTextStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/SolidColor.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/components/supportClasses/TextBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/GradientEntry.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/styles/metadata/AdvancedInheritingTextStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Range.as</path>

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

--- frameworks/projects/spark/src/spark/components/supportClasses/Range.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/Range.as
@@ -168,6 +168,8 @@
     private var _stepSize:Number = 1;

     private var stepSizeChanged:Boolean = false;
+
+    [Inspectable(minValue="0.0")]

     /**
      *  The amount that the value property
@@ -260,6 +262,8 @@

     private var snapIntervalChanged:Boolean = false;
     private var _explicitSnapInterval:Boolean = false;
+
+    [Inspectable(minValue="0.0")]

     /**
      *  If nonzero, valid values are the sum of the minimum with integer multiples


Still had old namespace (jivesoftware).

Still had old namespace (jivesoftware).

git-svn-id: c197267f952b24206666de142881703007ca05d5@11124 b35dd754-fafc-0310-a699-88a17e54d16e

--- src/org/igniterealtime/xiff/logging/LoggerFactory.as
+++ src/org/igniterealtime/xiff/logging/LoggerFactory.as
@@ -7,9 +7,9 @@
 	import mx.logging.Log;
 	import mx.logging.LogEventLevel;
 	import mx.logging.targets.TraceTarget;
-  import mx.logging.targets.LineFormattedTarget;
-  import mx.controls.TextArea;
-
+	import mx.logging.targets.LineFormattedTarget;
+	import mx.controls.TextArea;
+
 	public final class LoggerFactory
 	{
 		public static function configureDefault( filters:Array, level:int ):void
@@ -17,21 +17,21 @@
 			configureTarget( new TraceTarget(), filters, level );
 		}

-    public static function configureTextAreaTarget( textArea:TextArea, filters:Array, level:int ):void
-    {
-      configureTarget( new TextAreaTarget( textArea ), filters, level );
-    }
+		public static function configureTextAreaTarget( textArea:TextArea, filters:Array, level:int ):void
+		{
+			configureTarget( new TextAreaTarget( textArea ), filters, level );
+		}

-    private static function configureTarget( logTarget:LineFormattedTarget, filters:Array, level:int ):void
-    {
-      logTarget.filters = new Array(["org.jivesoftware.*"]).concat(filters);
+		private static function configureTarget( logTarget:LineFormattedTarget, filters:Array, level:int ):void
+		{
+			logTarget.filters = new Array(["org.igniterealtime.*"]).concat(filters);
 			logTarget.level = level;
 			logTarget.includeTime = true;
 			logTarget.includeLevel = true;

 			Log.addTarget(logTarget);
-    }
-
+		}
+
 		public static function getLogger(category:String):ILogger
 		{
 			return Log.getLogger(category);


Reconnection fixes for BOSH. r=Armando. XIFF-36

--- src/org/jivesoftware/xiff/core/XMPPBOSHConnection.as
+++ src/org/jivesoftware/xiff/core/XMPPBOSHConnection.as
@@ -39,15 +39,15 @@
 		private var failedRequests:Array = [];
 		private var requestQueue:Array = [];
 		private var responseQueue:Array = [];
-		private const responseTimer:Timer = new Timer(0.0, 1);
+		private var responseTimer:Timer;
 		private var isDisconnecting:Boolean = false;
 		private var boshPollingInterval:Number = 10000;
 		private var sid:String;
 		private var rid:Number;
 		private var wait:int;
 		private var inactivity:int;
-		private var pollTimer:Timer = new Timer(1, 1);
-		private var pollTimeoutTimer:Timer = new Timer(1, 1);
+		private var pollTimer:Timer;
+		private var pollTimeoutTimer:Timer;

 		private var auth:SASLAuth;
 		private var authHandler:Function;
@@ -148,13 +148,14 @@
 	            maxConcurrentRequests = Math.min(serverRequests, maxConcurrentRequests);
 	        active = true;
 	        configureConnection(responseBody);
+	        responseTimer = new Timer(0.0, 1);
 	        responseTimer.addEventListener(TimerEvent.TIMER_COMPLETE, processResponse);
 	        trace(boshPollingInterval);
-	        pollTimer.delay = boshPollingInterval;
+	        pollTimer = new Timer(boshPollingInterval, 1);
+	        pollTimeoutTimer = new Timer(inactivity, 1);
 	        pollTimer.addEventListener(TimerEvent.TIMER_COMPLETE, pollServer);
 	        pollTimer.start();

-	        pollTimeoutTimer.delay = inactivity;
 	        pollTimeoutTimer.addEventListener(TimerEvent.TIMER_COMPLETE, function(evt:TimerEvent):void {
 				trace("Poll timed out, resuming");
 				pollServer(evt, true);
@@ -328,7 +329,8 @@
 				trace("Polling at: " + lastPollTime.getMinutes() + ":" + lastPollTime.getSeconds());
 			}

-			pollTimer.stop();
+			if(pollTimer)
+				pollTimer.stop();

 			return true;
 		}


cosmetics

cosmetics

--- src/eu/stefaner/elasticlists/ui/appcomponents/JavaScriptContentArea.as
+++ src/eu/stefaner/elasticlists/ui/appcomponents/JavaScriptContentArea.as
@@ -1,46 +1,41 @@
- /*
+/*

-  Copyright 2010, Moritz Stefaner
+Copyright 2010, Moritz Stefaner

-   Licensed 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
+Licensed 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
+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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

-*/
+ */

 package eu.stefaner.elasticlists.ui.appcomponents {
 	import eu.stefaner.elasticlists.App;
-	import eu.stefaner.elasticlists.ui.appcomponents.ContentArea;
-
-	import org.osflash.thunderbolt.Logger;
-
+	import eu.stefaner.elasticlists.ui.appcomponents.ContentArea;
+	import org.osflash.thunderbolt.Logger;
 	import flash.events.Event;
-	import flash.external.ExternalInterface;
-
+	import flash.external.ExternalInterface;
 	/**
 	 * @author mo
 	 */
-	public class JavaScriptContentArea extends ContentArea {
+	public class JavaScriptContentArea extends ContentArea {
 		public function JavaScriptContentArea() {
 			super();
-		}
-
-		override public function init(app:App):void {
+		}
+		override public function init(app : App) : void {
 			this.app = app;
 			app.addEventListener(App.FILTERS_CHANGED, onFilteredContentItemsChanged, false, 0, true);
-		}
-
-		override public function onFilteredContentItemsChanged(e:Event):void {
+		}
+		override public function onFilteredContentItemsChanged(e : Event) : void {
 			if(ExternalInterface.available) {
-				var resultsArray = app.model.filteredContentItems.map(function(a) {
+				var resultsArray : Array = app.model.filteredContentItems.map(function(a) {
 					return a.rawValues;
 				});
 				ExternalInterface.call("onFilteredContentItemsChanged", resultsArray);


Transferred from the Adobe Open Source Subversion Repository

Revision: 7836
Author:   chaase@adobe.com
Date:     2009-06-15T14:37:21.379918Z

Log Message:
-----------
PARB changes for effects. This includes various property renames, a couple of class renames, moving 3 classes to a sub-package, and various doc cleanups. This also includes changing a handful of Array properties to typed Vectors.

QE: This breaks Mustella due to the renames
Doc: Docs will need to be updated to reflect the changes as well
Bugs: None
Reviewer: Jason
Tests: checkintests, Thermo's transitionbug test

Modified Paths:
--------------
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/utils/BitmapUtil.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/MotionPath.as" copyfrom-rev="7748" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/MotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/easing/Power.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/easing/EasingFraction.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/KeyFrame.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/interpolation/RGBInterpolator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/interpolation/HSBInterpolator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/CallAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Animate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/FadeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/RepeatBehavior.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateShaderTransition.as" copyfrom-rev="7748" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateTransitionShader.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateShaderTransition.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/spark-manifest.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/interpolation/IInterpolator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/interpolation/NumberInterpolator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Rotate3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Scale.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/CallActionInstance.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/SimpleMotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateColorInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/Animation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Rotate.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateShaderTransitionInstance.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateShaderTransitionInstance.as" copyfrom-rev="7748" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateTransitionShaderInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Wipe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/easing/Sine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/interpolation/ArrayInterpolator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/CrossFade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateTransform.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/SimpleMotionPath.as" copyfrom-rev="7748" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/SimpleMotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/HSBColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/IAnimationTarget.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/easing/Linear.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/ResizeInstance.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/Keyframe.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/CrossFade.pbk</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/MotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/WipeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateTransformInstance.as</path>

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

--- frameworks/projects/framework/src/mx/utils/HSBColor.as
+++ frameworks/projects/framework/src/mx/utils/HSBColor.as
@@ -101,7 +101,7 @@
     }

     /**
-     * Converts and HSB color specified by the parameters to a
+     * Converts an HSB color specified by the parameters to a
      * uint RGB color.
      *
      *  @langversion 3.0
@@ -109,7 +109,7 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    public static function HSBtoRGB(hue:Number, saturation:Number,
+    public static function convertHSBtoRGB(hue:Number, saturation:Number,
         brightness:Number):uint
     {
         // Conversion taken from Foley, van Dam, et al
@@ -173,7 +173,7 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    static public function RGBtoHSB(rgb:uint):HSBColor
+    static public function convertRGBtoHSB(rgb:uint):HSBColor
     {
         // Conversion taken from Foley, van Dam, et al
         var hue:Number, saturation:Number, brightness:Number;


Transferred from the Adobe Open Source Subversion Repository

Revision: 10766
Author:   gruehle@adobe.com
Date:     2009-09-30T22:55:55.205927Z

Log Message:
-----------
Re-commit compiler errors for other theme's styles feature. If Style metadata has a "themes" attribute, the style is only valid if that theme is applied.

The Spark theme is applied by default. The halo theme can be specified as a compiler argument or by selecting the "MX Only" component set in Builder.

All other themes need to be applied using theme+= instead of theme=. If you use theme= you will get warnings about styles used in CSS selectors, and errors if you use any theme-specific style as an attribute on an MXML tag.

By default, styles that aren't valid for the current theme are errors. These can be changed to warnings with the report-invalid-styles-as-warnings compiler option.

QE notes: Expect test breakage
Doc notes: The new policy for themes needs to be documented.
Bugs: none yet, but I'm sure there will be some...
Reviewer: Ryan
Tests run: checkintests, cyclone
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ToolTip.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/builder/ComponentBuilder.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java</path>
<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/modules/compiler/src/java/flex2/compiler/mxml/rep/MxmlDocument.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/common/DefaultsConfigurator.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateChooser.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/sparkskins/src/mx/skins/spark/ApplicationBackground.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/CursorManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/halo/defaults.css</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/themes/Spark/spark.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ControlBar.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/styles/metadata/SkinStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Button.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/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java</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/framework/src/mx/containers/ApplicationControlBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/tests/basicTests/BasicTests.css</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/lang/DeclarationHandler.java</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/controls/Tree.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ToolTipBorder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/reflect/Type.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/MxmlConfiguration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/colorPickerClasses/SwatchPanel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/reflect/TypeTable.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/PreLink.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/sparkskins/src/SparkSkinsClasses.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler_en.properties</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/lang/AttributeHandler.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ScrollControlBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/fxg/FXGCompiler.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/SkinnableDataContainerSkin.mxml</path>

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

--- frameworks/projects/mx/src/mx/controls/VideoDisplay.as
+++ frameworks/projects/mx/src/mx/controls/VideoDisplay.as
@@ -34,6 +34,18 @@

 include "../styles/metadata/BackgroundStyles.as"
 include "../styles/metadata/BorderStyles.as"
+
+/**
+ *  Color of the content area of the component.
+ *
+ *  @default 0xFFFFFF
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
+ */
+[Style(name="contentBackgroundColor", type="uint", format="Color", inherit="yes", theme="spark")]

 /**
  *  Dispatched when the NetConnection object is closed, whether by timing
@@ -1829,7 +1841,11 @@
                 return true;
             }
         }
-
+
+        v = getStyle("contentBackgroundColor");
+        if (v !== null && v !== "")
+            return true;
+
         v = getStyle("backgroundColor");
         if (v !== null && v !== "")
             return true;


Transferred from the Adobe Open Source Subversion Repository

Revision: 19864
Author:   smgilson@adobe.com
Date:     2011-01-21T17:26:11.511570Z

Log Message:
-----------
ASDoc updates for Form

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

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/layouts/FormLayout.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/FormItem.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Form.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/FormHeading.as</path>

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

--- frameworks/projects/spark/src/spark/components/Form.as
+++ frameworks/projects/spark/src/spark/components/Form.as
@@ -36,19 +36,82 @@
 [IconFile("Form.png")]

 /**
- *  SkinnableContainer with FormItem children.
+ *  The Spark Form container lets you control the layout of a form,
+ *  mark form fields as required or optional, handle error messages,
+ *  and bind your form data to the Flex data model to perform
+ *  data checking and validation.
+ *  It also lets you use style sheets to configure the appearance
+ *  of your forms.
+ *
+ *
The following table describes the components you use to create forms in Flex:

+ *

+ *

+ *           Component
+ *           Tag
+ *           Description
+ *

+ *

+ *           Form
+ *           <s:Form>
+ *           Defines the container for the entire form, including the overall form layout.
+ *               Use the FormHeading control and FormItem control to define content.
+ *               You can also insert other types of components in a Form container.
+ *

+ *

+ *           FormHeading
+ *           <s:FormHeading>
+ *           Defines a heading within your form.
+ *

+ *

+ *           FormItem
+ *           <s:FormItem>
+ *           Contains one or more form children arranged horizontally or vertically. Children can be controls or other containers.
+ *               A single Form container can hold multiple FormItem containers.
+ *

+ *

+ *           FormLayout
+ *           <s:FormLayout>
+ *           Defines the default layout for Spark Form skins.
+ *

+ *

+ *
+ *  @mxml
+ *
+ *
The <s:Form> tag inherits all the tag
+ *  attributes of its superclass and adds no new tag attributes:

+ *
+ *

+ *  <s:Form>
+ *    ...
+ *      child tags
+ *    ...
+ *  </s:Form>
+ *

  *
  *  @includeExample examples/FormExample.mxml
  *  @includeExample examples/StackedFormSkinExample.mxml
  *
+ *  @see spark.components.FormHeading
+ *  @see spark.components.FormItem
+ *  @see spark.layouts.FormLayout
+ *  @see spark.skins.spark.FormSkin
+ *
  *  @langversion 3.0
  *  @playerversion Flash 10
- *  @playerversion AIR 1.5
+ *  @playerversion AIR 2.5
  *  @productversion Flex 4.5
  */
 public class Form extends SkinnableContainer
 {

+    /**
+     *  Constructor.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 2.5
+     *  @productversion Flex 4.5
+     */
     public function Form()
     {
         super();
@@ -73,18 +136,22 @@
     mx_internal var _invalidElements:Array = new Array();

     /**
-     *  A sorted array of descendant elements that are in an INVALID state.
+     *  A sorted Array of descendant elements that are in an invalid state.
      *  The items in the array are Objects with the following properties:
-     *  element:UIComponent - the invalid descendant element
-     *  position:Vector.%lt;int%gt; - a Vector of integers representing the position
-     *  of the element in the display list tree. This is used for sorting the array.
-     *
-     *  If a descendant is removed from the Form, the dictionary will not get
-     *  updated.
+     *
+     *

+     *
element:UIComponent - the invalid descendant element

+     *
+     *
position:Vector.<int> - a Vector of integers representing the position
+     *     of the element in the display list tree.
+     *     This property is used for sorting the Array.

+     *

+     *
+     *
If a descendant is removed from the Form, the dictionary is not updated.

      *
      *  @langversion 3.0
      *  @playerversion Flash 10
-     *  @playerversion AIR 1.5
+     *  @playerversion AIR 2.5
      *  @productversion Flex 4.5
      */
     public function get invalidElements():Array


Transferred from the Adobe Open Source Subversion Repository

Revision: 17768
Author:   cframpto@adobe.com
Date:     2010-09-20T17:01:16.894026Z

Log Message:
-----------
Change getCellAt() to return CellPosition rather than Object.  Remove unused selectionContainsOnlyIndicesCR() method.  Optimize selectionContainsOnlyIndices() a bit.

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

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/GridLayout.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/DataGrid.as</path>

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

--- frameworks/projects/spark/src/spark/components/Grid.as
+++ frameworks/projects/spark/src/spark/components/Grid.as
@@ -2882,7 +2882,7 @@
      *  @playerversion AIR 2.0
      *  @productversion Flex 4.5
      */
-    public function getCellAt(x:Number, y:Number):Object
+    public function getCellAt(x:Number, y:Number):CellPosition
     {
         return gridLayout.getCellAt(x, y);
     }


Transferred from the Adobe Open Source Subversion Repository

Revision: 18722
Author:   klin@adobe.com
Date:     2010-11-18T23:10:56.049759Z

Log Message:
-----------
Fixing the build. Missed a clear => clearHeights rename.

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

Modified Paths:
--------------
/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Grid.as

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

--- frameworks/projects/spark/src/spark/components/Grid.as
+++ frameworks/projects/spark/src/spark/components/Grid.as
@@ -4054,7 +4054,7 @@
             if (clearTypicalSizes)
                 gridDimensions.clearTypicalCellWidthsAndHeights();

-            gridDimensions.clear();
+            gridDimensions.clearHeights();

             // Reset row count because dataProvider length may have changed.
             gridDimensions.rowCount = _dataProvider ? _dataProvider.length : 0;


Update M2TSFileHandler.as

Update M2TSFileHandler.as

Minor syntax fix - semicolon not necessary.

--- HLSPlugin/src/com/kaltura/hls/m2ts/M2TSFileHandler.as
+++ HLSPlugin/src/com/kaltura/hls/m2ts/M2TSFileHandler.as
@@ -268,7 +268,7 @@
 				//in case they are padding. If we don't save the data and then attempt unpadding at the end, it may try
 				//unpadding in the middle of a segment. If it does this and the data happens to look like padding, it will
 				//truncate good bytes and cause pixelation
-				if (!_flush && tmpBuffer.length >= 16);
+				if (!_flush && tmpBuffer.length >= 16)
 				{
 					tmpBuffer.position = tmpBuffer.length - 16;
 					tmpBuffer.readBytes(_lastSixteenBytes, 0, 16);


* Fixed create to work with namespaces

* Fixed create to work with namespaces

git-svn-id: cdbd3c3453b226d8644b39c93ea790e37ea3ca1b@269 8511d851-38f6-43ef-8cbd-b625791138e4

--- src/nanosome/util/create.as
+++ src/nanosome/util/create.as
@@ -1,6 +1,7 @@
 // @license@
 package nanosome.util {

+	import nanosome.util.access.qname;
 	import flash.utils.describeType;

 	/**
@@ -84,8 +85,8 @@
 			if( result is ILockable ) {
 				ILockable( result ).lock();
 			}
-			for( var propName: String in props ) {
-				result[propName] = props[propName];
+			for( var propName: * in props ) {
+				result[ qname(propName) ] = props[propName];
 			}
 			if( result is ILockable ) {
 				ILockable( result ).unlock();
@@ -94,7 +95,6 @@
 		return result;
 	}
 }
-
 import flash.utils.Dictionary;

 const CACHE: Dictionary = new Dictionary();


Reset the "connected" property on NetConnection.Connect.Closed.

--- RTMFPSocket.as
+++ RTMFPSocket.as
@@ -78,6 +78,7 @@
         {
             switch (e.info.code) {
             case "NetConnection.Connect.Closed":
+                connected = false;
                 dispatchEvent(new Event(Event.CLOSE));
                 break;
             case "NetStream.Connect.Closed":


remove debug=true flag.

remove debug=true flag.

--- plugins/doubleclickPlugin/src/doubleclickPluginCode.as
+++ plugins/doubleclickPlugin/src/doubleclickPluginCode.as
@@ -48,7 +48,7 @@

 	public dynamic class doubleclickPluginCode extends UIComponent implements IPlugin, ISequencePlugin
 	{
-		public var debugMode:Boolean	=	true;
+		public var debugMode:Boolean	=	false;

 		public var contentPlayhead:Object = {};


Transferred from the Adobe Open Source Subversion Repository

Revision: 3297
Author:   jimurphy@adobe.com
Date:     2008-09-22T17:59:53.303960Z

Log Message:
-----------
Merge 3.0.x revisions 3260,3262,3266,3271,3276,3282,3285,3292,3294 -> trunk

Modified Paths:
--------------
<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/ProgressBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.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/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/dragClasses/DragProxy.as</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/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/AbstractInvoker.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/Operation.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManagerProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IFocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/messages/AbstractMessage.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/core/ISWFBridgeProvider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeader.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/framework/src/mx/core/ISWFBridgeGroup.as</path>

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

--- frameworks/projects/framework/src/mx/controls/SWFLoader.as
+++ frameworks/projects/framework/src/mx/controls/SWFLoader.as
@@ -565,7 +565,7 @@
      *  This property contains the object that represents
      *  the content that was loaded in the SWFLoader control.
      *
-     *  @tiptext Returns the content of the SWFLoader
+     *  @tiptext Returns the content of the SWFLoader.
      *  @helpid 3134
      */
     public function get content():DisplayObject
@@ -616,17 +616,17 @@
             {
                 try
                 {
-                	if (systemManager.swfBridgeGroup)
-                	{
-                	    var bridge:IEventDispatcher = swfBridge;
-                	    if (bridge)
-                	    {
-                	    	var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
-                	    	bridge.dispatchEvent(request);
-                	    	return request.data.height;
-                	    }
-                	}
-
+                        if (systemManager.swfBridgeGroup)
+                        {
+                            var bridge:IEventDispatcher = swfBridge;
+                            if (bridge)
+                            {
+                                var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
+                                bridge.dispatchEvent(request);
+                                return request.data.height;
+                            }
+                        }
+
                     var content:IFlexDisplayObject =
                         Loader(contentHolder).content as IFlexDisplayObject;
                     if (content)
@@ -681,13 +681,13 @@
             {
                 try
                 {
-                	if (swfBridge)
-                	{
-            	    	var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
-            	    	swfBridge.dispatchEvent(request);
-            	    	return request.data.width;
-                	}
-
+                        if (swfBridge)
+                        {
+                        var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
+                        swfBridge.dispatchEvent(request);
+                        return request.data.width;
+                        }
+
                     var content:IFlexDisplayObject =
                         Loader(contentHolder).content as IFlexDisplayObject;
                     if (content)
@@ -790,7 +790,7 @@
     public function set loaderContext(value:LoaderContext):void
     {
         _loaderContext = value;
-		explicitLoaderContext = true;
+                explicitLoaderContext = true;

         dispatchEvent(new Event("loaderContextChanged"));
     }
@@ -835,7 +835,7 @@
     //----------------------------------
     //  sandBoxBridge (read only)
     //----------------------------------
-	private var _swfBridge:IEventDispatcher;
+        private var _swfBridge:IEventDispatcher;

     //----------------------------------
     //  percentLoaded (read only)
@@ -1236,7 +1236,7 @@
         if (brokenImageBorder)
             brokenImageBorder.setActualSize(unscaledWidth, unscaledHeight);

-		sizeShield();
+                sizeShield();
     }

     //--------------------------------------------------------------------------
@@ -1285,20 +1285,20 @@
                         // b/c we may cause a security violation trying to do it
                     }

-					if (_swfBridge)
-					{
-						var request:SWFBridgeEvent = new SWFBridgeEvent(
-																	SWFBridgeEvent.BRIDGE_APPLICATION_UNLOADING,
-																	false, false,
-																	_swfBridge);
-						 _swfBridge.dispatchEvent(request);
-
-					}
+                                        if (_swfBridge)
+                                        {
+                                                var request:SWFBridgeEvent = new SWFBridgeEvent(
+                                                                                SWFBridgeEvent.BRIDGE_APPLICATION_UNLOADING,
+                                                                                false, false,
+                                                                                _swfBridge);
+                                                 _swfBridge.dispatchEvent(request);
+
+                                        }

                     Loader(contentHolder).unload();

-					if (!explicitLoaderContext)
-						_loaderContext = null;
+                                        if (!explicitLoaderContext)
+                                                _loaderContext = null;
                 }
                 else
                 {
@@ -1325,26 +1325,26 @@
                 }
             }

-			// when SWFLoader/Image is used with renderer
-			// recycling and the content is a DisplayObject instance
-			// the instance can be stolen from us while
-			// we're on the free list
-			try
-			{
-				if (contentHolder.parent == this)
-					removeChild(contentHolder);
-			}
+                        // when SWFLoader/Image is used with renderer
+                        // recycling and the content is a DisplayObject instance
+                        // the instance can be stolen from us while
+                        // we're on the free list
+                        try
+                        {
+                                if (contentHolder.parent == this)
+                                        removeChild(contentHolder);
+                        }
             catch(error:Error)
             {
-				try
-				{
-					// just try to remove it anyway
-					removeChild(contentHolder);
-				}
-				catch(error1:Error)
-				{
-					// Ignore any errors thrown by removeChild()
-				}
+                                try
+                                {
+                                        // just try to remove it anyway
+                                        removeChild(contentHolder);
+                                }
+                                catch(error1:Error)
+                                {
+                                        // Ignore any errors thrown by removeChild()
+                                }
             }

             contentHolder = null;
@@ -1521,21 +1521,21 @@
                 // an application domain free of framework classes.
                 if (loadForCompatibility)
                 {
-                	// the AD.currentDomain.parentDomain could be null,
-                	// the domain of the top-level system manager, or
-                	// the bootstrap loader. The bootstrap loader will always be topmost
-                	// if it is present.
-        			var currentDomain:ApplicationDomain = ApplicationDomain.currentDomain.parentDomain;
-        			var topmostDomain:ApplicationDomain = null;
-        			while (currentDomain)
-        			{
-						topmostDomain = currentDomain;
-						currentDomain = currentDomain.parentDomain;
-        			}
-                	lc.applicationDomain = new ApplicationDomain(topmostDomain);
-
-                }
-
+                        // the AD.currentDomain.parentDomain could be null,
+                        // the domain of the top-level system manager, or
+                        // the bootstrap loader. The bootstrap loader will always be topmost
+                        // if it is present.
+                                var currentDomain:ApplicationDomain = ApplicationDomain.currentDomain.parentDomain;
+                                var topmostDomain:ApplicationDomain = null;
+                                while (currentDomain)
+                                {
+                                                topmostDomain = currentDomain;
+                                                currentDomain = currentDomain.parentDomain;
+                                }
+                        lc.applicationDomain = new ApplicationDomain(topmostDomain);
+
+                }
+
                 if (trustContent)
                 {
                     lc.securityDomain = SecurityDomain.currentDomain;
@@ -1586,14 +1586,14 @@
             {
                 try
                 {
-                   	if (Loader(contentHolder).content is IFlexDisplayObject)
-						flexContent = true;
-					else
-	                    flexContent = swfBridge != null;
+                        if (Loader(contentHolder).content is IFlexDisplayObject)
+                                                flexContent = true;
+                                        else
+                            flexContent = swfBridge != null;
                 }
                 catch(e:Error)
                 {
-                	// trace("contentLoader: " + e);
+                        // trace("contentLoader: " + e);
                     flexContent = swfBridge != null;
                 }
             }
@@ -1704,29 +1704,29 @@
                     // don't resize contentHolder until after it is layed out
                     if (getContentSize().x > 0)
                     {
-                    	var sizeSet:Boolean = false;
-
-	                    if (holder.contentLoaderInfo.contentType == "application/x-shockwave-flash")
-    	                {
-							if (childAllowsParent)
-							{
-								if (holder.content is IFlexDisplayObject)
-								{
-									IFlexDisplayObject(holder.content).setActualSize(w, h);
-									sizeSet = true;
-								}
-							}
-
-							if (!sizeSet)
-							{
-								if (swfBridge)
-								{
-									swfBridge.dispatchEvent(new SWFBridgeRequest(SWFBridgeRequest.SET_ACTUAL_SIZE_REQUEST, false, false, null,
-																						{ width: w, height: h}));
-									sizeSet = true;
-								}
-							}
-            	        }
+                        var sizeSet:Boolean = false;
+
+                            if (holder.contentLoaderInfo.contentType == "application/x-shockwave-flash")
+                        {
+                                                        if (childAllowsParent)
+                                                        {
+                                                                if (holder.content is IFlexDisplayObject)
+                                                                {
+                                                                        IFlexDisplayObject(holder.content).setActualSize(w, h);
+                                                                        sizeSet = true;
+                                                                }
+                                                        }
+
+                                                        if (!sizeSet)
+                                                        {
+                                                                if (swfBridge)
+                                                                {
+                                                                        swfBridge.dispatchEvent(new SWFBridgeRequest(SWFBridgeRequest.SET_ACTUAL_SIZE_REQUEST, false, false, null,
+                                                                                { width: w, height: h}));
+                                                                        sizeSet = true;
+                                                                }
+                                                        }
+                        }
 //                        if (holder.content is IFlexDisplayObject)
 //                        {
 //                            IFlexDisplayObject(holder.content).setActualSize(w, h);
@@ -1768,9 +1768,9 @@
                 }

                 if (!parentAllowsChild)
-                	contentHolder.scrollRect = new Rectangle(0, 0,
-                											 w / contentHolder.scaleX,
-                											 h / contentHolder.scaleY);
+                        contentHolder.scrollRect = new Rectangle(0, 0,
+                                                                                w / contentHolder.scaleX,
+                                                                                h / contentHolder.scaleY);
             }
             else
             {
@@ -1911,7 +1911,7 @@
             if (_autoLoad)
                 load(_source);
         }
-	}
+        }

     /**
      *  @private
@@ -1944,7 +1944,7 @@
         contentLoaded();

         if (contentHolder is Loader)
-   			removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
+                        removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);

     }

@@ -1968,36 +1968,36 @@

         // if we are loading a swf listen of a message if it ends up needing to
         // use a sandbox bridge to communicate.
-		addInitSystemManagerCompleteListener(LoaderInfo(event.target).loader.contentLoaderInfo);
-    }
-
-
-	/**
-	 * If we are loading a swf, listen for a message from the swf telling us it was loading
-	 * into an application domain where it needs to use a sandbox bridge to communicate.
-	 */
-	private function addInitSystemManagerCompleteListener(loaderInfo:LoaderInfo):void
-	{
-   		if (loaderInfo.contentType == "application/x-shockwave-flash")
-   		{
-			var bridge:EventDispatcher = loaderInfo.sharedEvents;
-			bridge.addEventListener(SWFBridgeEvent.BRIDGE_NEW_APPLICATION,
-			 					  initSystemManagerCompleteEventHandler);
-   		}
-	}
-
-	/**
-	 * Remove the listener after the swf is loaded.
-	 */
-	private function removeInitSystemManagerCompleteListener(loaderInfo:LoaderInfo):void
-	{
-   		if (loaderInfo.contentType == "application/x-shockwave-flash")
-   		{
-			var bridge:EventDispatcher = loaderInfo.sharedEvents;
-			bridge.removeEventListener(SWFBridgeEvent.BRIDGE_NEW_APPLICATION,
-				 					  initSystemManagerCompleteEventHandler);
-   		}
-	}
+                addInitSystemManagerCompleteListener(LoaderInfo(event.target).loader.contentLoaderInfo);
+    }
+
+
+        /**
+         * If we are loading a swf, listen for a message from the swf telling us it was loading
+         * into an application domain where it needs to use a sandbox bridge to communicate.
+         */
+        private function addInitSystemManagerCompleteListener(loaderInfo:LoaderInfo):void
+        {
+                if (loaderInfo.contentType == "application/x-shockwave-flash")
+                {
+                        var bridge:EventDispatcher = loaderInfo.sharedEvents;
+                        bridge.addEventListener(SWFBridgeEvent.BRIDGE_NEW_APPLICATION,
+                                                                  initSystemManagerCompleteEventHandler);
+                }
+        }
+
+        /**
+         * Remove the listener after the swf is loaded.
+         */
+        private function removeInitSystemManagerCompleteListener(loaderInfo:LoaderInfo):void
+        {
+                if (loaderInfo.contentType == "application/x-shockwave-flash")
+                {
+                        var bridge:EventDispatcher = loaderInfo.sharedEvents;
+                        bridge.removeEventListener(SWFBridgeEvent.BRIDGE_NEW_APPLICATION,
+                                                                          initSystemManagerCompleteEventHandler);
+                }
+        }

     /**
      *  @private
@@ -2023,7 +2023,7 @@
             dispatchEvent(event);

         if (contentHolder is Loader)
-   			removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
+                        removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);

     }

@@ -2068,7 +2068,7 @@
         dispatchEvent(event);

         if (contentHolder is Loader)
-   			removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
+                        removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
     }

     /**
@@ -2086,40 +2086,40 @@
                                                invalidateRequestHandler);

             var sm:ISystemManager = systemManager;
-			sm.removeChildBridge(_swfBridge);
-			_swfBridge = null;
+                        sm.removeChildBridge(_swfBridge);
+                        _swfBridge = null;
         }

         if (contentHolder is Loader)
-   			removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
-
-    }
-
-	/**
-	 *	@private
-	 *
-	 * 	Message dispatched from System Manager. This gives us the child bridge
-	 *  of the application we loaded.
-	 */
-	private function initSystemManagerCompleteEventHandler(event:Event):void
-	{
-		var eObj:Object = Object(event);
-
-		// make sure this is the child we created by checking the loader info.
-		if (contentHolder is Loader &&
-			eObj.data == Loader(contentHolder).contentLoaderInfo.sharedEvents)
-		{
-			_swfBridge = Loader(contentHolder).contentLoaderInfo.sharedEvents;
-
-			var sm:ISystemManager = systemManager;
-			sm.addChildBridge(_swfBridge, this);
-			removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
-
+                        removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
+
+    }
+
+        /**
+         *      @private
+         *
+         *      Message dispatched from System Manager. This gives us the child bridge
+         *  of the application we loaded.
+         */
+        private function initSystemManagerCompleteEventHandler(event:Event):void
+        {
+                var eObj:Object = Object(event);
+
+                // make sure this is the child we created by checking the loader info.
+                if (contentHolder is Loader &&
+                        eObj.data == Loader(contentHolder).contentLoaderInfo.sharedEvents)
+                {
+                        _swfBridge = Loader(contentHolder).contentLoaderInfo.sharedEvents;
+
+                        var sm:ISystemManager = systemManager;
+                        sm.addChildBridge(_swfBridge, this);
+                        removeInitSystemManagerCompleteListener(Loader(contentHolder).contentLoaderInfo);
+
             _swfBridge.addEventListener(SWFBridgeRequest.INVALIDATE_REQUEST,
                                        invalidateRequestHandler);
-		}
-	}
-
+                }
+        }
+
     /**
      *  @private
      *
@@ -2154,54 +2154,54 @@
     }

-	/**
-	 *	@private
-	 *
-	 * 	Put up or takedown a mouseshield that covers the content
-	 *  of the application we loaded.
-	 */
-	private function mouseShieldHandler(event:Event):void
-	{
-		if (event["name"] != "mouseShield")
-			return;
-
-		if (parentAllowsChild)
-			return;
-
-		if (event["value"])
-		{
-			if (!mouseShield)
-			{
-				mouseShield = new Sprite();
-				mouseShield.graphics.beginFill(0, 0);
-				mouseShield.graphics.drawRect(0, 0, 100, 100);
-				mouseShield.graphics.endFill();
-			}
-			if (!mouseShield.parent)
-				addChild(mouseShield);
-			sizeShield();
-
-		}
-		else
-		{
-			if (mouseShield && mouseShield.parent)
-				removeChild(mouseShield)
-		}
-	}
-
-	/**
-	 *	@private
-	 *
-	 * 	size the shield if needed
-	 */
-	private function sizeShield():void
-	{
-		if (mouseShield && mouseShield.parent)
-		{
-			mouseShield.width = unscaledWidth;
-			mouseShield.height = unscaledHeight;
-		}
-	}
+        /**
+         *      @private
+         *
+         *      Put up or takedown a mouseshield that covers the content
+         *  of the application we loaded.
+         */
+        private function mouseShieldHandler(event:Event):void
+        {
+                if (event["name"] != "mouseShield")
+                        return;
+
+                if (parentAllowsChild)
+                        return;
+
+                if (event["value"])
+                {
+                        if (!mouseShield)
+                        {
+                                mouseShield = new Sprite();
+                                mouseShield.graphics.beginFill(0, 0);
+                                mouseShield.graphics.drawRect(0, 0, 100, 100);
+                                mouseShield.graphics.endFill();
+                        }
+                        if (!mouseShield.parent)
+                                addChild(mouseShield);
+                        sizeShield();
+
+                }
+                else
+                {
+                        if (mouseShield && mouseShield.parent)
+                                removeChild(mouseShield)
+                }
+        }
+
+        /**
+         *      @private
+         *
+         *      size the shield if needed
+         */
+        private function sizeShield():void
+        {
+                if (mouseShield && mouseShield.parent)
+                {
+                        mouseShield.width = unscaledWidth;
+                        mouseShield.height = unscaledHeight;
+                }
+        }

     /**
      *  @private
@@ -2223,7 +2223,7 @@
         {
             // Ignore any errors trying to access the content
             // b/c we may cause a security violation trying to do it
-			// Also ignore if the sm doesn't have a regenerateStyleCache method
+                        // Also ignore if the sm doesn't have a regenerateStyleCache method
         }
     }

@@ -2247,43 +2247,43 @@
         {
             // Ignore any errors trying to access the content
             // b/c we may cause a security violation trying to do it
-			// Also ignore if the sm doesn't have a notifyStyleChangeInChildren method
+                        // Also ignore if the sm doesn't have a notifyStyleChangeInChildren method
         }
     }

-	private function getContentSize():Point
-	{
-		var pt:Point = new Point();
-
-		if (!contentHolder is Loader)
-			return pt;
-
-		var holder:Loader = Loader(contentHolder);
-		if (holder.contentLoaderInfo.childAllowsParent)
-		{
-			pt.x = holder.content.width;
-			pt.y = holder.content.height;
-		}
-		else
-		{
-			var bridge:IEventDispatcher = swfBridge;
-			if (bridge)
-			{
-				var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
-				bridge.dispatchEvent(request);
-				pt.x = request.data.width;
-				pt.y = request.data.height;
-			}
-		}
-
-		// don't return zero out of here otherwise the Loader's scale goes to zero
-		if (pt.x == 0)
-			pt.x = holder.contentLoaderInfo.width;
-		if (pt.y == 0)
-			pt.y = holder.contentLoaderInfo.height;
-
-		return pt;
-	}
+        private function getContentSize():Point
+        {
+                var pt:Point = new Point();
+
+                if (!contentHolder is Loader)
+                        return pt;
+
+                var holder:Loader = Loader(contentHolder);
+                if (holder.contentLoaderInfo.childAllowsParent)
+                {
+                        pt.x = holder.content.width;
+                        pt.y = holder.content.height;
+                }
+                else
+                {
+                        var bridge:IEventDispatcher = swfBridge;
+                        if (bridge)
+                        {
+                                var request:SWFBridgeRequest = new SWFBridgeRequest(SWFBridgeRequest.GET_SIZE_REQUEST);
+                                bridge.dispatchEvent(request);
+                                pt.x = request.data.width;
+                                pt.y = request.data.height;
+                        }
+                }
+
+                // don't return zero out of here otherwise the Loader's scale goes to zero
+                if (pt.x == 0)
+                        pt.x = holder.contentLoaderInfo.width;
+                if (pt.y == 0)
+                        pt.y = holder.contentLoaderInfo.height;
+
+                return pt;
+        }
 }

 }


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@1278633 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/spark/src/spark/components/DataGrid.as
+++ frameworks/projects/spark/src/spark/components/DataGrid.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.components
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 10870
Author:   cframpto@adobe.com
Date:     2009-10-05T18:23:10.599724Z

Log Message:
-----------
In the past when the width (or maxWidth) wasn’t specified we told TLF that the width was our default maxWidth=10000.  This had implications especially when the text was rtl or textAlign != left because it aligned over a width of 10000. With this change we let TLF measure.  It will figure out the widest line and use that for the width.  Text will be aligned on that width.  So if there is only one line, and no explicit width, left, center and right alignment all look the same.

Truncation results will be slightly different now if there isn’t an explicit width.  We will let TLF measure the width and it will use that width for the truncation.  Depending on whether the last line is the widest line or not, it may have to remove some of the text to make room for the truncation indicator.

QE notes: there are a handful of RichText and Label failures as a result of this change - Ella approved the submit.
Doc notes:
Bugs: SDK-22909
Reviewer: Gordon
Tests run: checkintests, TextArea, TextInput, NumericStepper, RichText, Label
Is noteworthy for integration: yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/TextBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RichText.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RichEditableText.as</path>

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

--- frameworks/projects/spark/src/spark/components/RichText.as
+++ frameworks/projects/spark/src/spark/components/RichText.as
@@ -888,30 +888,54 @@
 	 */
 	override mx_internal function composeTextLines(width:Number = NaN,
 												   height:Number = NaN):Boolean
-	{
+	{
+        // If there is no explicit width but there is an explicit
+        // maxWidth use that.
+        if (isNaN(width) && !isNaN(explicitMaxWidth))
+            width = explicitMaxWidth;
+
 		super.composeTextLines(width, height);

 		// Ignore damage events while we're re-composing the text lines.
         ignoreDamageEvent = true;

 		// Set the composition bounds to be used by createTextLines().
-		// If the width or height is NaN, it will be computed by this method
+        // If there is no explicit width, and there is no explicit maxWidth,
+        // the width will be computed by this method.
+		// If the height is NaN, it will be computed by this method
 		// by the time it returns.
 		// The bounds are then used by the addTextLines() method
 		// to determine the isOverset flag.
 		// The composition bounds are also reported by the measure() method.
+
 		bounds.x = 0;
 		bounds.y = 0;
-		bounds.width = isNaN(width) ? maxWidth : width;
+        bounds.width = width;
 		bounds.height = height;

 		removeTextLines();
 		releaseTextLines();

 		createTextLines();
-
-        // TODO (rfrishbe): can we optimize the "this" away since we know what the displayObject is now
-		addTextLines(this);
+
+        // Truncation only done if not measuring width and line breaks are
+        // toFit.  So if we are measuring, create the text lines to figure
+        // out their size and then recreate them using this size so truncation
+        // will be done.
+        if (maxDisplayedLines != 0 && !isTruncated &&
+            getStyle("lineBreak") == "toFit")
+        {
+            var bp:String = getStyle("blockProgression");
+            if ((isNaN(width) && bp == "tb") || (isNaN(height) && bp != "tb"))
+            {
+                textLines.length = 0;
+                // bounds contains the measured size of the lines created above
+                createTextLines();
+            }
+        }
+
+        // Add the new text lines to the container.
+        addTextLines();

 		// Figure out if the text overruns the available space for composition.
 		isOverset = isTextOverset(width, height);


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@1251211 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.as
+++ frameworks/projects/automation/src/mx/automation/codec/AdvancedDataGridSelectedCellCodec.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.automation.codec
 {