hasComplexContent(),hasOwnProperty(),hasSimpleContent()

--- frameworks/projects/XML/as/src/XML.as
+++ frameworks/projects/XML/as/src/XML.as
@@ -870,10 +870,25 @@
 		 */
 		public function hasComplexContent():Boolean
 		{
-			return false
-		}
-
-		public function hasOwnProperty():Boolean
+			/*
+				When the hasComplexContent method is called on an XML object x, the following steps are taken:
+				1. If x.[[Class]] ∈ {"attribute", "comment", "processing-instruction", "text"}, return false
+				2. For each property p in x
+				a. If p.[[Class]] == "element", return true
+				3. Return false
+			*/
+			if(_nodeKind == "attribute" || _nodeKind == "comment" || _nodeKind == "processing-instruction" || _nodeKind == "text")
+				return false;
+			var i:int;
+			for(i=0i<_children.length;i++)
+			{
+				if(_children[i].nodeKind() == "element")
+					return true;
+			}
+			return false;
+		}
+
+		public function hasOwnProperty(p:*):Boolean
 		{
 			/*
 				When the [[HasProperty]] method of an XML object x is called with property name P, the following steps are taken:
@@ -890,6 +905,23 @@
 				    i. Return true
 				5. Return false
 			*/
+			if(parseInt(p,10).toString() == p)
+				return p == "0";
+			var name:QName = toXMLName(p);
+			var i:int;
+			for(i=0;i<_attributes.length;i++)
+			{
+				if(_attributes[i].name().matches(name))
+					return true;
+			}
+			for(i=0;i<_children.length;i++)
+			{
+				if(_children[i].nodeKind() != "element")
+					continue;
+				if(_children[i].name().matches(name))
+					return true;
+			}
+			return false;
 		}

 		/**
@@ -900,7 +932,22 @@
 		 */
 		public function hasSimpleContent():Boolean
 		{
-			return false;
+			/*
+				When the hasSimpleContent method is called on an XML object x, the following steps are taken:
+				1. If x.[[Class]] ∈ {"comment", "processing-instruction"}, return false
+				2. For each property p in x
+				a. If p.[[Class]] == "element", return false
+				3. Return true
+			*/
+			if(_nodeKind == "comment" || _nodeKind == "processing-instruction")
+				return false;
+			var i:int;
+			for(i=0i<_children.length;i++)
+			{
+				if(_children[i].nodeKind() == "element")
+					return false;
+			}
+			return true;
 		}

 		/**


fix int type instead of uint in Geometry.updateBoundingVolumes()

--- src/aerys/minko/render/geometry/Geometry.as
+++ src/aerys/minko/render/geometry/Geometry.as
@@ -803,7 +803,7 @@
 			if (_bulkUpdate)
 				return ;

-			var numStreams	: int		= _vertexStreams.length;
+			var numStreams	: uint		= _vertexStreams.length;
 			var minX		: Number	= Number.MAX_VALUE;
 			var minY		: Number	= Number.MAX_VALUE;
 			var minZ		: Number	= Number.MAX_VALUE;


Transferred from the Adobe Open Source Subversion Repository

Revision: 12850
Author:   jimurphy@adobe.com
Date:     2009-12-11T14:57:14.623098Z

Log Message:
-----------
add 6 new DMV projects to the SDK:
automation
automation_air
automation_dmv
automation_flashflexkit
automation_spark
datavisualization

These projects are setup to build in an ant main call.  There are currently several warnings in the datavisualization project that will be cleaned up.  No checkintests exist for these projects as of yet.

I also modified the exisitng projects build files for easier management of the localization targets, bundle and fat-swc. If the projects that I updated:airframework,airspark,framework,playerglobal,rpc,and spark.  All the new projects have been implemented this same way.

QE notes: DMV folks should run through their tests
Doc notes: probably
Bugs: nope
Reviewer:
Tests run: ran the following targets: compile,checkintests,other.locales and doc
Is noteworthy for integration: no

Modified Paths:
--------------
1404 paths were modified

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

--- frameworks/projects/charts/src/mx/charts/chartClasses/DataTransform.as
+++ frameworks/projects/charts/src/mx/charts/chartClasses/DataTransform.as
@@ -0,0 +1,384 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.charts.chartClasses
+{
+
+import flash.events.Event;
+import flash.events.EventDispatcher;
+
+import mx.charts.LinearAxis;
+import mx.core.mx_internal;
+import mx.events.FlexEvent;
+
+use namespace mx_internal;
+
+//--------------------------------------
+//  Events
+//--------------------------------------
+
+/**
+ *  Dispatched when the transformation from data space to screen space
+ *  has changed, typically either because the axes that make up
+ *  the transformation have changed in some way,
+ *  or the data transform itself has size.
+ *
+ *  @eventType mx.events.FlexEvent.TRANSFORM_CHANGE
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 9
+ *  @playerversion AIR 1.1
+ *  @productversion Flex 3
+ */
+[Event(name="transformChange", type="mx.events.FlexEvent")]
+
+/**
+ *  The DataTransform object represents a portion of a chart
+ *  that contains glyphs and can transform values
+ *  to screen coordinates and vice versa.
+ *  Each DataTransform object has a horizontal axis, a vertical axis,
+ *  and a set of glyphs (background, data, and overlay) to render.
+ *
+ *
In theory, a chart can contain multiple overlaid DataTransform objects.
+ *  This allows you to display a chart with multiple data sets
+ *  rendered in the same area but with different ranges.
+ *  For example, you might want to show monthly revenues
+ *  compared to the number of units sold.
+ *  If revenue was typically in millions while units was typically
+ *  in the thousands, it would be difficult to render these effectively
+ *  along the same range.
+ *  Overlaying them in different DataTransform objects allows
+ *  the end user to compare trends in the values
+ *  when they are rendered with different ranges.

+ *
+ *
Charts can only contain one set of DataTransform.

+ *
+ *
Most of the time, you will use the ChartBase object,
+ *  which hides the existance of the DataTransform object
+ *  between the chart and its contained glyphs and axis objects.
+ *  If you create your own ChartElement objects, you must understand
+ *  the methods of the DataTransform class to correctly implement their element.

+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 9
+ *  @playerversion AIR 1.1
+ *  @productversion Flex 3
+ */
+public class DataTransform extends EventDispatcher
+{
+    include "../../core/Version.as";
+
+    //--------------------------------------------------------------------------
+    //
+    //  Constructor
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  Constructor.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function DataTransform()
+    {
+        super();
+    }
+
+    //--------------------------------------------------------------------------
+    //
+    //  Properties
+    //
+    //--------------------------------------------------------------------------
+
+    //----------------------------------
+    //  axes
+    //----------------------------------
+
+    /**
+     *  @private
+     *  Storage for the axes property.
+     */
+    private var _axes:Object = {};
+
+    [Inspectable(environment="none")]
+
+    /**
+     *  The set of axes associated with this transform.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function get axes():Object
+    {
+        return _axes;
+    }
+
+    //----------------------------------
+    //  elements
+    //----------------------------------
+
+    /**
+     *  @private
+     */
+    private var _elements:Array /* of ChartElement */ = [];
+
+    [Inspectable(environment="none")]
+
+    /**
+     *  The elements that are associated with this transform.
+     *  This Array includes background, series, and overlay elements
+     *  associated with the transform.
+     *  This value is assigned by the enclosing chart object.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function get elements():Array /* of ChartElement */
+    {
+        return _elements;
+    }
+
+    /**
+     *  @private
+     */
+    public function set elements(value:Array /* of ChartElement */):void
+    {
+        _elements = value;
+    }
+
+    //--------------------------------------------------------------------------
+    //
+    //  Methods
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  Maps a set of numeric values representing data to screen coordinates.
+     *  This method assumes the values are all numbers,
+     *  so any non-numeric values must have been previously converted
+     *  with the mapCache() method.
+     *
+     *  @param cache An array of objects containing the data values
+     *  in their fields. This is also where this function
+     *  will store the converted numeric values.
+     *
+     *  @param xField The field where the data values for the x axis
+     *  can be found.
+     *
+     *  @param xConvertedField The field where the mapped x screen coordinate
+     *  will be stored.
+     *
+     *  @param yField The field where the data values for the y axis
+     *  can be found.
+     *
+     *  @param yConvertedField The field where the mapped y screen coordinate
+     *  will be stored.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function transformCache(cache:Array /* of Object */,
+                                   xField:String, xConvertedField:String,
+                                   yField:String, yConvertedField:String):void
+    {
+    }
+
+    /**
+     *  Transforms x and y coordinates relative to the DataTransform
+     *  coordinate system into a two-dimensional value in data space.
+     *
+     *  @param ...values The x and y positions (in that order).
+     *
+     *  @return An Array containing the transformed values.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function invertTransform(...values):Array
+    {
+        return null;
+    }
+
+    /**
+     *  Informs the DataTransform that some of the underlying data
+     *  being represented on the chart has changed.
+     *  The DataTransform generally has no knowledge of the source
+     *  of the underlying data being represented by the chart,
+     *  so glyphs should call this when their data changes
+     *  so that the DataTransform can recalculate range scales
+     *  based on their data.
+     *  This does not invalidate the DataTransform,
+     *  because there is no guarantee the data has changed.
+     *  The axis objects (or range objects) must trigger an invalidate event.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function dataChanged():void
+    {
+        for (var p:String in _axes)
+        {
+            if (_axes[p])
+                _axes[p].dataChanged();
+        }
+    }
+
+    /**
+     *  Collects important displayed values for all elements
+     *  associated with this data transform.
+     *  Axis instances call this method to collect the values
+     *  they need to consider when auto-generating appropriate ranges.
+     *  This method returns an Array of BoundedValue objects.
+     *
+     *
To collect important values for the horizontal axis
+     *  of a CartesianTransform, pass 0.
+     *  To collect values for the vertical axis, pass 1.

+     *
+     *  @param dimension The dimension to collect values for.
+     *
+     *  @param requiredFields Defines the data that are required
+     *  by this transform.
+     *
+     *  @return A Array of BoundedValue objects.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function describeData(dimension:String, requiredFields:uint):Array /* of BoundedValue */
+    {
+        var results:Array /* of BoundedValue */ = [];
+
+        var n:int = elements.length;
+        for (var i:int = 0; i < n; i++)
+        {
+            var dataGlyph:IChartElement = (elements[i] as IChartElement);
+            if (!dataGlyph)
+                continue;
+
+            results = results.concat(
+                dataGlyph.describeData(dimension, requiredFields));
+        }
+
+        return results;
+    }
+
+    /**
+     *  Retrieves the axis instance responsible for transforming
+     *  the data dimension specified by the dimension parameter.
+     *  If no axis has been previously assigned, a default axis is created.
+     *  The default axis for all dimensions is a LinearAxis
+     *  with the autoAdjust property set to false.
+     *
+     *  @param dimension The dimension whose axis is responsible
+     *  for transforming the data.
+     *
+     *  @return The axis instance.
+     *
+     *  @see mx.charts.LinearAxis
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function getAxis(dimension:String):IAxis
+    {
+        if (!(_axes[dimension]))
+        {
+            var newAxis:LinearAxis = new LinearAxis();
+            newAxis.autoAdjust = false;
+            setAxisNoEvent(dimension,newAxis);
+        }
+
+        return _axes[dimension];
+    }
+
+    /**
+     *  Assigns an axis instance to a particular dimension of the transform.
+     *  Axis objects are assigned by the enclosing chart object.
+     *
+     *  @param dimension The dimension of the transform.
+     *  @param v The target axis instance.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
+     */
+    public function setAxis(dimension:String, v:IAxis):void
+    {
+			if(setAxisNoEvent(dimension, v))
+        mappingChangeHandler();
+    }
+
+    /**
+     *  @private
+     */
+		private function setAxisNoEvent(dimension:String, v:IAxis):Boolean
+    {
+        var oldV:IAxis = _axes[dimension];
+			if(oldV != v)
+			{
+
+        if (oldV)
+        {
+            oldV.unregisterDataTransform(this);
+            oldV.removeEventListener("mappingChange", mappingChangeHandler);
+        }
+
+        _axes[dimension] = v;
+
+        {
+            v.registerDataTransform(this, dimension);
+            v.addEventListener("mappingChange", mappingChangeHandler, false, 0, true);
+        }
+				return true;
+			}
+			return false;
+    }
+
+    //--------------------------------------------------------------------------
+    //
+    //  Event handlers
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     */
+    private function mappingChangeHandler(event:Event = null):void
+    {
+        var n:int = elements.length;
+        for (var i:int = 0; i < n; i++)
+        {
+            var g:IChartElement = elements[i] as IChartElement;
+            if (g)
+                g.mappingChanged();
+        }
+    }
+}
+
+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 10464
Author:   rfrishbe@adobe.com
Date:     2009-09-21T17:40:30.663638Z

Log Message:
-----------
Removing support in Flex framework for compatibility version < 3.  We won't support compatibility-version 2 or 2.01 anymore.  We only keep compatibility-version for one full release, so for Flex 4, we only support compatibility-version = 3.x.

This should reduce our code-size some as we no longer need this old code.  I didn't clean up the compiler's support for compatibility-versioning as it didn't seem worth the effort.

QE notes: -
Doc notes: -
Bugs: SDK-15360
Reviewer: Kevin
Tests run: checkintests, Joan ran all mustella tests
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/HaloBorder.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/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/accordionClasses/AccordionHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/utilityClasses/CanvasLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateChooser.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/mx/core/UITLFTextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NumericStepper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/AccordionHeaderSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Alert.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NavBar.as</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/core/UITextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ColorPicker.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeaderBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/treeClasses/TreeItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/TabNavigator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/FormItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.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/CheckBox.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/skins/halo/DateChooserYearArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/MenuBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/menuClasses/MenuBarItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/PanelSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/menuClasses/MenuItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/PopUpButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/scrollClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/colorPickerClasses/SwatchPanel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Accordion.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollTrackSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/utilityClasses/Flex.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/sliderClasses/Slider.as</path>

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

--- frameworks/projects/framework/src/mx/containers/utilityClasses/Flex.as
+++ frameworks/projects/framework/src/mx/containers/utilityClasses/Flex.as
@@ -14,7 +14,6 @@

 import mx.core.IChildList;
 import mx.core.IUIComponent;
-import mx.core.FlexVersion;

 [ExcludeClass]

@@ -160,10 +159,7 @@
 				}
 			}

-			if (FlexVersion.compatibilityVersion >= FlexVersion.VERSION_3_0)
-        	{
-            	distributeExtraWidth(parent, spaceForChildren);
-        	}
+			distributeExtraWidth(parent, spaceForChildren);
 		}

 		return spaceToDistribute;
@@ -294,10 +290,7 @@
 				}
 			}

-			if (FlexVersion.compatibilityVersion >= FlexVersion.VERSION_3_0)
-        	{
-            	distributeExtraHeight(parent, spaceForChildren);
-        	}
+			distributeExtraHeight(parent, spaceForChildren);
 		}

 		return spaceToDistribute;


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

--- frameworks/projects/framework/src/mx/graphics/RectangularDropShadow.as
+++ frameworks/projects/framework/src/mx/graphics/RectangularDropShadow.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2005-2007 Adobe Systems Incorporated
-//  All Rights Reserved.
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
 //
-//  NOTICE: Adobe permits you to use, modify, and distribute this file
-//  in accordance with the terms of the license agreement accompanying it.
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////


Transferred from the Adobe Open Source Subversion Repository

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

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

 package mx.messaging.messages
 {


more asdoc html format fixes

more asdoc html format fixes

--- FlexUnit4/src/org/flexunit/runner/Request.as
+++ FlexUnit4/src/org/flexunit/runner/Request.as
@@ -41,7 +41,7 @@

 	/**
 	 *
A Request is an abstract description of tests to be run.  It represents an object that
-	 * wraps tests when they are presented to the FlexUnitCore.  Requests can be
+	 * wraps tests when they are presented to the FlexUnitCore.  Requests can be
 	 * filtered and sorted to control the subset and order of tests to be executed.

 	 *
 	 * The following static methods can be used to create requests:


mouseMode becomes pan when selection is disabled and pan is enabled.

--- WeaveUISpark/src/weave/visualization/layers/InteractiveVisualization.as
+++ WeaveUISpark/src/weave/visualization/layers/InteractiveVisualization.as
@@ -158,8 +158,11 @@
 				_mouseMode = InteractionController.SELECT;
 			}
 			if (!enableSelection.value && isModeSelection(_mouseMode))
-			{
-				_mouseMode = null;//Weave.properties.toolInteractions.defaultDragMode.value;
+			{
+				if (enableZoomAndPan.value)
+					_mouseMode = InteractionController.PAN;
+				else
+					_mouseMode = null;//Weave.properties.toolInteractions.defaultDragMode.value;
 			}

 			updateMouseCursor();


accidentally commented out something that closed folders- un-commented it so it is again fixed

--- flexEditor/src/org/arisgames/editor/view/GameEditorObjectPaletteView.as
+++ flexEditor/src/org/arisgames/editor/view/GameEditorObjectPaletteView.as
@@ -624,7 +624,7 @@
         trace("In handleRefreshTreeEvent...");
         refreshData = true;
         this.renderTree();
-		//paletteTree.openFolders();
+		paletteTree.openFolders();
         trace("Done in handleRefreshTreeEvent.");
     }


Removed stupid debug statement.

Removed stupid debug statement.

--- flash/org/windmill/WMExplorer.as
+++ flash/org/windmill/WMExplorer.as
@@ -54,7 +54,6 @@
       if (!WMExplorer.running) { return; }
       var stage:Stage = Windmill.getStage();
       stage.removeChild(WMExplorer.borderSprite);
-      WMLogger.log('removing event listeners');
       stage.removeEventListener(MouseEvent.MOUSE_OVER, WMExplorer.highlight);
       stage.removeEventListener(MouseEvent.MOUSE_OVER, WMExplorer.select);
       stage.removeEventListener(MouseEvent.MOUSE_DOWN, WMExplorer.stop);


playing flag

playing flag

--- src/com/korisnamedia/audio/MixEngine.as
+++ src/com/korisnamedia/audio/MixEngine.as
@@ -53,6 +53,7 @@
     }

     public function start():void {
+        if(playing) return;
         trace("Start mix engine with " + numChannels + " channels");
         playing = true;
         lastUpdateTime = getTimer();


Transferred from the Adobe Open Source Subversion Repository

Revision: 7758
Author:   clucier@adobe.com
Date:     2009-06-11T21:36:28.533211Z

Log Message:
-----------
Misssed a few mx_internal qualifiers.
Reviewer: Ryan

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flash-integration/src/mx/flash/UIMovieClip.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flash-integration/src/mx/flash/FlexContentHolder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flash-integration/src/mx/flash/ContainerMovieClip.as</path>

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

--- frameworks/projects/flash-integration/src/mx/flash/ContainerMovieClip.as
+++ frameworks/projects/flash-integration/src/mx/flash/ContainerMovieClip.as
@@ -26,6 +26,8 @@
 import mx.core.IVisualElementContainer;
 import mx.core.mx_internal;
 import mx.managers.ILayoutManagerClient;
+
+use namespace mx_internal;

 [DefaultProperty("content")]

@@ -130,19 +132,19 @@
         // take the contentHolderObj into account at all
         if (contentHolderObj)
         {
-            var oldScaleX:Number = contentHolderObj.mx_internal::$scaleX;
-            var oldScaleY:Number = contentHolderObj.mx_internal::$scaleY;
+            var oldScaleX:Number = contentHolderObj.$scaleX;
+            var oldScaleY:Number = contentHolderObj.$scaleY;

-            contentHolderObj.mx_internal::$scaleX = 0.001;
-            contentHolderObj.mx_internal::$scaleY = 0.001;
+            contentHolderObj.$scaleX = 0.001;
+            contentHolderObj.$scaleY = 0.001;
         }

         var bounds:Rectangle = getBounds(this);

         if (contentHolderObj)
         {
-            contentHolderObj.mx_internal::$scaleX = oldScaleX;
-            contentHolderObj.mx_internal::$scaleY = oldScaleY;
+            contentHolderObj.$scaleX = oldScaleX;
+            contentHolderObj.$scaleY = oldScaleY;
         }

         return bounds;
@@ -326,8 +328,8 @@
             if (!scaleContentWhenResized)
             {
                 // apply inverse of the scale
-                contentHolderObj.scaleX = 1/mx_internal::scaleXDueToSizing;
-                contentHolderObj.scaleY = 1/mx_internal::scaleYDueToSizing;
+                contentHolderObj.scaleX = 1/scaleXDueToSizing;
+                contentHolderObj.scaleY = 1/scaleYDueToSizing;
             }
             else
             {


Transferred from the Adobe Open Source Subversion Repository

Revision: 10464
Author:   rfrishbe@adobe.com
Date:     2009-09-21T17:40:30.663638Z

Log Message:
-----------
Removing support in Flex framework for compatibility version < 3.  We won't support compatibility-version 2 or 2.01 anymore.  We only keep compatibility-version for one full release, so for Flex 4, we only support compatibility-version = 3.x.

This should reduce our code-size some as we no longer need this old code.  I didn't clean up the compiler's support for compatibility-versioning as it didn't seem worth the effort.

QE notes: -
Doc notes: -
Bugs: SDK-15360
Reviewer: Kevin
Tests run: checkintests, Joan ran all mustella tests
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/HaloBorder.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/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/accordionClasses/AccordionHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/utilityClasses/CanvasLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateChooser.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/mx/core/UITLFTextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NumericStepper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/AccordionHeaderSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Alert.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NavBar.as</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/core/UITextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ColorPicker.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeaderBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/treeClasses/TreeItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/TabNavigator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/FormItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.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/CheckBox.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/skins/halo/DateChooserYearArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/MenuBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/menuClasses/MenuBarItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/PanelSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/menuClasses/MenuItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/PopUpButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/scrollClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/colorPickerClasses/SwatchPanel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Accordion.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollTrackSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/utilityClasses/Flex.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/sliderClasses/Slider.as</path>

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

--- frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridHeader.as
+++ frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridHeader.as
@@ -27,7 +27,6 @@
 import mx.controls.DataGrid;
 import mx.core.EdgeMetrics;
 import mx.core.FlexSprite;
-import mx.core.FlexVersion;
 import mx.core.IFlexDisplayObject;
 import mx.core.UIComponent;
 import mx.core.UIComponentGlobals;
@@ -316,27 +315,17 @@
             headerBG.name = "headerBG";
             addChildAt(DisplayObject(headerBG), 0);

-            if (FlexVersion.compatibilityVersion >= FlexVersion.VERSION_3_0)
-            {
-                var headerBGSkinClass:Class = getStyle("headerBackgroundSkin");
-                var headerBGSkin:IFlexDisplayObject = new headerBGSkinClass();
-
-                if (headerBGSkin is ISimpleStyleClient)
-                    ISimpleStyleClient(headerBGSkin).styleName = this;
-                headerBG.addChild(DisplayObject(headerBGSkin));
-            }
+            var headerBGSkinClass:Class = getStyle("headerBackgroundSkin");
+            var headerBGSkin:IFlexDisplayObject = new headerBGSkinClass();
+
+            if (headerBGSkin is ISimpleStyleClient)
+                ISimpleStyleClient(headerBGSkin).styleName = this;
+            headerBG.addChild(DisplayObject(headerBGSkin));
         }
         if (dataGrid.headerVisible)
         {
             headerBG.visible = true;
-            if (FlexVersion.compatibilityVersion < FlexVersion.VERSION_3_0)
-            {
-                dataGrid._drawHeaderBackground(headerBG);
-            }
-            else
-            {
-                drawHeaderBackgroundSkin(IFlexDisplayObject(headerBG.getChildAt(0)));
-            }
+            drawHeaderBackgroundSkin(IFlexDisplayObject(headerBG.getChildAt(0)));
             dataGrid._drawSeparators();
         }
         else


Transferred from the Adobe Open Source Subversion Repository

Revision: 8238
Author:   smgilson@adobe.com
Date:     2009-06-25T17:25:59.965879Z

Log Message:
-----------
More post PARB ASDoc cleanup

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

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.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/VGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HGroup.as</path>

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

--- frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as
+++ frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as
@@ -24,8 +24,9 @@
 import spark.layouts.supportClasses.LayoutBase;

 /**
- *  Dispatched when a renderer is added to the dataGroup.
- * event.renderer is the renderer that was added.
+ *  Dispatched when a renderer is added to the container.
+ *  The event.renderer property contains
+ *  the renderer that was added.
  *
  *  @eventType spark.events.RendererExistenceEvent.RENDERER_ADD
  *
@@ -37,8 +38,9 @@
 [Event(name="rendererAdd", type="spark.events.RendererExistenceEvent")]

 /**
- *  Dispatched when a renderer is removed from the dataGroup.
- * event.renderer is the renderer that was removed.
+ *  Dispatched when a renderer is removed from the container.
+ *  The event.renderer property contains
+ *  the renderer that was removed.
  *
  *  @eventType spark.events.RendererExistenceEvent.RENDERER_REMOVE
  *
@@ -662,9 +664,15 @@
     //--------------------------------------------------------------------------

     /**
-     *  Given a data item, return the toString() representation
-     *  of the data item for an item renderer to display. Null
-     *  data items return the empty string.
+     *  From the specified data item, return the String representation
+     *  of the data item for an item renderer to display.
+     *  This method uses the toString() method of
+     *  the data item to convert it to a String representation.
+     *  A Null data item returns an empty string.
+     *
+     *  @param item The data item.
+     *
+     *  @return The String representation of the data item.
      *
      *  @langversion 3.0
      *  @playerversion Flash 10
@@ -679,15 +687,12 @@
     }

     /**
-     *  Updates the renderer for use/re-use. When a renderer is first
-     *  created, or when it is recycled because of virtualization, this
-     *  SkinnableDataContainer gets the chance to come in and set the
-     *  renderer's label property as well as the
-     *  owner property. This is how, from a renderer, one
-     *  can access the parent component "owning" the renderer. In cases
-     *  like Lists and SkinnableDataContainers, the owner property points
-     *  to the List or SkinnableDataContainer even though the dataGroup
-     *  part is actually parenting the renderers.
+     *  Updates an item renderer for use or reuse.
+     *  When an item renderer is first created,
+     *  or when it is recycled because of virtualization, this
+     *  SkinnableDataContainer instance can set the
+     *  item renderer's label property and
+     *  owner property.
      *
      *  @param renderer The renderer being updated
      *


Transferred from the Adobe Open Source Subversion Repository

Revision: 6609
Author:   gruehle@adobe.com
Date:     2009-05-04T22:47:31.285324Z

Log Message:
-----------
Add theme attribute to theme-specific style metadata.

Example of a halo-specific style:
[Style(name="cornerRadius", type="Number", format="Length", inherit="no", theme="halo")]

Example of a spark-specific style:
[Style(name="baseColor", type="uint", format="Color", inherit="yes", theme="spark")]

Style metadata without a theme attribute is theme-agnostic, and works with either spark or halo.

Bugs: SDK-20606

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/Scroller.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/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/metadata/FillStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateChooser.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ButtonBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NumericStepper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/NumericStepper.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/frameworks/projects/framework/src/mx/controls/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ColorPicker.as</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/components/TextArea.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/framework/src/mx/styles/metadata/BorderStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/Spinner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/metadata/BarColorStyle.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/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/metadata/IconColorStyles.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/PopUpButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/scrollClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/metadata/SelectedFillColorsStyle.as</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/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/TextBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ScrollControlBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/sliderClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/SkinnableComponent.as</path>

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

--- frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as
+++ frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as
@@ -64,7 +64,7 @@
  *  @playerversion AIR 1.5
  *  @productversion Flex 4
  */
-[Style(name="focusColor", type="uint", format="Color", inherit="yes")]
+[Style(name="focusColor", type="uint", format="Color", inherit="yes", theme="spark")]

 [DefaultProperty("dataProvider")]


Transferred from the Adobe Open Source Subversion Repository

Revision: 17633
Author:   hmuller@adobe.com
Date:     2010-09-09T17:29:07.866937Z

Log Message:
-----------
GridColumn itemRendererFunction signature change: added second GridColumn parameter.

QE notes:
Doc notes:
Bugs:
Reviewer: Carol
Tests run: checkin, mustella cyclone
Is noteworthy for integration: no

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

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

--- frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
+++ frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as
@@ -353,13 +353,20 @@
     [Bindable("itemRendererFunctionChanged")]

     /**
-     *  If specified, the value of this property must be a function
+     *  If specified, the value of this property must be an idempotent function
      *  that returns an item renderer IFactory based on its dataProvider item
-     *  parameter.  Specifying an itemRendererFunction makes it possible to
-     *  employ more than one item renderer in this column.
+     *  and column parameters.  Specifying an itemRendererFunction makes it possible to
+     *  employ more than one item renderer in this column.
+     *
+     *
The itemRendererFunction's signature must match the following:
+     *
+     *
itemRendererFunction(item:Object, column:GridColumn):IFactory

+     *
+     *  The item parameter is the dataProvider item for an entire row; it's
+     *  the value of grid.dataProvider.getItemAt(rowIndex).  The second
+     *  parameter is this column.

      *
      *
Here's an example of an itemRendererFunction:

-     *
      *

      *  function myItemRendererFunction(item:Object, column:GridColumn):IFactory
      *  {
@@ -400,9 +407,10 @@
     [Bindable("labelFunctionChanged")]

     /**
-     *  A idempotent function that converts a dataProvider item into a column-specific string
+     *  An idempotent function that converts a dataProvider item into a column-specific string
      *  that's used to initialize the item renderer's label property.
-     *  A labelFunction can be use to combine the values of several dataProvider item
+     *
+     *
A labelFunction can be use to combine the values of several dataProvider item
      *  properties into a single string.  If specified, this property is used by the
      *  itemToLabel() method, which computes the value of each item
      *  renderer's label property in this column.
@@ -789,7 +797,9 @@
     public function itemToRenderer(item:Object):IFactory
     {
         const itemRendererFunction:Function = itemRendererFunction;
-        return (itemRendererFunction != null) ? itemRendererFunction(item) : itemRenderer;
+        var factory:IFactory = (itemRendererFunction != null) ? itemRendererFunction(item, this) : itemRenderer;
+
+        return factory;
     }

     /**


Transferred from the Adobe Open Source Subversion Repository

Revision: 19889
Author:   hmuller@adobe.com
Date:     2011-01-22T00:49:02.454494Z

Log Message:
-----------
Remove the final vestigial validateNow() from GridLayout/layoutItemRenderer().

QE notes: Four Mustella tests to be updated (Jacob)
Doc notes:
Bugs:
Reviewer: Ryan
Tests run: checkin, mustella
Is noteworthy for integration: no

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

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

--- frameworks/projects/spark/src/spark/components/gridClasses/GridLayout.as
+++ frameworks/projects/spark/src/spark/components/gridClasses/GridLayout.as
@@ -679,7 +679,7 @@
      *  @private
      *  Use the specified GridColumn's itemRenderer (IFactory) to create a temporary
      *  item renderer.   The returned item renderer must be freed, with freeGridElement(),
-     *  after it's used.
+     *  and removed from the rendererLayer after it's used.
      */
     private function createTypicalItemRenderer(columnIndex:int):IGridItemRenderer
     {
@@ -721,9 +721,7 @@
             columnWidth = 4096;

         layoutItemRenderer(renderer, 0, 0, columnWidth, NaN);
-
-        rendererLayer.removeElement(renderer);
-
+
         return renderer;
     }

@@ -740,6 +738,10 @@
      */
     private function updateVisibleTypicalCellSizes(width:Number, scrollX:Number, firstVisibleColumnIndex:int):void
     {
+        const rendererLayer:GridLayer = getLayer("rendererLayer");
+        if (!rendererLayer)
+            return;
+
         const gridDimensions:GridDimensions = gridDimensions;
         const columnCount:int = gridDimensions.columnCount;
         const startCellX:Number = gridDimensions.getCellX(0 /* rowIndex */, firstVisibleColumnIndex);
@@ -772,6 +774,8 @@
                     cellHeight = renderer.getPreferredBoundsHeight();
                     gridDimensions.setTypicalCellHeight(columnIndex, cellHeight);
                 }
+
+                rendererLayer.removeElement(renderer);
                 freeGridElement(renderer);
             }

@@ -789,6 +793,10 @@
      */
     private function updateTypicalCellSizes():void
     {
+        const rendererLayer:GridLayer = getLayer("rendererLayer");
+        if (!rendererLayer)
+            return;
+
         const gridDimensions:GridDimensions = gridDimensions;
         const columnCount:int = gridDimensions.columnCount;
         const columnGap:int = gridDimensions.columnGap;
@@ -833,6 +841,8 @@
                     cellHeight = renderer.getPreferredBoundsHeight();
                     gridDimensions.setTypicalCellHeight(columnIndex, cellHeight);
                 }
+
+                rendererLayer.removeElement(renderer);
                 freeGridElement(renderer);
             }
             measuredColumnCount++;
@@ -2133,18 +2143,16 @@
         if (enablePerformanceStatistics)
             startTime = getTimer();

-        const validateNowRenderer:IInvalidating = renderer as IInvalidating;
-        const graphicElementRenderer:IGraphicElement = renderer as IGraphicElement;
-
         if (!isNaN(width) || !isNaN(height))
         {
-            const validateClientRenderer:ILayoutManagerClient = renderer as ILayoutManagerClient
-            if (validateClientRenderer)
-            {
+            if (renderer is ILayoutManagerClient)
+            {
+                const validateClientRenderer:ILayoutManagerClient = renderer as ILayoutManagerClient;
                 LayoutManager.getInstance().validateClient(validateClientRenderer, true); // true => skip validateDisplayList()
             }
-            else if (graphicElementRenderer)
-            {
+            else if (renderer is IGraphicElement)
+            {
+                const graphicElementRenderer:IGraphicElement = renderer as IGraphicElement;
                 graphicElementRenderer.validateProperties();
                 graphicElementRenderer.validateSize();
             }
@@ -2152,16 +2160,8 @@
             renderer.setLayoutBoundsSize(width, height);
         }

-        // For graphic elements we don't want to call validateNow() since it calls
-        // validateClient on the parent of the graphic element which is the GridLayer.
-
-        if (graphicElementRenderer)
-            graphicElementRenderer.validateDisplayList();
-        else if (validateNowRenderer)
-            validateNowRenderer.validateNow();
-
         renderer.setLayoutBoundsPosition(x, y);
-
+
         if (enablePerformanceStatistics)
         {
             var elapsedTime:Number = getTimer() - startTime;


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

--- frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as
+++ frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as
@@ -258,7 +258,7 @@
     private var _horizontalScrollPosition:Number = 0;

     [Bindable]
-    [Inspectable(category="General")]
+    [Inspectable(category="General", minValue="0.0")]

     /**
      *  @copy spark.core.IViewport#horizontalScrollPosition
@@ -294,7 +294,7 @@
     private var _verticalScrollPosition:Number = 0;

     [Bindable]
-    [Inspectable(category="General")]
+    [Inspectable(category="General", minValue="0.0")]

     /**
      *  @copy spark.core.IViewport#verticalScrollPosition


decrement _count when releasing an object; increment _count when inserting to active set regardless of whether object was in inactive set or not.  Now requestAll() will get everything from the inactive set any time it is called.  (Now _count is exactly _activeSet.length; maybe it's not needed.)

--- src/hype/framework/core/ObjectPool.as
+++ src/hype/framework/core/ObjectPool.as
@@ -96,6 +96,7 @@

 			if (_inactiveSet.length > 0) {
 				obj = _inactiveSet.pull();
+				++_count;
 				_activeSet.insert(obj);
 				onRequestObject(obj);

@@ -131,6 +132,7 @@
 		 */
 		public function release(object:Object):Boolean {
 			if (_activeSet.remove(object)) {
+				--_count;
 				_inactiveSet.insert(object);

 				if (autoClean) {


fix Main

fix Main

--- src/milkshape/media/flash/src/Main.as
+++ src/milkshape/media/flash/src/Main.as
@@ -1,6 +1,5 @@
 package
 {
-	import cc.milkshape.framework.Application;
 	import cc.milkshape.main.*;
 	import cc.milkshape.preloader.PreloaderKb;
 	import cc.milkshape.preloader.events.PreloaderEvent;
@@ -11,6 +10,7 @@
 	import cc.milkshape.utils.TableLine;

 	import flash.display.Shape;
+	import flash.display.Sprite;
 	import flash.display.StageAlign;
 	import flash.display.StageScaleMode;
 	import flash.events.Event;
@@ -21,7 +21,7 @@

 	[SWF(width='1430', height='680', frameRate='31', backgroundColor='#191919')]

-	public class Main extends Application
+	public class Main extends Sprite
 	{
 		private static var _instance:Main = null;
 		private const DEFAULT_CONTAINER_POSX:int = 20;


Update test case.

Update test case.

--- src/avm2/tests/regress/correctness/prot-2.as
+++ src/avm2/tests/regress/correctness/prot-2.as
@@ -4,6 +4,9 @@
   }
   protected function get getA() {
     return 0;
+  }
+  protected function set setA(v) {
+    trace ("setA " + v);
   }
   static protected function set staticSetA(v) {
     trace ("staticSetA " + v);
@@ -16,7 +19,9 @@
   protected function get getB() {
     return 1;
   }
-
+  protected function set setB(v) {
+    trace ("setB " + v);
+  }
   static protected function set staticSetB(v) {
     trace ("staticSetB " + v);
   }
@@ -28,14 +33,20 @@
   protected function get getC() {
     return 2;
   }
+  protected function set setC(v) {
+    trace ("setC " + v);
+  }
   static protected function set staticSetC(v) {
     trace ("staticSetC " + v);
   }

   public function foo() {
     trace(getA + getB + getC);
+    setA = "A";
+    setB = "B";
+    setC = "C";
+
     trace(staticGetA + staticGetB + staticGetC);
-
     staticSetA = "A";
     staticSetB = "B";
     staticSetC = "C";


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

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

 package mx.managers.systemClasses
 {


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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

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

--- frameworks/projects/mx/src/mx/controls/listClasses/ListBaseFindPending.as
+++ frameworks/projects/mx/src/mx/controls/listClasses/ListBaseFindPending.as
@@ -0,0 +1,115 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2005-2006 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.controls.listClasses
+{
+
+import mx.collections.CursorBookmark;
+
+[ExcludeClass]
+
+/**
+ *  @private
+ *  The object that we use to store seek data
+ *  that was interrupted by an ItemPendingError.
+ *  Used when searching for a string.
+ */
+public class ListBaseFindPending
+{
+	include "../../core/Version.as";
+
+	//--------------------------------------------------------------------------
+	//
+	//  Constructor
+	//
+	//--------------------------------------------------------------------------
+
+	/**
+	 *  Constructor.
+	 */
+	public function ListBaseFindPending(searchString:String,
+										startingBookmark:CursorBookmark,
+										bookmark:CursorBookmark,
+										offset:int, currentIndex:int,
+										stopIndex:int)
+	{
+		super();
+
+		this.searchString = searchString;
+		this.startingBookmark = startingBookmark;
+		this.bookmark = bookmark;
+		this.offset = offset;
+		this.currentIndex = currentIndex;
+		this.stopIndex = stopIndex;
+	}
+
+	//--------------------------------------------------------------------------
+	//
+	//  Properties
+	//
+	//--------------------------------------------------------------------------
+
+	//----------------------------------
+	//  bookmark
+	//----------------------------------
+
+	/**
+	 *  The bookmark we have to seek to when the data arrives
+	 */
+	public var bookmark:CursorBookmark;
+
+	//----------------------------------
+	//  currentIndex
+	//----------------------------------
+
+	/**
+	 *  The currentIndex we are looking at when we hit the page fault
+	 */
+	public var currentIndex:int;
+
+	//----------------------------------
+	//  offset
+	//----------------------------------
+
+	/**
+	 *  The offset from the bookmark we have to seek to when the data arrives
+	 */
+	public var offset:int;
+
+	//----------------------------------
+	//  searchString
+	//----------------------------------
+
+	/**
+	 *  The string we were searching for when the hit the page fault
+	 */
+	public var searchString:String;
+
+	//----------------------------------
+	//  startingBookmark
+	//----------------------------------
+
+	/**
+	 *  The bookmark where we were when we started
+	 */
+	public var startingBookmark:CursorBookmark;
+
+	//----------------------------------
+	//  stopIndex
+	//----------------------------------
+
+	/**
+	 *  The index we should stop at
+	 */
+	public var stopIndex:int;
+}
+
+}


Changed code to allow users to use the word expects or expected to specify an expected error. Issue comes from differing docs in the JUnit world

git-svn-id: 9278a788294a4258aac04586390fc35fb4a5f335@7337 a9308255-753e-0410-a2e9-80b3fbc4fff6

--- FlexUnit4/src/org/flexunit/internals/runners/statements/ExpectException.as
+++ FlexUnit4/src/org/flexunit/internals/runners/statements/ExpectException.as
@@ -53,9 +53,16 @@
 		}

 		public static function hasExpected( method:FrameworkMethod ):String {
-			var expected:String = method.getSpecificMetaDataArg( "Test", "expected" );
+			//There is conflicting docs in the JUnit world about expects versus expected being the right metadata for this
+			//particular case, so we are going to support them both
+			var expected:String = method.getSpecificMetaDataArg( "Test", "expects" );
 			var hasExpected:Boolean = expected && ( expected.length>0 );
-
+
+			if ( !hasExpected ) {
+				//check for the tag expected too, as it is documented both ways
+				expected = method.getSpecificMetaDataArg( "Test", "expected" );
+				hasExpected = expected && ( expected.length>0 );
+			}
 			return hasExpected?expected:null;
 		}


Transferred from the Adobe Open Source Subversion Repository

Revision: 22329
Author:   jasonsj@adobe.com
Date:     2011-08-31T19:48:14.005373Z

Log Message:
-----------
Fix CalloutPosition.AUTO edge cases:
* CalloutPosition.AUTO and the callout is sized larger than the owner. Add interior position support only in this case
* Set margin to zero when arrow is on the nudged side of the callout
* Do not use callout size to compute AUTO positions, use only available space

Remove CalloutButton TODOs

QE notes:
Doc notes:
Bugs:
SDK-31258 when the app is running on smaller devices (non-tablet), callout position changes
Reviewer: betravis
Tests run: checkintests, mustella-mobile
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/4.y/frameworks/projects/mobilecomponents/src/spark/components/CalloutButton.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/4.y/frameworks/projects/mobilecomponents/src/spark/components/Callout.as</path>

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

--- frameworks/projects/mobilecomponents/src/spark/components/CalloutButton.as
+++ frameworks/projects/mobilecomponents/src/spark/components/CalloutButton.as
@@ -686,7 +686,6 @@
      */
     public function closeDropDown():void
     {
-        // TODO (jasonsj): add commit param?
         dropDownController.closeDropDown(false);
     }

@@ -738,7 +737,6 @@
         {
             removeEventListener(Event.REMOVED_FROM_STAGE, button_removedFromStage);

-            // TODO (jasonsj): close params?
             // Dispatch the close event after the callout's PopUpEvent.CLOSE fires
             callout.close();
         }


Transferred from the Adobe Open Source Subversion Repository

Revision: 23243
Author:   cframpto@adobe.com
Date:     2011-12-20T00:59:57.384047Z

Log Message:
-----------
In frameworks, remove Adobe headers from all files except xml/mxml file types.  There are also a few .txt files that are license files that I didn't touch yet.

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

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

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

 package mx.controls.menuClasses
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 3593
Author:   smgilson@adobe.com
Date:     2008-10-13T17:42:13.039023Z

Log Message:
-----------
ASdoc updates

Checkin Test Passed: Yes
QA: No
Bug:
Doc: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxRange.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxTrackBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxScrollBar.as</path>

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

--- frameworks/projects/spark/src/spark/components/supportClasses/TrackBase.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/TrackBase.as
@@ -21,7 +21,7 @@
  *  Dispatched when the value of the control changes
  *  as a result of user interaction.
  *
- *  @eventType flash.events.Event
+ *  @eventType flash.events.Event.CHANGE
  */
 [Event(name="change", type="flash.events.Event")]

@@ -31,15 +31,15 @@
 [SkinStates("normal", "disabled")]

 /**
- *  TrackBase is a base class for components with a track
- *  and one or more thumbs such as Slider and ScrollBar. It
- *  declares two required SkinParts, thumb and
- *  track. TrackBase also provides the code for
- *  thumb dragging which is shared by Slider and ScrollBar.
+ *  The FxTrackBase class is a base class for components with a track
+ *  and one or more thumb buttons, such as FxSlider and FxScrollBar. It
+ *  declares two required skin parts: thumb and
+ *  track.
+ *  The FxTrackBase class also provides the code for
+ *  dragging the thumb button, which is shared by the FxSlider and FxScrollBar classes.
  *
- *  @see mx.components.Range
- *  @see mx.components.Slider
- *  @see mx.components.ScrollBar
+ *  @see mx.components.baseClasses.FxSlider
+ *  @see mx.components.baseClasses.FxScrollBar
  */
 public class FxTrackBase extends FxRange
 {
@@ -68,11 +68,11 @@
     [SkinPart]

     /**
-     *  thumb is a SkinPart that defines a button
+     *  A skin part that defines a button
      *  that can be dragged along the track to increase or
-     *  decrease the slider's value property.
-     *  Updates to the value through other means
-     *  will automatically update the position of the thumb
+     *  decrease the value property.
+     *  Updates to the value property
+     *  automatically update the position of the thumb button
      *  with respect to the track.
      */
     public var thumb:FxButton;
@@ -80,9 +80,9 @@
     [SkinPart]

     /**
-     *  track is a SkinPart that defines a button
-     *  that, when  pressed, will set the value
-     *  to the value corresponding with that position.
+     *  A skin part that defines a button
+     *  that when  pressed sets the value property
+     *  to the value corresponding with the current button position on the track.
      */
     public var track:FxButton;

@@ -102,7 +102,8 @@
     //--------------------------------------------------------------------------

     /**
-     *  Enable/disable this component. This also enables/disables any of the
+     *  Enable (true) or disable (false) this component.
+     *  This property also enables and disables any of the
      *  skin parts for this component.
      */
     override public function set enabled(value:Boolean):void
@@ -112,24 +113,36 @@
         invalidateSkinState();
     }

+    /**
+     *  @inheritDoc
+     */
     override public function set maximum(value:Number):void
     {
         super.maximum = value;
         invalidateDisplayList();
     }

+    /**
+     *  @inheritDoc
+     */
     override public function set minimum(value:Number):void
     {
         super.minimum = value;
         invalidateDisplayList();
     }

+    /**
+     *  @inheritDoc
+     */
     override public function set value(newValue:Number):void
     {
         super.value = newValue;
         invalidateDisplayList();
     }

+    /**
+     *  @inheritDoc
+     */
     override protected function setValue(value:Number):void
     {
         super.setValue(value);
@@ -149,10 +162,13 @@
     private var _clickOffset:Point;

     /**
-     *  The clickOffset is the point in the local coordinates of
-     *  the thumb where the last mouse down event occurred. This
-     *  is used by calculateNewValue() to determine what value
-     *  the thumb has been dragged to.
+     *  The point in the local coordinates of
+     *  the thumb button where the last mouse down event occurred.
+     *  This property is used by the calculateNewValue() method
+     *  to determine the value that the thumb button has been dragged to.
+     *
+     *  @return Point object rerpresenting, in the local coordinates of
+     *  the thumb button, where the last mouse down event occurred.
      */
     protected function get clickOffset():Point
     {
@@ -164,12 +180,17 @@
     //---------------------------------

     /**
-     *  This method returns the size of the logical track.
+     *  The size of the logical track.
      *  Subclasses need to override this method to return
-     *  an appropriate value. Note that this number can
+     *  an appropriate value.
+     *
+     *
Note that this number can
      *  represent any system of units, but those units must
-     *  be consistent with the values returned by
-     *  pointToPosition, thumbSize, and valueToPosition.
+     *  be consistent with the values returned by the
+     *  pointToPosition(), calculateThumbSize(),
+     *  and valueToPosition() methods.

+     *
+     *  @return The size of the logical track.
      */
     protected function get trackSize():Number
     {
@@ -183,10 +204,10 @@
     private var _thumbSize:Number = 0;

     /**
-     *  The size of the thumb on the logical track in the
+     *  The size of the thumb button on the logical track in the
      *  units of the subclass, which must be consistent with
-     *  trackSize, pointToPosition and valueToPosition. The
-     *  default thumbSize on the logical track is 0.
+     *  trackSize property, and with
+     *  the pointToPosition() and valueToPosition() methods.
      *
      *  @default 0
      */
@@ -195,6 +216,9 @@
         return _thumbSize;
     }

+    /**
+     *  @private
+     */
     protected function set thumbSize(value:Number):void
     {
         if (value == _thumbSize)
@@ -226,13 +250,13 @@
     /**
      *  @inheritDoc
      */
-	override protected function getUpdatedSkinState():String
-	{
-		return enabled ? "normal" : "disabled";
-	}
-
-    /**
-     *  Adds event handlers to the track and thumb for mouse events.
+    override protected function getUpdatedSkinState():String
+    {
+        return enabled ? "normal" : "disabled";
+    }
+
+    /**
+     *  @inheritDoc
      */
     override protected function partAdded(partName:String, instance:Object):void
     {
@@ -255,7 +279,7 @@
     }

     /**
-     *  Remove event handlers from skin parts.
+     *  @inheritDoc
      */
     override protected function partRemoved(partName:String, instance:Object):void
     {
@@ -274,7 +298,10 @@
     }

     /**
-     *  Make the skins reflect the enabled state of TrackBase
+     *  Set the enabled property of the skins parts.
+     *
+     *  @param value true to enable the skin parts,
+     *  and false to disable them.
      */
     protected function enableSkinParts(value:Boolean):void
     {
@@ -285,10 +312,16 @@
     }

     /**
-     *  Utility method which returns the Range value for a given
-     *  position on the track. The Range value is calculated by
-     *  finding what fraction of the logical track the position
-     *  represents and then multiplying that by the Range.
+     *  Return the value corresponding to a position on the track.
+     *  The value is calculated by
+     *  finding what fraction of the logical track the position
+     *  represents, and then multiplying that by
+     *  the range of possible values for the track.
+     *
+     *  @param position A position on the track.
+     *
+     *  @return A value, between minimum and maximum,
+     *  corresponding to position.
      */
     protected function positionToValue(position:Number):Number
     {
@@ -303,11 +336,17 @@
     }

     /**
-     *  Utility function to calculate the thumb's position
-     *  corresponding to the given value. The thumb position
-     *  is calculated by finding what fraction of the range
-     *  the value represents, and then multiplying that by
-     *  the logical track size minus the logical thumb size.
+     *  Return the position of the thumb button on the track
+     *  corresponding to a given value.
+     *
+     *
Calculate the thumb button position by finding
+     *  the fraction of the range of possible values that
+     *  value represents, and then multiplying that by
+     *  the logical track size, minus the logical thumb size.

+     *
+     *  @param value A value, between minimum and maximum.
+     *
+     *  @return A position on the track corresponding to value.
      */
     protected function valueToPosition(value:Number):Number
     {
@@ -322,13 +361,23 @@
     }

     /**
-     *  This function returns a position on the slider relative to its
-     *  orientation and shape. The localX and localY
+     *  Returns a position on the track.
+     *  The localX and localY
      *  values represent the location in the local coordinate system of the
-     *  track. Subclasses must override this method and return the
-     *  appropriate value for their situation. Values should not be clamped to
+     *  track.
+     *
+     *
Subclasses must override this method and return the
+     *  appropriate value. Values should not be clamped to
      *  the ends of the track, as that clamping will happen later, prior
-     *  to setting the thumb position.
+     *  to setting position of the thumb button.

+     *
+     *  @param localX The X-location in the local coordinate system of the
+     *  track.
+     *
+     *  @param localY The Y-location in the local coordinate system of the
+     *  track.
+     *
+     *  @return The posisiton on the track.
      */
     protected function pointToPosition(localX:Number, localY:Number):Number
     {
@@ -336,22 +385,28 @@
     }

     /**
-     *  This method positions the thumb button correctly, given
-     *  the position. Subclasses should override this method to position
-     *  the thumb appropriately for their situation.
+     *  Set the position of the thumb button.
+     *
+     *
Subclasses should override this method to position
+     *  the thumb button.

+     *
+     *  @param thumbPos The new position of the thumb button.
      */
     protected function positionThumb(thumbPos:Number):void {}

     /**
-     *  This method sizes the thumb button correctly, given
-     *  the thumbSize. Subclasses should override this method to size
-     *  the thumb appropriately for their situation.
+     *  Sets the size of the thumb button.
+     *
+     *
Subclasses should override this method to size
+     *  the thumb button.

+     *
+     *  @param thembSize The new size of the thumb button.
      */
     protected function sizeThumb(thumbSize:Number):void {}

     /**
-     *  This utility method calculates an appropriate size for the thumb
-     *  button, given the current range, pageSize, and trackSize settings.
+     *  Returns the size of the thumb button
+     *  given the current range, pageSize, and trackSize settings.
      *  Subclasses should override this to calculate the correct size in
      *  the units of position.
      *
@@ -363,9 +418,9 @@
     }

     /**
-     *  Given a MouseEvent that contains where the thumb was dragged to and
-     *  the previous value of the thumb, calculateNewValue() returns a new
-     *  value based on the difference calculated in the mouseDown handler
+     *  From a MouseEvent object that contains the position where the thumb was dragged to, and
+     *  the previous value of the thumb position, return a new
+     *  value based on the difference calculated in the MouseDown event
      *  and the new position. The value is also restricted to the allowed
      *  values here. This method usually should not be overridden.
      */
@@ -409,6 +464,7 @@
     //---------------------------------

     /**
+     *  @private
      *  Handle mouse-down events on the scroll thumb. Records
      *  the mouse down point in clickOffset.
      */
@@ -446,6 +502,7 @@
     }

     /**
+     *  @private
      *  Capture mouse-move events anywhere on or off the stage.
      *  First, we calculate the new value based on the new position
      *  using calculateNewValue(). Then, we move the thumb to
@@ -480,6 +537,7 @@
     }

     /**
+     *  @private
      *  Handle mouse-up events anywhere on or off the stage.
      */
     protected function system_mouseUpHandler(event:MouseEvent):void
@@ -495,6 +553,7 @@
     //---------------------------------

     /**
+     *  @private
      *  Handle mouse-down events for the scroll track. Subclasses
      *  should override this method if they want the track to
      *  recognize mouse clicks on the track.


Round decomposed matrix values to 4 decimal places.

Since some precision is lost during decomposition, scale values for example
sometimes end up as 0.9999... this should round those away. Not having to apply
a scale or rotation helps non-GPU runtimes (HTML5).

Smaller files too! Bella and Hero shrink by ~25%.

--- runtime/src/main/as/flump/xfl/XflKeyframe.as
+++ runtime/src/main/as/flump/xfl/XflKeyframe.as
@@ -103,8 +103,9 @@
                 rotation = MatrixUtil.rotation(matrix);
             }

-            scaleX = MatrixUtil.scaleX(matrix);
-            scaleY = MatrixUtil.scaleY(matrix);
+            rotation = round(rotation);
+            scaleX = round(MatrixUtil.scaleX(matrix));
+            scaleY = round(MatrixUtil.scaleY(matrix));
         }

         // Read the pivot point
@@ -124,8 +125,8 @@
         }

         // Now that the matrix and pivot point have been read, apply translation
-        x = matrix.tx;
-        y = matrix.ty;
+        x = round(matrix.tx);
+        y = round(matrix.ty);

         // Read the alpha
         if (symbolXml.color != null) {
@@ -210,5 +211,11 @@
         }
         return xml;
     }
+
+    protected static function round (n :Number, places :int = 4) :Number
+    {
+        var shift :int = Math.pow(10, places);
+        return Math.round(n*shift) / shift;
+    }
 }
 }


Added check for zero width/height in BitmapUtils.resizeBitmapData

--- WeaveUI/src/weave/utils/BitmapUtils.as
+++ WeaveUI/src/weave/utils/BitmapUtils.as
@@ -92,7 +92,10 @@
 			// find target w,h with proper aspect ratio
 			var scale:Number = Math.min(width/source.width, height/source.height);
 			var w:int = Math.round(source.width * scale);
-			var h:int = Math.round(source.height * scale);
+			var h:int = Math.round(source.height * scale);
+
+			if (w <= 0 || h <= 0)
+				return new BitmapData(0, 0);

 			// upscale source width,height to the target w,h times a power of 2
 			while (w < source.width || h < source.height)


Removed far plane code.

Removed far plane code.


Fix plugin loaded events

Fix plugin loaded events

--- KalturaHLSPlugin/src/KalturaHLSPlugin.as
+++ KalturaHLSPlugin/src/KalturaHLSPlugin.as
@@ -22,6 +22,7 @@
 	{
 		private var _pluginInfo:HLSPluginInfo;
         private static const HLS_PLUGIN_INFO:String = "com.kaltura.hls.HLSPluginInfo";
+		private var _pluginResource:MediaResourceBase;

         public function KalturaHLSPlugin()
@@ -39,12 +40,12 @@
         {
             //Getting Static reference to Plugin.
             var pluginInfoRef:Class = getDefinitionByName(HLS_PLUGIN_INFO) as Class;
-            var pluginResource:MediaResourceBase = new PluginInfoResource(new pluginInfoRef);
+			_pluginResource = new PluginInfoResource(new pluginInfoRef);

             var mediaFactory:MediaFactory = (facade.retrieveProxy(MediaProxy.NAME) as MediaProxy).vo.mediaFactory;
             mediaFactory.addEventListener(MediaFactoryEvent.PLUGIN_LOAD, onOSMFPluginLoaded);
             mediaFactory.addEventListener(MediaFactoryEvent.PLUGIN_LOAD_ERROR, onOSMFPluginLoadError);
-            mediaFactory.loadPlugin(pluginResource);
+            mediaFactory.loadPlugin(_pluginResource);
         }

         /**
@@ -54,8 +55,11 @@
          */
         protected function onOSMFPluginLoaded (e : MediaFactoryEvent) : void
         {
-            e.target.removeEventListener(MediaFactoryEvent.PLUGIN_LOAD, onOSMFPluginLoaded);
-            dispatchEvent( new KPluginEvent (KPluginEvent.KPLUGIN_INIT_COMPLETE) );
+			if ( e.resource && e.resource == _pluginResource ) {
+				e.target.removeEventListener(MediaFactoryEvent.PLUGIN_LOAD, onOSMFPluginLoaded);
+				dispatchEvent( new KPluginEvent (KPluginEvent.KPLUGIN_INIT_COMPLETE) );
+			}
+
         }
         /**
          * Listener for the LOAD_ERROR event.
@@ -64,8 +68,10 @@
          */
         protected function onOSMFPluginLoadError (e : MediaFactoryEvent) : void
         {
-            e.target.removeEventListener(MediaFactoryEvent.PLUGIN_LOAD_ERROR, onOSMFPluginLoadError);
-            dispatchEvent( new KPluginEvent (KPluginEvent.KPLUGIN_INIT_FAILED) );
+			if ( e.resource && e.resource == _pluginResource ) {
+	            e.target.removeEventListener(MediaFactoryEvent.PLUGIN_LOAD_ERROR, onOSMFPluginLoadError);
+	            dispatchEvent( new KPluginEvent (KPluginEvent.KPLUGIN_INIT_FAILED) );
+			}
         }

         public function setSkin(styleName:String, setSkinSize:Boolean=false):void


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

--- frameworks/projects/mobiletheme/src/spark/skins/mobile/DefaultButtonSkin.as
+++ frameworks/projects/mobiletheme/src/spark/skins/mobile/DefaultButtonSkin.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2010 Adobe Systems Incorporated
-//  All Rights Reserved.
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
 //
-//  NOTICE: Adobe permits you to use, modify, and distribute this file
-//  in accordance with the terms of the license agreement accompanying it.
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////


Transferred from the Adobe Open Source Subversion Repository

Revision: 20931
Author:   cframpto@adobe.com
Date:     2011-03-21T14:21:57.979092Z

Log Message:
-----------
ASdoc changes that missed Flex 4.5 - mostly the mxml syntax sections for the new DataGrid and Image components but also some other errors I noticed in various classes.

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/gridClasses/GridItemEditor.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataGrid.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Label.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ButtonBase.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Image.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/NumericStepper.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Scroller.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/gridClasses/GridColumn.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableContainer.as</path>

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

--- frameworks/projects/spark/src/spark/components/supportClasses/ButtonBase.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/ButtonBase.as
@@ -271,7 +271,7 @@
  *    dominantBaseline="AUTO"
  *    focusAlpha="0.5"
  *    focusColor="0x70B2EE"
- *    fontFamily="Times New Roman"
+ *    fontFamily="Arial"
  *    fontLookup="DEVICE"
  *    fontSize="12"
  *    fontStyle="NORMAL"