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

--- frameworks/projects/framework/src/mx/states/SetProperty.as
+++ frameworks/projects/framework/src/mx/states/SetProperty.as
@@ -0,0 +1,301 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2005-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.states
+{
+
+import mx.core.UIComponent;
+import mx.core.mx_internal;
+
+use namespace mx_internal;
+
+/**
+ *  The SetProperty class specifies a property value that is in effect only
+ *  during the parent view state.
+ *  You use this class in the overrides property of the State class.
+ *
+ *  @mxml
+ *
+ *
The <mx:SetProperty> tag
+ *  has the following attributes:

+ *
+ *

+ *  <mx:SetProperty
+ *   Properties
+ *   name="null"
+ *   target="null"
+ *   value="undefined"
+ *  />
+ *

+ *
+ *  @see mx.states.State
+ *  @see mx.states.SetEventHandler
+ *  @see mx.states.SetStyle
+ *  @see mx.effects.SetPropertyAction
+ *
+ *  @includeExample examples/StatesExample.mxml
+ */
+public class SetProperty implements IOverride
+{
+    include "../core/Version.as";
+
+    //--------------------------------------------------------------------------
+    //
+    //  Class constants
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     *  This is a table of pseudonyms.
+     *  Whenever the property being overridden is found in this table,
+     *  the pseudonym is saved/restored instead.
+     */
+    private static const PSEUDONYMS:Object =
+    {
+        width: "explicitWidth",
+        height: "explicitHeight"
+    };
+
+    /**
+     *  @private
+     *  This is a table of related properties.
+     *  Whenever the property being overridden is found in this table,
+     *  the related property is also saved and restored.
+     */
+    private static const RELATED_PROPERTIES:Object =
+    {
+        explicitWidth: [ "percentWidth" ],
+        explicitHeight: [ "percentHeight" ]
+    };
+
+    //--------------------------------------------------------------------------
+    //
+    //  Constructor
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  Constructor.
+     *
+     *  @param target The object whose property is being set.
+     *  By default, Flex uses the immediate parent of the State object.
+     *
+     *  @param name The property to set.
+     *
+     *  @param value The value of the property in the view state.
+     */
+    public function SetProperty(target:Object = null, name:String = null,
+                                value:* = undefined)
+    {
+        super();
+
+        this.target = target;
+        this.name = name;
+        this.value = value;
+    }
+
+    //--------------------------------------------------------------------------
+    //
+    //  Variables
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     *  Storage for the old property value.
+     */
+    private var oldValue:Object;
+
+    /**
+     *  @private
+     *  Storage for the old related property values, if used.
+     */
+    private var oldRelatedValues:Array;
+
+    //--------------------------------------------------------------------------
+    //
+    //  Properties
+    //
+    //--------------------------------------------------------------------------
+
+    //----------------------------------
+    //  name
+    //----------------------------------
+
+    [Inspectable(category="General")]
+
+    /**
+     *  The name of the property to change.
+     *  You must set this property, either in
+     *  the SetProperty constructor or by setting
+     *  the property value directly.
+     */
+    public var name:String;
+
+    //----------------------------------
+    //  target
+    //----------------------------------
+
+    [Inspectable(category="General")]
+
+    /**
+     *  The object containing the property to be changed.
+     *  If the property value is null, Flex uses the
+     *  immediate parent of the State object.
+     *
+     *  @default null
+     */
+    public var target:Object;
+
+    //----------------------------------
+    //  value
+    //----------------------------------
+
+    [Inspectable(category="General")]
+
+    /**
+     *  The new value for the property.
+     *
+     *  @default undefined
+     */
+    public var value:*;
+
+    //--------------------------------------------------------------------------
+    //
+    //  Methods: IOverride
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  IOverride interface method; this class implements it as an empty method.
+     *
+     *  @copy IOverride#initialize()
+     */
+    public function initialize():void
+    {
+    }
+
+    /**
+     *  @inheritDoc
+     */
+    public function apply(parent:UIComponent):void
+    {
+        var obj:Object = target ? target : parent;
+
+        var propName:String = PSEUDONYMS[name] ?
+                          PSEUDONYMS[name] :
+                          name;
+
+        var relatedProps:Array = RELATED_PROPERTIES[propName] ?
+                                 RELATED_PROPERTIES[propName] :
+                                 null;
+
+        var newValue:* = value;
+
+        // Remember the current value so it can be restored
+        oldValue = obj[propName];
+
+        if (relatedProps)
+        {
+            oldRelatedValues = [];
+
+            for (var i:int = 0; i < relatedProps.length; i++)
+                oldRelatedValues[i] = obj[relatedProps[i]];
+        }
+
+        // Special case for width and height. If they are percentage values,
+        // set the percentWidth/percentHeight instead.
+        if (name == "width" || name == "height")
+        {
+            if (newValue is String && newValue.indexOf("%") >= 0)
+            {
+                propName = name == "width" ? "percentWidth" : "percentHeight";
+                newValue = newValue.slice(0, newValue.indexOf("%"));
+            }
+            else
+            {
+                // Need to set width/height instead of explicitWidth/explicitHeight
+                // otherwise width/height are out of sync until the target is validated.
+                propName = name;
+            }
+        }
+
+        // Set new value
+        setPropertyValue(obj, propName, newValue, oldValue);
+    }
+
+    /**
+     *  @inheritDoc
+     */
+    public function remove(parent:UIComponent):void
+    {
+        var obj:Object = target ? target : parent;
+
+        var propName:String = PSEUDONYMS[name] ?
+                          PSEUDONYMS[name] :
+                          name;
+
+        var relatedProps:Array = RELATED_PROPERTIES[propName] ?
+                                 RELATED_PROPERTIES[propName] :
+                                 null;
+
+        // Special case for width and height. Restore the "width" and
+        // "height" properties instead of explicitWidth/explicitHeight
+        // so they can be kept in sync.
+        if ((name == "width" || name == "height") && !isNaN(Number(oldValue)))
+        {
+            propName = name;
+        }
+
+        // Restore the old value
+        setPropertyValue(obj, propName, oldValue, oldValue);
+
+        // Restore related value, if needed
+        if (relatedProps)
+        {
+            for (var i:int = 0; i < relatedProps.length; i++)
+            {
+                setPropertyValue(obj, relatedProps[i],
+                        oldRelatedValues[i], oldRelatedValues[i]);
+            }
+        }
+    }
+
+    /**
+     *  @private
+     *  Sets the property to a value, coercing if necessary.
+     */
+    private function setPropertyValue(obj:Object, name:String, value:*,
+                                      valueForType:Object):void
+    {
+        if (valueForType is Number)
+            obj[name] = Number(value);
+        else if (valueForType is Boolean)
+            obj[name] = toBoolean(value);
+        else
+            obj[name] = value;
+    }
+
+    /**
+     *  @private
+     *  Converts a value to a Boolean true/false.
+     */
+    private function toBoolean(value:Object):Boolean
+    {
+        if (value is String)
+            return value.toLowerCase() == "true";
+
+        return value != false;
+    }
+}
+
+}


FLEX-33824 DG's nestlevel trick would fail in certain situations.  Force validation before mucking with nestLevel

--- frameworks/projects/spark/src/spark/components/DataGrid.as
+++ frameworks/projects/spark/src/spark/components/DataGrid.as
@@ -3427,7 +3427,10 @@

         elt.dataGrid = this;
         if (elt.nestLevel <= grid.nestLevel)
+        {
+            elt.validateNow();
             elt.nestLevel = grid.nestLevel + 1;
+        }
     }

     /**


Transferred from the Adobe Open Source Subversion Repository

Revision: 7163
Author:   aharui@adobe.com
Date:     2009-05-21T02:19:55.813792Z

Log Message:
-----------
Initial checkin of frame 1 cleanup.  In an RSL linkage, more classes will now come from the RSL because they are no longer needed in frame 1, and the size of the application SWF will be smaller.

QE Notes: None
Doc Notes: Maybe.  All new classes should be undocumented, but it might be worth checking that and any changes to interfaces
Bugs:
Reviewer: darrell
tests: checkintests mustella/MarshallPlan

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileListItemRenderer.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/systemClasses/ActiveWindowManager.as</path>
<path kind="dir" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/LayoutManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/RSLEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Menu.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/MarshalPopUpData.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IEmbeddedFontRegistry.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ColorPicker.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/systemClasses/EventProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UITextFormat.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/tools/dependencychecker/flex/tools/dependencychecker/FrameworkSwcDependencyRules.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/DragManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridColumn.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/EmbeddedFontRegistry.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ToolTipManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/primitives/RichText.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/EmbeddedFont.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/modules/compiler/src/java/flex2/tools/PreLink.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/preloaders/Preloader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ResourceModuleRSLItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/FrameworkClasses.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ISWFBridgeProvider.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/FocusManagerMarshalMixin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/core/Window.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/resources/ResourceManager.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IMarshalSystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/EventListenerRequest.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/ToolTipManagerMarshalMixin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/tools/dependencychecker/frameworkSwcExceptionsList.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/mustella/MustellaResultsParser.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Alert.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/systemClasses/ChildManager.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallPlan.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/managers/SystemManagerGlobals.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/SWFBridgeGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/alertClasses/AlertForm.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/spark/components/Window.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/managers/ISystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework_textLayout/src/mx/core/UITLFTextField.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/DragManagerMarshalMixin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/SWFLoader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/MenuBar.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/Request.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/primitives/RichEditableText.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/CSSStyleDeclaration.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/events/FlexEvent.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IActiveWindowManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/WindowedSystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/primitives/SimpleText.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/PopUpManagerMarshalMixin.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/managers/SystemManagerProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/messaging/config/LoaderConfig.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IFocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/preloaders/DownloadProgressBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ScrollControlBase.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ISystemManagerChildManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridItemRenderer.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/marshalClasses/CursorManagerMarshalMixin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/CursorManagerImpl.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/PopUpData.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ISWFBridgeGroup.as</path>

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

--- frameworks/projects/framework/src/mx/events/FlexEvent.as
+++ frameworks/projects/framework/src/mx/events/FlexEvent.as
@@ -557,6 +557,11 @@
     public static const LOADING:String = "loading";

     /**
+     *  @private
+     */
+    public static const NEW_CHILD_APPLICATION:String = "newChildApplication";
+
+    /**
      *  The FlexEvent.PREINITIALIZE constant defines the value of the
      *  type property of the event object for a preinitialize event.
      *
@@ -588,6 +593,11 @@
      *  @private
      */
     public static const PRELOADER_DONE:String = "preloaderDone";
+
+    /**
+     *  @private
+     */
+    public static const PRELOADER_DOC_FRAME_READY:String = "preloaderDocFrameReady";

     /**
      *  The FlexEvent.RENDER constant defines the value of the


Transferred from the Adobe Open Source Subversion Repository

Revision: 7472
Author:   chaase@adobe.com
Date:     2009-06-01T17:57:10.489577Z

Log Message:
-----------
Changing a handful of behavior-related properties to styles instead, for usability and consistency:
Scroller.horizontalScrollPolicy
Scroller.verticalScrollPolicy
TextArea.horizontalScrollPolicy
TextArea.verticalScrollPolicy
Slider.liveDragging

Also made previous properties-as-styles changes (smoothScrolling and fixedThumbSize) not inheritable and not exposed in SkinnableContainer/GroupBase.

QE Notes: Requires Mustella updates to handle changes from properties to styles
Doc Notes:
Bugs: sdk-21032
Reviewer: Glenn
Tests: checkintests, Mustella gumbo/components/Scroller, gumbo/components/ScrollBar, gumbo/components/TextArea/, and gumbo/components/Slider

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/flex4/src/spark/components/SkinnableContainer.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/flex4/src/spark/components/supportClasses/ScrollerLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/GroupBase.as</path>

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

--- frameworks/projects/spark/src/spark/components/Scroller.as
+++ frameworks/projects/spark/src/spark/components/Scroller.as
@@ -66,6 +66,39 @@
 [Style(name="focusColor", type="uint", format="Color", inherit="yes", theme="spark")]

 /**
+ *  Indicates under what conditions the horizontal scrollbar is displayed.
+ *
+ *

+ *

+ *  ScrollPolicy.ON ("on") - the scrollbar is always displayed.
+ *

+ *

+ *  ScrollPolicy.OFF ("off") - the scrollbar is never displayed.
+ *  The viewport can still be scrolled programmatically, by setting its
+ *  horizontalScrollPosition property.
+ *

+ *

+ *  ScrollPolicy.AUTO ("auto") - the scrollbar is displayed when
+ *  the viewport's contentWidth is larger than its width.
+ *

+ *

+ *
+ *

+ *  The scroll policy affects the measured size of the Scroller component.
+ *

+ *
+ *  @default ScrollPolicy.AUTO
+ *
+ *  @see mx.core.ScrollPolicy
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
+ */
+[Style(name="horizontalScrollPolicy", type="String", inherit="no", enumeration="off,on,auto")]
+
+/**
  * @copy spark.components.supportClasses.GroupBase#style:rollOverColor
  *
  *  @langversion 3.0
@@ -84,6 +117,40 @@
  *  @productversion Flex 4
  */
 [Style(name="symbolColor", type="uint", format="Color", inherit="yes", theme="spark")]
+
+/**
+ *  Indicates under what conditions the vertical scrollbar is displayed.
+ *
+ *

+ *

+ *  ScrollPolicy.ON ("on") - the scrollbar is always displayed.
+ *

+ *

+ *  ScrollPolicy.OFF ("off") - the scrollbar is never displayed.
+ *  The viewport can still be scrolled programmatically, by setting its
+ *  verticalScrollPosition property.
+ *

+ *

+ *  ScrollPolicy.AUTO ("auto") - the scrollbar is displayed when
+ *  the viewport's contentHeight is larger than its height.
+ *

+ *

+ *
+ *

+ *  The scroll policy affects the measured size of the Scroller component.
+ *

+ *
+ *  @default ScrollPolicy.AUTO
+ *
+ *  @see mx.core.ScrollPolicy
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
+     */
+[Style(name="verticalScrollPolicy", type="String", inherit="no", enumeration="off,on,auto")]
+

 //--------------------------------------
 //  Other metadata
@@ -285,120 +352,6 @@
         }
     }

-    //----------------------------------
-    //  verticalScrollPolicy
-    //----------------------------------
-
-    private var _verticalScrollPolicy:String = ScrollPolicy.AUTO;
-
-    [Bindable]
-    [Inspectable(enumeration="off,on,auto", defaultValue="auto")]
-
-    /**
-     *  Indicates under what conditions the vertical scrollbar is displayed.
-     *
-     *

-     *

-     *  ScrollPolicy.ON ("on") - the scrollbar is always displayed.
-     *

-     *

-     *  ScrollPolicy.OFF ("off") - the scrollbar is never displayed.
-     *  The viewport can still be scrolled programmatically, by setting its
-     *  verticalScrollPosition property.
-     *

-     *

-     *  ScrollPolicy.AUTO ("auto") - the scrollbar is displayed when
-     *  the viewport's contentHeight is larger than its height.
-     *

-     *

-     *
-     *

-     *  The scroll policy affects the measured size of the Scroller component.
-     *

-     *
-     *  @default ScrollPolicy.AUTO
-     *
-     *  @see mx.core.ScrollPolicy
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10
-     *  @playerversion AIR 1.5
-     *  @productversion Flex 4
-     */
-    public function get verticalScrollPolicy():String
-    {
-        return _verticalScrollPolicy;
-    }
-
-    /**
-     *  @private
-     */
-    public function set verticalScrollPolicy(value:String):void
-    {
-        if (value == _verticalScrollPolicy)
-            return;
-
-        _verticalScrollPolicy = value;
-        invalidateSkin();
-    }
-
-
-    //----------------------------------
-    //  horizontalScrollPolicy
-    //----------------------------------
-
-    private var _horizontalScrollPolicy:String = ScrollPolicy.AUTO;
-
-    [Bindable]
-    [Inspectable(enumeration="off,on,auto", defaultValue="auto")]
-
-    /**
-     *  Indicates under what conditions the horizontal scrollbar is displayed.
-     *
-     *

-     *

-     *  ScrollPolicy.ON ("on") - the scrollbar is always displayed.
-     *

-     *

-     *  ScrollPolicy.OFF ("off") - the scrollbar is never displayed.
-     *  The viewport can still be scrolled programmatically, by setting its
-     *  horizontalScrollPosition property.
-     *

-     *

-     *  ScrollPolicy.AUTO ("auto") - the scrollbar is displayed when
-     *  the viewport's contentWidth is larger than its width.
-     *

-     *

-     *
-     *

-     *  The scroll policy affects the measured size of the Scroller component.
-     *

-     *
-     *  @default ScrollPolicy.AUTO
-     *
-     *  @see mx.core.ScrollPolicy
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10
-     *  @playerversion AIR 1.5
-     *  @productversion Flex 4
-     */
-    public function get horizontalScrollPolicy():String
-    {
-        return _horizontalScrollPolicy;
-    }
-
-    /**
-     *  @private
-     */
-    public function set horizontalScrollPolicy(value:String):void
-    {
-        if (value == _horizontalScrollPolicy)
-            return;
-
-        _horizontalScrollPolicy = value;
-        invalidateSkin();
-    }

     //----------------------------------
     //  minViewportInset
@@ -665,6 +618,20 @@
     //
     //--------------------------------------------------------------------------

+    /**
+     *  @private
+     */
+    override public function styleChanged(styleProp:String):void
+    {
+        var allStyles:Boolean = (styleProp == null || styleProp == "styleName");
+        super.styleChanged(styleProp);
+        if (allStyles || styleProp == "horizontalScrollPolicy" ||
+            styleProp == "verticalScrollPolicy")
+        {
+            invalidateSkin();
+        }
+    }
+
     /**
      *  @private
      */


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

--- frameworks/projects/framework/src/mx/events/MoveEvent.as
+++ frameworks/projects/framework/src/mx/events/MoveEvent.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.events
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5099
Author:   gauravj@adobe.com
Date:     2009-02-27T03:43:02.639229Z

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

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

Modified Paths:
--------------
147 paths were modified

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

--- frameworks/projects/rpc/src/mx/rpc/events/InvokeEvent.as
+++ frameworks/projects/rpc/src/mx/rpc/events/InvokeEvent.as
@@ -18,6 +18,11 @@

 /**
  * The event that indicates an RPC operation has been invoked.
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 9
+ *  @playerversion AIR 1.1
+ *  @productversion Flex 3
  */
 public class InvokeEvent extends AbstractEvent
 {
@@ -42,6 +47,11 @@
      *       Object listening for the event.

      *

      *  @eventType invoke
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
      */
     public static const INVOKE:String = "invoke";

@@ -53,6 +63,11 @@
      * @param token Token that represents the call to the method. Used in the asynchronous
      *     completion token pattern.
      * @param message Source Message of the request.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
      */
     public function InvokeEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false,
             token:AsyncToken = null, message:IMessage = null)
@@ -82,6 +97,11 @@
     * Returns a string representation of the InvokeEvent.
     *
     * @return String representation of the InvokeEvent.
+    *
+    *  @langversion 3.0
+    *  @playerversion Flash 9
+    *  @playerversion AIR 1.1
+    *  @productversion Flex 3
     */
     override public function toString():String
     {


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

--- frameworks/projects/spark/src/spark/core/ContentRequest.as
+++ frameworks/projects/spark/src/spark/core/ContentRequest.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: 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@1274132 13f79535-47bb-0310-9956-ffa450edef68

--- frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.as
+++ frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2005-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.rpc.events
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5119
Author:   smgilson@adobe.com
Date:     2009-03-01T15:19:39.936226Z

Log Message:
-----------
Clean up some ASDoc tags from the addition of the @productversion/@playerversion tags

QE Notes: None
Doc Notes: None
Bugs: -

Modified Paths:
--------------
<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/ToolTip.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/remoting/Operation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/HTML.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/config/ServerConfig.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/EffectManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/HTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/messages/HTTPRequestMessage.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/CalendarLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.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/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/halo/src/mx/skins/halo/HaloBorder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/videoClasses/NCManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractConsumer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/Base64Encoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/validators/StringValidator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/xml/SchemaMarshaller.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework_textLayout/src/mx/core/UITLFTextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IInteractiveObjectInterface.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/flex4/src/mx/components/TextView.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ContainerRawChildrenList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/AMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/events/FaultEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/wsdl/WSDL.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/AbstractOperation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/skins/spark/SparkSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Tween.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxResizeInstance.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/videoClasses/VideoPlayer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/HistoryManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/xml/Schema.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/utils/HexEncoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/Operation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IDisplayObjectInterface.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/http/AbstractOperation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IDisplayObjectContainerInterface.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/effects/effectClasses/SoundEffectInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/effectClasses/SequenceInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Text.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ISpriteInterface.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/haloclassic/src/haloclassic/HaloRectBorder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/mxml/Operation.as</path>

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

--- frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.as
+++ frameworks/projects/rpc/src/mx/rpc/events/ResultEvent.as
@@ -200,11 +200,6 @@

     /*
      * Have the token apply the result.
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 9
-     *  @playerversion AIR 1.1
-     *  @productversion Flex 3
      */
     override mx_internal function callTokenResponders():void
     {


Transferred from the Adobe Open Source Subversion Repository

Revision: 20827
Author:   eday@adobe.com
Date:     2011-03-11T21:46:21.219283Z

Log Message:
-----------
Merging 20819 from hero_private.

ASDoc change for PixelBender effects not compatible with mobile.

Put [DiscouragedForProfile("mobileDevice")] on AnimateTransitionShader, CrossFade, and Wipe effect classes.

QE notes: none
Doc notes: none
Bugs: SDK-29910
Reviewer: Glenn
Tests run:
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/Wipe.as</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.as</path>
<path kind="dir" action="M">/private/flex/sdk/trunk</path>
<path kind="file" action="M">/private/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransitionShader.as</path>

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

--- frameworks/projects/spark/src/spark/effects/CrossFade.as
+++ frameworks/projects/spark/src/spark/effects/CrossFade.as
@@ -12,6 +12,12 @@
 {
 import flash.utils.ByteArray;

+/**
+ *  The CrossFade effect uses Pixel Bender,
+ *  which is not supported for AIR mobile applications.
+ */
+[DiscouragedForProfile("mobileDevice")]
+
 /**
  * The CrossFade effect performs a bitmap transition effect by running a
  * <i>crossfade</i> between the first and second bitmaps.


Transferred from the Adobe Open Source Subversion Repository

Revision: 20420
Author:   deeptika@adobe.com
Date:     2011-02-23T05:34:15.349427Z

Log Message:
-----------
Catching exception when spark Label class is not found in the framework.

QE notes:
Doc notes:
Bugs: FLEXDMV-2565 (Using Flex 3 compatibility does not render application at all when a chart is used)
Reviewer:
Tests run:
Is noteworthy for integration:

Modified Paths:
--------------
/private/flex/sdk/branches/hero_private/frameworks/projects/charts/src/mx/charts/AxisRenderer.as

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

--- frameworks/projects/charts/src/mx/charts/AxisRenderer.as
+++ frameworks/projects/charts/src/mx/charts/AxisRenderer.as
@@ -3097,13 +3097,21 @@
                 r = -_labelPlacement.rotation / Math.PI * 180;
                 labelY = baseline + labelGap;
 				var sparkLabelClass:Class;
-				if(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"))
+				try
 				{
-					sparkLabelClass = Class(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"));
+					if(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"))
+					{
+						sparkLabelClass = Class(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"));
+					}
 				}
-                for (i = 0; i < n; i++)
-                {
-                    ldi = _labels[i];
+				catch(e:Error)
+				{
+					// We need not do any thing here because we came here for projects which do not have spark.swc
+					// It might be an MX-only or in compatible mode and hence using MX Label
+				}
+				for (i = 0; i < n; i++)
+				{
+					ldi = _labels[i];

 					ldi.instance.rotation = r;

@@ -3251,9 +3259,17 @@
         var showLabels:Boolean = showLabelsStyle != false &&
                                  showLabelsStyle != "false";
 		var sparkLabelClass:Class;
-		if(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"))
+		try
 		{
-			sparkLabelClass = Class(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"));
+			if(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"))
+			{
+				sparkLabelClass = Class(ApplicationDomain.currentDomain.getDefinition("spark.components.Label"));
+			}
+		}
+		catch(e:Error)
+		{
+			// We need not do any thing here because we came here for projects which do not have spark.swc
+			// It might be an MX-only or in compatible mode and hence using MX Label
 		}

         if (showLabels == false)


Transferred from the Adobe Open Source Subversion Repository

Revision: 3270
Author:   hmuller@adobe.com
Date:     2008-09-19T14:38:31.675747Z

Log Message:
-----------
Added row/column visibility tracking to Vertical,HorizontalLayout.
This is an incremental change aimed at enabling step/page scrolling
and animated scrolling.

Added new bindable read-only properties firstIndexInView and
lastIndexInView to VerticalLayout.  They track the first/last row
that's within the layout target's scrollRect and included in the
layout.  Note that any other row within this range may not actually be
"in view" (or visible) because its item could be null or
includeInLayout=false, or have height=0, etc.

Exposed these properties on VGroup.

Added a VerticalLayout method called inView that reports if a
particular row is "in view" or partially so.

Made comparable changes to HorizontalLayout, HGroup.

QE: No
Doc: No
Checkintests: Pass
Reviewer: Evtim

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/VGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/layout/HorizontalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/layout/VerticalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/flex/component/HGroup.as</path>

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

--- frameworks/projects/spark/src/spark/components/HGroup.as
+++ frameworks/projects/spark/src/spark/components/HGroup.as
@@ -146,6 +146,30 @@
         horizontalLayout.variableColumnWidth = value;
     }

+    //----------------------------------
+    //  firstIndexInView
+    //----------------------------------
+
+    /**
+     * @copy flex.layout.HorizontalLayout#firstIndexInView
+     */
+    public function get firstIndexInView():int
+    {
+        return horizontalLayout.firstIndexInView;
+    }
+
+    //----------------------------------
+    //  lastIndexInView
+    //----------------------------------
+
+    /**
+     * @copy flex.layout.HorizontalLayout#lastIndexInView
+     */
+    public function get lastIndexInView():int
+    {
+        return horizontalLayout.lastIndexInView;
+    }
+
 }

 }


解决编译不通过的问题

解决编译不通过的问题

解决编译不通过的问题
add function getCarryG()

--- Client/Ddz/src/net/wdqipai/client/extmodel/RoomModelByDdz.as
+++ Client/Ddz/src/net/wdqipai/client/extmodel/RoomModelByDdz.as
@@ -53,6 +53,37 @@
 		 * 如为空则采用 桌子 + id组合的方法
 		 */
 		private var _name:String;
+		/**
+		 * 基础扣分
+		 *
+		 */
+		private var _diG:int;
+
+		public function getDiG():int
+		{
+			return this._diG;
+		}
+
+		public function setDiG(value:int):void
+		{
+			this._diG = value;
+		}
+
+		/**
+		 * 最少携带
+		 *
+		 */
+		private var _carryG:int;
+
+		public function getCarryG():int
+		{
+			return this._carryG;
+		}
+
+		public function setCarryG(value:int):void
+		{
+			this._carryG = value;
+		}

 		/**
 		 * 椅子集合
@@ -175,6 +206,8 @@

 			}

+			this._diG = -1;
+			this._carryG = -1;
 			this._pai = new Array();
 			this._vars = new Array();
 			this._idle = new Array();


Transferred from the Adobe Open Source Subversion Repository

Revision: 18357
Author:   jasonsj@adobe.com
Date:     2010-10-28T22:43:40.124825Z

Log Message:
-----------
Mobile Theme feature work:
Implemented borderVisible and prompt for mobile TextInputSkin
Fixed focus exclusions for CheckBox and RadioButton
Fixed promptDisplay bug in TextInput
Moved textShadowAlpha and textShadowColor to BasicInheritingTextStyles from ActionBar and Button
Added leading and letterSpacing to BasicInheritingTextStyles

QE notes: Update mustella bitmaps for Button and RadioButton
Doc notes:
Bugs:
SDK-28239 Fixed visuals for Button and RadioButton skin
Reviewer: gruehle, aharui
Tests run: checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/RadioButton_up.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/Button_down.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/MobileSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/defaults.css</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Button.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/RadioButton_upSelected.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/styles/metadata/StyleableTextFieldTextStyles.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/Button_up.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/RadioButton_down.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/styles/metadata/BasicInheritingTextStyles.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/ActionBar.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/RadioButton_downSelected.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/assets/CheckBox_up.fxg</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableTextBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as</path>

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

--- frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
+++ frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
@@ -36,10 +36,13 @@
     //  Class statics
     //
     //--------------------------------------------------------------------------
-    private static const HORIZONTAL_PADDING:int = 8;
-    private static const VERTICAL_PADDING:int = 12;
+
+    // StylableTextField padding
     private static const TEXT_WIDTH_PADDING:int = 4;
     private static const TEXT_HEIGHT_PADDING:int = 2;
+
+    // FXG measurements
+    private static const BORDER_SIZE:uint = 1;
     private static const CORNER_ELLIPSE_SIZE:uint = 16;

     //--------------------------------------------------------------------------
@@ -67,6 +70,11 @@
      *  textDisplay skin part.
      */
     public var textDisplay:StyleableTextField;
+
+    /**
+     *  promptDisplay skin part.
+     */
+    public var promptDisplay:StyleableTextField;

     /**
      *  @private
@@ -74,7 +82,9 @@
      *  Instance of the border graphics.
      */
     private var border:DisplayObject;
-
+
+    private var borderVisibleChanged:Boolean = false;
+
     //--------------------------------------------------------------------------
     //
     //  Overridden methods
@@ -94,8 +104,45 @@
         textDisplay = StyleableTextField(createInFontContext(StyleableTextField));
         textDisplay.styleProvider = this;
         textDisplay.editable = true;
-		textDisplay.addEventListener("editableChanged", editableChangedHandler);
+        textDisplay.addEventListener("editableChanged", editableChangedHandler);
         addChild(textDisplay);
+
+        createPromptDisplay();
+    }
+
+    protected function createPromptDisplay():void
+    {
+        promptDisplay = StyleableTextField(createInFontContext(StyleableTextField));
+        promptDisplay.styleProvider = this;
+        promptDisplay.editable = false;
+        promptDisplay.mouseEnabled = false;
+        addChild(promptDisplay);
+    }
+
+    /**
+     *  @private
+     */
+    override protected function commitProperties():void
+    {
+        super.commitProperties();
+
+        if (borderVisibleChanged)
+        {
+            borderVisibleChanged = false;
+
+            var borderVisible:Boolean = getStyle("borderVisible") == true;
+
+            if (borderVisible && !border)
+            {
+                border = new TextInput_border();
+                addChild(border);
+            }
+            else if (!borderVisible && border)
+            {
+                removeChild(border);
+                border = null;
+            }
+        }
     }

     /**
@@ -105,8 +152,25 @@
     {
         super.measure();

-        // commit styles so we can get a valid textHeight
-        textDisplay.commitStyles();
+        var textHeight:Number = 24;
+
+        if (textDisplay)
+        {
+            // temporarily change text for measurement
+            var oldText:String = textDisplay.text;
+
+            // commit styles so we can get a valid textHeight
+            textDisplay.text = "Wj";
+            textDisplay.commitStyles();
+
+            textHeight = textDisplay.textHeight;
+            textDisplay.text = oldText;
+        }
+
+        var paddingLeft:Number = getStyle("paddingLeft");
+        var paddingRight:Number = getStyle("paddingRight");
+        var paddingTop:Number = getStyle("paddingTop");
+        var paddingBottom:Number = getStyle("paddingBottom");

         // Width is based on maxChars (if set), or hard-coded to 440
         if (hostComponent && hostComponent.maxChars)
@@ -116,14 +180,14 @@
             // for most input and most font.
             var characterWidth:int = Math.max(1, (getStyle("fontSize") - 2));
             measuredWidth =  (characterWidth * hostComponent.maxChars) +
-                (HORIZONTAL_PADDING * 2) + TEXT_WIDTH_PADDING;
+                paddingLeft + paddingRight + TEXT_WIDTH_PADDING;
         }
         else
         {
             measuredWidth = 440;
         }

-        measuredHeight = textDisplay.textHeight + VERTICAL_PADDING * 2 + TEXT_HEIGHT_PADDING;
+        measuredHeight = textHeight + paddingTop + paddingBottom + TEXT_HEIGHT_PADDING;
     }

     /**
@@ -132,22 +196,49 @@
     override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void
     {
         super.updateDisplayList(unscaledWidth, unscaledHeight);
-
+
+        var borderSize:uint = (border) ? BORDER_SIZE : 0;
+        var borderWidth:uint = borderSize * 2;
+
         // Draw the contentBackgroundColor
         graphics.clear();
         graphics.beginFill(getStyle("contentBackgroundColor"), getStyle("contentBackgroundAlpha"));
-        graphics.drawRoundRect(1, 1, unscaledWidth - 2, unscaledHeight - 2, CORNER_ELLIPSE_SIZE, CORNER_ELLIPSE_SIZE);
+        graphics.drawRoundRect(borderSize, borderSize, unscaledWidth - borderWidth, unscaledHeight - borderWidth, CORNER_ELLIPSE_SIZE, CORNER_ELLIPSE_SIZE);
         graphics.endFill();
-
+
         // position & size border
-        resizePart(border, unscaledWidth, unscaledHeight);
-        positionPart(border, 0, 0);
-
+        if (border)
+        {
+            resizePart(border, unscaledWidth, unscaledHeight);
+            positionPart(border, 0, 0);
+        }
+
         // position & size the text
-        textDisplay.commitStyles();
-		var textHeight:Number = textDisplay.textHeight + TEXT_HEIGHT_PADDING;
-        resizePart(textDisplay, unscaledWidth - (HORIZONTAL_PADDING * 2), textHeight);
-        positionPart(textDisplay, HORIZONTAL_PADDING, Math.round((unscaledHeight - textHeight) / 2));
+        var paddingLeft:Number = getStyle("paddingLeft");
+        var paddingRight:Number = getStyle("paddingRight");
+        var paddingTop:Number = getStyle("paddingTop");
+        var paddingBottom:Number = getStyle("paddingBottom");
+
+        if (textDisplay)
+        {
+            textDisplay.commitStyles();
+
+            var textHeight:Number = textDisplay.textHeight;
+            var textTop:Number = Math.round((unscaledHeight - textHeight) / 2);
+
+            // verticalAlign=middle
+            textTop = Math.max(textTop, paddingTop);
+
+            resizePart(textDisplay, unscaledWidth - paddingLeft - paddingRight, unscaledHeight - paddingTop - paddingBottom);
+            positionPart(textDisplay, paddingLeft, textTop);
+        }
+
+        if (promptDisplay)
+        {
+            promptDisplay.commitStyles();
+            resizePart(promptDisplay, unscaledWidth - paddingLeft - paddingRight, unscaledHeight - paddingTop - paddingBottom);
+            positionPart(promptDisplay, paddingLeft, textTop);
+        }
     }

     /**
@@ -155,30 +246,57 @@
      */
     override public function styleChanged(styleProp:String):void
     {
+        var allStyles:Boolean = !styleProp || styleProp == "styleName";
+
+        if (allStyles || styleProp == "borderVisible")
+        {
+            borderVisibleChanged = true;
+            invalidateProperties();
+        }
+
+        if (allStyles || styleProp.indexOf("padding") == 0)
+        {
+            invalidateDisplayList();
+        }
+
         if (textDisplay)
             textDisplay.styleChanged(styleProp);
+
+        if (promptDisplay)
+            promptDisplay.styleChanged(styleProp);
+
         super.styleChanged(styleProp);
     }
-
-	/**
-	 *  @private
-	 */
-	override protected function commitCurrentState():void
-	{
-		super.commitCurrentState();
-
-		if (currentState == "normal")
-			alpha = 1;
-		else
-			alpha = 0.5;
-	}
-
-	/**
-	 *  @private
-	 */
-	private function editableChangedHandler(event:Event):void
-	{
-		invalidateDisplayList();
-	}
+
+    /**
+     *  @private
+     */
+    override protected function commitCurrentState():void
+    {
+        super.commitCurrentState();
+
+        alpha = currentState.indexOf("disabled") == -1 ? 1 : 0.5;
+
+        var showPrompt:Boolean = currentState.indexOf("WithPrompt") >= 0;
+
+        if (showPrompt && !promptDisplay)
+        {
+            createPromptDisplay();
+            invalidateDisplayList();
+        }
+        else if (!showPrompt && promptDisplay)
+        {
+            removeChild(promptDisplay);
+            promptDisplay = null;
+        }
+    }
+
+    /**
+     *  @private
+     */
+    private function editableChangedHandler(event:Event):void
+    {
+        invalidateDisplayList();
+    }
 }
 }


Transferred from the Adobe Open Source Subversion Repository

Revision: 19309
Author:   cframpto@adobe.com
Date:     2010-12-13T15:39:28.043535Z

Log Message:
-----------
Per bug, reordered params for GridEvent so super classes' parameters come first.

QE notes: made same change to DataGrid/EVents/DataGrid_Events_basic01.mxml
Doc notes:
Bugs: SDK-28839
Reviewer: Kevin
Tests run: cyclone and local
Is noteworthy for integration: yes - order of params for GridEvent changed

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Grid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/events/GridEvent.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as</path>

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

--- frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
+++ frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
@@ -987,8 +987,9 @@

         const event:GridEvent = new GridEvent(
             type, bubbles, cancelable,
-            headerGroupXY.x, headerGroupXY.y, -1, columnIndex, column, item, itemRenderer,
-            relatedObject, ctrlKey, altKey, shiftKey, buttonDown, delta);
+            headerGroupXY.x, headerGroupXY.y,
+            relatedObject, ctrlKey, altKey, shiftKey, buttonDown, delta,
+            -1 /* rowIndex */, columnIndex, column, item, itemRenderer);
         dispatchEvent(event);
     }


Transferred from the Adobe Open Source Subversion Repository

Revision: 4754
Author:   rfrishbe@adobe.com
Date:     2009-01-30T02:06:41.211348Z

Log Message:
-----------
ArrayList/ListCollectionView - remove addAll() and addAllAt() from change yesterday.  Instead I'll check this into the 3.x branch.

QE Notes: None
Doc Notes: None
Bugs: SDK-18536, SDK-18537
Reviewer: None
tests: checkintests

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ListCollectionView.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ArrayList.as</path>

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

--- frameworks/projects/framework/src/mx/collections/ArrayList.as
+++ frameworks/projects/framework/src/mx/collections/ArrayList.as
@@ -18,12 +18,14 @@
 import flash.utils.IDataOutput;
 import flash.utils.IExternalizable;
 import flash.utils.getQualifiedClassName;
-
 import mx.core.IPropertyChangeNotifier;
+import mx.core.mx_internal;
 import mx.events.CollectionEvent;
 import mx.events.CollectionEventKind;
 import mx.events.PropertyChangeEvent;
 import mx.events.PropertyChangeEventKind;
+import mx.managers.ISystemManager;
+import mx.managers.SystemManager;
 import mx.resources.IResourceManager;
 import mx.resources.ResourceManager;
 import mx.utils.ArrayUtil;
@@ -308,26 +310,6 @@

         startTrackUpdates(item);
         internalDispatchEvent(CollectionEventKind.ADD, item, index);
-    }
-
-    /**
-     *  @copy mx.collections.ListCollectionView#addAll
-     */
-    public function addAll(addList:IList):void
-    {
-        addAllAt(addList, length);
-    }
-
-    /**
-     *  @copy mx.collections.ListCollectionView#addAllAt
-     */
-    public function addAllAt(addList:IList, index:int):void
-    {
-        var length:int = addList.length;
-        for(var i:int=0; i < length; i++)
-        {
-            this.addItemAt(addList.getItemAt(i), i+index);
-        }
     }

     /**


Transferred from the Adobe Open Source Subversion Repository

Revision: 10475
Author:   jimurphy@adobe.com
Date:     2009-09-21T23:58:45.057679Z

Log Message:
-----------
Merged 3.x revisions 10063,10086,10098,10123,10176,10397,10416-10418,10420 -> trunk

checkintests: pass

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/AMFChannel.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ListCollectionView.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.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/formatters/CurrencyFormatter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ChannelSet.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/SortField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/http/HTTPService.as</path>

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

--- frameworks/projects/framework/src/mx/collections/SortField.as
+++ frameworks/projects/framework/src/mx/collections/SortField.as
@@ -569,10 +569,10 @@
 		if (left == null && right == null)
 			return 0;

-        if (left == null)
+        if (left == null && !_name)
             left = a;

-        if (right == null)
+        if (right == null && !_name)
             right = b;


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

--- frameworks/projects/rpc/src/mx/rpc/soap/AbstractWebService.as
+++ frameworks/projects/rpc/src/mx/rpc/soap/AbstractWebService.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2006-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: 5152
Author:   gruehle@adobe.com
Date:     2009-03-03T21:18:45.837259Z

Log Message:
-----------
First pass of bug fixes for the Spark skins for Halo components.

Bugs:
SDK-19963 - themeColor should not affect rollOverColor or selectionColor in flex 4
SDK-19654 - Spark skin for the Halo ComboBox dropdown needs a drop shadow
SDK-19637 - Halo HScrollBar/VScrollBar controls dont render correctly when specifying includeIn states
SDK-19634 - Halo ProgressBar default size is very different when using Halo vs Gumbo theme
SDK-19626 - Flicker when toggling enabled property on Halo TabBar control with Gumbo skin
SDK-19556 - selected Halo CheckBox and RadioButton icons briefly flicker when you roll over them
SDK-19658 - Halo ComboBox with Gumbo skin has an odd flicker

Doc/QA Notes: The fix for SDK-19963 includes a compatibility-version check. When compatibility-version < 4, setting themeColor implicitly sets rollOverColor and selectionColor, if they have not been set. When compatibility-version >= 4, you must explicitly set rollOverColor and selectionColor, even when using the Halo theme.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxApplication.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/framework/src/mx/controls/ComboBase.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/sparkskins/src/mx/skins/spark/BorderSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/sparkskins/src/mx/skins/spark/ProgressBarTrackSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/RectangularDropShadow.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>

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

--- frameworks/projects/spark/src/spark/components/Application.as
+++ frameworks/projects/spark/src/spark/components/Application.as
@@ -712,40 +712,6 @@
             }
         }
     }
-
-    /**
-     *  @private
-     *  Application also handles themeColor defined
-     *  on the global selector.
-     */
-    override mx_internal function initThemeColor():Boolean
-    {
-        var result:Boolean = super.initThemeColor();
-
-        if (!result)
-        {
-            var tc:Object;  // Can be number or string
-            var rc:Number;
-            var sc:Number;
-            var globalSelector:CSSStyleDeclaration =
-                StyleManager.getStyleDeclaration("global");
-
-            if (globalSelector)
-            {
-                tc = globalSelector.getStyle("themeColor");
-                rc = globalSelector.getStyle("rollOverColor");
-                sc = globalSelector.getStyle("selectionColor");
-            }
-
-            if (tc && isNaN(rc) && isNaN(sc))
-            {
-                setThemeColor(tc);
-            }
-            result = true;
-        }
-
-        return result;
-    }

     /**
      *  @private


Added rtmpt and rtmps protocols

Added rtmpt and rtmps protocols

--- src/Player.as
+++ src/Player.as
@@ -199,6 +199,8 @@
         break;

       case 'rtmp':
+      case 'rtmps':
+      case 'rtmpt':
         /* RTMP */
         client = new RTMPClient(this.video, urlParsed);
         break;


formatting

formatting

git-svn-id: 27326a786375daad9d33dc990c6f272e4c8f567c@1227 fda5f131-174c-0410-8613-e0905860106b

--- org.openwms/trunk/core/org.openwms.client.flex.lib/src/main/flex/org/openwms/web/flex/client/module/ModuleLocator.as
+++ org.openwms/trunk/core/org.openwms.client.flex.lib/src/main/flex/org/openwms/web/flex/client/module/ModuleLocator.as
@@ -22,7 +22,7 @@

     import flash.events.EventDispatcher;
     import flash.system.ApplicationDomain;
-
+
     import mx.collections.ArrayCollection;
     import mx.collections.XMLListCollection;
     import mx.controls.Alert;
@@ -31,7 +31,7 @@
     import mx.logging.Log;
     import mx.modules.IModuleInfo;
     import mx.modules.ModuleManager;
-
+
     import org.granite.tide.events.TideFaultEvent;
     import org.granite.tide.events.TideResultEvent;
     import org.granite.tide.spring.Context;
@@ -87,7 +87,7 @@
          */
         [Observer("LOAD_ALL_MODULES")]
         public function loadModulesFromService() : void {
-        	trace("Loading all module definitions from the database");
+            trace("Loading all module definitions from the database");
             tideContext.moduleService.findAll(onModulesLoad, onFault);
         }

@@ -97,17 +97,17 @@
          */
         [Observer("UNLOAD_ALL_MODULES")]
         public function unloadAllModules() : void {
-        	for each (var url:String in modelLocator.loadedModules.keys) {
-        		var module:Module = new Module();
-        		module.url = url;
-        		unloadModule(module);
-        	}
+            for each (var url:String in modelLocator.loadedModules.keys) {
+                var module:Module = new Module();
+                module.url = url;
+                unloadModule(module);
+            }
         }

         /**
          * Tries to save the module data via a service call.
          * Is called when the SAVE_MODULE event is fired.
-         *
+         *
          * @param event An ApplicationEvent that holds the Module to be saved in its data field
          */
         [Observer("SAVE_MODULE")]
@@ -118,7 +118,7 @@
         /**
          * Tries to remove the module data via a service call.
          * Is called when the DELETE_MODULE event is fired.
-         *
+         *
          * @param event An ApplicationEvent that holds the Module to be removed in its data field
          */
         [Observer("DELETE_MODULE")]
@@ -126,12 +126,12 @@
             toRemove = event.data as Module;
             tideContext.moduleService.remove(event.data as Module, onModuleRemoved, onFault);
         }
-
+
         /**
          * A collection of modules is passed to the service to save the startupOrder properties.
          * The startupOrders must be calculated and ordered before. Is called when the
          * SAVE_STARTUP_ORDERS event is fired.
-         *
+         *
          * @param event An ApplicationEvent holds a list of Modules that shall be updated
          */
         [Observer("SAVE_STARTUP_ORDERS")]
@@ -157,7 +157,7 @@
             }
             loadModule(module);
         }
-
+
         /**
          * Checks whether the module a registered Module and calls unloadModule to unload it.
          *
@@ -237,13 +237,13 @@
                 return false;
             }
             for each (var mInf:IModuleInfo in modelLocator.loadedModules.values) {
-	            if ((mInf.data as Module).moduleName == moduleName) {
-	                return true;
-	            }
+                if ((mInf.data as Module).moduleName == moduleName) {
+                    return true;
+                }
             }
             return false;
         }
-
+
         // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         //
         // privates
@@ -264,7 +264,7 @@
          * Callback when startupOrder was saved for a list of modules.
          */
         private function onStartupOrdersSaved(event : TideResultEvent) : void {
-        	// We do not need to update the list of modules here, keep quite
+            // We do not need to update the list of modules here, keep quite
         }

         /**
@@ -272,10 +272,10 @@
          * on startup and tries to start each Module if it hasn't been loaded so far.
          */
         private function startAllModules() : void {
-        	var noModulesLoaded:Boolean = true;
+            var noModulesLoaded:Boolean = true;
             for each (var module : Module in modelLocator.allModules) {
                 if (module.loadOnStartup) {
-                	noModulesLoaded = false;
+                    noModulesLoaded = false;
                     if (modelLocator.loadedModules.containsKey(module.url)) {
                         module.loaded = true;
                         continue;
@@ -309,7 +309,7 @@
             }
             trace("No module to load with url: " + module.url);
         }
-
+
         private function unloadModule(module : Module):void {
             var mInf : IModuleInfo = ModuleManager.getModule(module.url);
             if (mInf != null) {
@@ -506,4 +506,5 @@
         }

     }
-}+}
+


resolve #24 - Base64 encoding must be URL-safe, no padding, no wrapping

--- snowplow-as3-tracker/src/com/snowplowanalytics/snowplow/tracker/Util.as
+++ snowplow-as3-tracker/src/com/snowplowanalytics/snowplow/tracker/Util.as
@@ -175,7 +175,17 @@
 			try {
 				var encoder:Base64Encoder = new Base64Encoder();
 				encoder.encode(str);
-				return encoder.flush();
+				var base64:String = encoder.flush();
+
+				//make base64 url safe.
+				base64 = base64.replace(/\+/g, "-");
+				base64 = base64.replace(/\//g, "_");
+				base64 = base64.replace(/=/g, "");
+				base64 = base64.replace(/\n/g, "");
+				base64 = base64.replace(/\r/g, "");
+				base64 = base64.replace(/\t/g, "");
+
+				return base64;
 			} catch (e:Error) {
 				trace(e.getStackTrace());
 			}


Transferred from the Adobe Open Source Subversion Repository

Revision: 10225
Author:   smgilson@adobe.com
Date:     2009-09-14T13:23:35.279138Z

Log Message:
-----------
ASDoc updates for Bounce.as and Elastic.as

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

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Bounce.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/easing/Elastic.as</path>

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

--- frameworks/projects/spark/src/spark/effects/easing/Bounce.as
+++ frameworks/projects/spark/src/spark/effects/easing/Bounce.as
@@ -14,10 +14,10 @@
 import mx.effects.easing.Bounce;

 /**
- * The Bounce class implements easing functionality simulating gravity
- * pulling on and bouncing the target object. The object
- * movement accelerates toward the end value and then bounces against
- * it several times.
+ *  The Bounce class implements easing functionality simulating gravity
+ *  pulling on and bouncing the target object.
+ *  The movement of the effect target accelerates toward the end value,
+ *  and then bounces against the end value several times.
  *
  *  @langversion 3.0
  *  @playerversion Flash 10
@@ -33,7 +33,7 @@
     //--------------------------------------------------------------------------

     /**
-     *  Constructs a Bounce easer.
+     *  Constructor.
      *
      *  @langversion 3.0
      *  @playerversion Flash 10
@@ -51,7 +51,7 @@
     //--------------------------------------------------------------------------

     /**
-     *  @copy spark.effects.easing.IEaser#ease
+     *  @inheritDoc
      *
      *  @langversion 3.0
      *  @playerversion Flash 10


Transferred from the Adobe Open Source Subversion Repository

Revision: 7537
Author:   rfrishbe@adobe.com
Date:     2009-06-03T20:25:36.987268Z

Log Message:
-----------
VideoPlayer fixes, including focus fixes and some other fixes.

For Focus:

SkinnableComponent:
- Now check the drawFocusAnyway flag before checking for focusManager.getFocus() != this because in the case of the video player volume bar, we don’t actually have a focusManager

TrackBase:
- Override of focusIn/OutHandler wasn’t calling super.focusIn/OutHandler().

Slider:
- Now instead of overriding setFocus() and calling stage.focus = thumb, we just override drawFocus() and tell the thumb to drawFocus().  This means we keep the focus ourselves and handle the keyDown events on ourself rather than on the thumb.

FocusSkin:
- Change the exit-early logic so that we don’t exit if we have no focusManager...we only exit if we don’t have a focusObject (and we sometimes rely on the focusManager for this focusObject).  FocusObject actually gets slammed in via SkinnableComponent, so this should be fine.

VideoPlayerVolumeBar:
- On focus in, open the drop down, validate it, and draw the focus on thumb.

VideoPlayer:
- set tabChildren = true so we can tab into the components

Skins (VideoPlayerSkin.mxml only):
- Change the layer of focused components with: focusIn="event.target.layer=1" focusOut="event.target.layer=0"

Other Changes:

TrackBase:
- Add official CHANGING event.  Work still needs to be done on dispatching it in all cases correctly.
- Remove the check for (!enabled) in the thumb_mouseDownHandler...this shouldn’t be needed thanks to Jason’s change.  We do this in Scroller as well, and I’ve got a local change for that which will come later as part of the Change/Changing ARB issue fix.

PopUpAnchor:
- Needs to take into account the fullScreenRect to get the popup to display correctly in those cases.

FlexEvent:
- Adding CHANGING event.

VideoPlayerScrubBar:
- Changed bufferedValue to an Array to handle a Range.

VideoPlayerVolumeBar/VideoPlayerVolumeBarEvent:
- “rollOverOpenDelay“: Change the “behavior property” to a style per the ARB decision.  I intentionally left it as a private static const before to make this change easier.
- Advertise a new event, mutedChange to go along with a new property muted, rather than rely on mutedButtonClick.

VideoPlayer:
- Add symbolColor metadata (this was already working...just no metadata for it).  Do I add color here?
- Add fullScreenHideControlDelay as part of ARB behavioral property decision
- Changes around volume bar and muted property and muteButtonChanged event.
- Fiex the full screen case...need to make sure to use globalToLocal() and localToGlobal() when positioning the object since fulLScreenRect is in global coordinates.  Also need to call LayoutManager.getInstance().validateNow() rather than just validateNow() because I need everythignt o be validated since not including the compoennt in a layout may change the coordinates of the parent component.
- In scrubBar_changeHandler, if scrubbing to the end of a video, don’t do it when streaming and you’ve called play() because the source is a String...there’s a bug in the FLVPlayback that doesn’t look like it’ll get fixed :-)
- Fixed a few other bugs..nothing too big

Defaults.css:
Set the behavioral properties in here

Skins:
- Set the height explicitly on the ThumbSkin..this is the exact pattern we use for Hslider/Vslider now
- Fix up the baseColor so it gets cleared in the full screen case
- Fix up the text styles so we are explicitly setting them in the fullScreen case.  They can now be styled via CSS in the non-fullScreen case and the color style should work.

QE Notes: -
Doc Notes: -
Bugs: SDK-21505, SDK-21352, SDK-21504, SDK-21503, SDK-21486, SDK-21485
Reviewer: Alex, Glenn
tests: checkintests, mustella tests for Scroller, ScrollBar, Slider

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/VideoPlayerScrubBarSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/TrackBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/skins/default/FocusSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/skins/default/VideoPlayerScrubBarSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/PopUpAnchor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/FlexEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/VideoPlayerVolumeBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/VideoPlayerSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/VideoPlayerScrubBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/skins/default/VideoPlayerSkin.mxml</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/skins/default/VideoPlayerFullScreenScrubBarSkin.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/events/VideoPlayerVolumeBarEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/VideoPlayer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/SkinnableComponent.as</path>

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

--- frameworks/projects/spark/src/spark/skins/spark/FocusSkin.as
+++ frameworks/projects/spark/src/spark/skins/spark/FocusSkin.as
@@ -106,21 +106,21 @@
      *  @playerversion AIR 1.5
      *  @productversion Flex 4
      */
-	public function get focusObject():SkinnableComponent
-	{
-	    return _focusObject;
-	}
-
-	public function set focusObject(value:SkinnableComponent):void
-	{
-	    _focusObject = value;
+    public function get focusObject():SkinnableComponent
+    {
+        return _focusObject;
+    }
+
+    public function set focusObject(value:SkinnableComponent):void
+    {
+        _focusObject = value;

         // Add an "updateComplete" listener to the skin so we can redraw
         // whenever the skin is drawn.
         if (_focusObject.skin)
             _focusObject.skin.addEventListener(FlexEvent.UPDATE_COMPLETE,
                     skin_updateCompleteHandler, false, 0, true);
-	}
+    }

     //--------------------------------------------------------------------------
     //
@@ -129,15 +129,16 @@
     //--------------------------------------------------------------------------

     override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void
-    {
-        // Early exit if we don't have a focus manager
-        if (!focusManager)
-            return;
-
+    {
         // Grab a bitmap of the focused object
+        if (!focusObject && focusManager)
+            focusObject = focusManager.getFocus() as SkinnableComponent;
+
+        // if we weren't handed a focusObject or we had no focusManager to
+        // give us one, then exit early
         if (!focusObject)
-			focusObject = focusManager.getFocus() as SkinnableComponent;
-
+           return;
+
         var bitmapData:BitmapData = new BitmapData(
                     focusObject.width + (FOCUS_THICKNESS * 2),
                     focusObject.height + (FOCUS_THICKNESS * 2), true, 0);


Fix for 32 bit overflow check; this causes us to get bad times.

--- HLSPlugin/src/org/osmf/net/httpstreaming/HLSHTTPNetStream.as
+++ HLSPlugin/src/org/osmf/net/httpstreaming/HLSHTTPNetStream.as
@@ -1664,12 +1664,12 @@
 			// Fix for http://bugs.adobe.com/jira/browse/FM-1544
 			// We need to take into account that flv tags' timestamps are 32-bit unsigned ints
 			// This means they will roll over, but the bootstrap times won't, since they are 64-bit unsigned ints
-			while (currentTime < _initialTime)
+			/*while (currentTime < _initialTime)
 			{
 				// Add 2^32 (4,294,967,296) milliseconds to the currentTime
 				// currentTime is in seconds so we divide that by 1000
 				currentTime += 4294967.296;
-			}
+			}*/

 			if (_playForDuration >= 0)
 			{


Don't keep all converted FLV data forever by default.

--- HLSPlugin/src/org/osmf/net/httpstreaming/HLSHTTPNetStream.as
+++ HLSPlugin/src/org/osmf/net/httpstreaming/HLSHTTPNetStream.as
@@ -109,7 +109,9 @@
 			private var previouslyLoggedState:String = null;
 		}

-		public static var writeToMasterBuffer:Boolean = true;
+		// If enabled, we log to a FLV buffer that can be saved out via FileReference.
+		// The testplayer does this.
+		public static var writeToMasterBuffer:Boolean = false;
 		public static var _masterBuffer:ByteArray = new ByteArray();

 		private var neverPlayed:Boolean = true;


Added comment to disabled code

Added comment to disabled code

--- HLSPlugin/src/org/denivip/osmf/net/httpstreaming/hls/HTTPHLSNetStream.as
+++ HLSPlugin/src/org/denivip/osmf/net/httpstreaming/hls/HTTPHLSNetStream.as
@@ -1613,7 +1613,8 @@
                             bytes = new ByteArray();
                             vTag.write(bytes);
 							_flvParserProcessed += bytes.length;
-							attemptAppendBytes(bytes);
+							//Appears to result in lots of framedrops:
+							//attemptAppendBytes(bytes);
 						}

 						if (haveSeenVideoTag)


sortOn array opt

sortOn array opt

--- frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
+++ frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
@@ -376,17 +376,25 @@
 		 * @param	names
 		 * @param	opt
 		 */
-		public static function sortOn(arr:Array,names:Object,opt:int=0):void{
+		public static function sortOn(arr:Array,names:Object,opt:Object=0):void{
 			if (names is Array){
 				sortNames = names as Array;
 			}else{
 				sortNamesOne[0] = names;
 				sortNames = sortNamesOne;
 			}
-			muler = (Array.DESCENDING & opt) > 0?-1: 1;
-			if(opt&Array.NUMERIC){
+			if (opt is Array){
+				var opt2:int = 0;
+				for each(var o:int in opt){
+					opt2 = opt2 | o;
+				}
+			}else{
+				opt2 = opt as int;
+			}
+			muler = (Array.DESCENDING & opt2) > 0?-1: 1;
+			if(opt2&Array.NUMERIC){
 				arr.sort(compareNumber);
-			}else if (opt&Array.CASEINSENSITIVE){
+			}else if (opt2&Array.CASEINSENSITIVE){
 				arr.sort(compareStringCaseinsensitive);
 			}else{
 				arr.sort(compareString);


Transferred from the Adobe Open Source Subversion Repository

Revision: 22416
Author:   tkraikit@adobe.com
Date:     2011-09-06T22:14:53.007831Z

Log Message:
-----------
cleanup TODOs, added ASDoc; added check for invalid input type in YearProvider.getItemIndex(Object)

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

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

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

--- frameworks/projects/mobilecomponents/src/spark/components/DateSpinner.as
+++ frameworks/projects/mobilecomponents/src/spark/components/DateSpinner.as
@@ -848,6 +848,8 @@
      *  Create a list object for the specified date part.
      *
      *  @param datePart Use date part constants, e.g. YEAR_ITEM.
+	 *  @param itemIndex index of the date part in the overall list container
+	 *  @param itemCount number of date parts being shown
      *
      *  @langversion 3.0
      *  @playerversion AIR 3
@@ -1174,7 +1176,6 @@
         return generateDateItemObject(dateTimeFormatter.format(dateObj), value);
     }

-    // TODO: possibly optimize usages and remove this function
     private function findDateItemIndexInDataProvider(item:Number, dataProvider:IList):int
     {
         for (var i:int = 0; i < dataProvider.length; i++)
@@ -1278,7 +1279,6 @@
         }
         if (minuteList)
         {
-            // TODO: calculate instead of iterate?
             newIndex = findDateItemIndexInDataProvider(selectedDate.minutes, minuteList.dataProvider);
             goToIndex(minuteList, newIndex, useAnimation);
         }


Fixed an error in updateBuffer() override.

--- net/flashpunk/graphics/Text.as
+++ net/flashpunk/graphics/Text.as
@@ -47,7 +47,7 @@
 		}

 		/** @private Updates the drawing buffer. */
-		override public function updateBuffer():void
+		override public function updateBuffer(clearBefore:Boolean = false):void
 		{
 			_field.setTextFormat(_form);
 			_field.width = _width = _field.textWidth + 4;


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

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

 package mx.automation.delegates.advancedDataGrid
 {


updating header

updating header

--- src/GA_AS3.as
+++ src/GA_AS3.as
@@ -15,6 +15,7 @@
  *
  * Contributor(s):
  *   Zwetan Kjukov <zwetan@gmail.com>.
+ *   Marc Alcaraz <ekameleon@gmail.com>.
  */

 package


Fix bugs in ATF texture support: - Proper initialization in setContentFromATF() - Proper texture format

--- src/aerys/minko/render/resource/texture/TextureResource.as
+++ src/aerys/minko/render/resource/texture/TextureResource.as
@@ -25,6 +25,7 @@

 		private var _bitmapData	: BitmapData	= null;
 		private var _atf		: ByteArray		= null;
+		private var _atfFormat	: uint			= 0;

 		private var _width		: Number		= 0;
 		private var _height		: Number		= 0;
@@ -120,7 +121,17 @@

 		public function setContentFromATF(atf : ByteArray) : void
 		{
-			_atf = atf;
+			_atf			= atf;
+			_update 		= true;
+
+			atf.position 	= 6;
+
+			_atfFormat 		= atf.readUnsignedByte() & 3;
+			_width 			= 1 << atf.readUnsignedByte();
+			_height 		= 1 << atf.readUnsignedByte();
+			_mipmap 		= atf.readUnsignedByte() > 1;
+
+			atf.position 	= 0;
 		}

 		public function getNativeTexture(context : Context3D) : TextureBase
@@ -135,7 +146,7 @@
 				_texture = context.createTexture(
 					_width,
 					_height,
-					_atf ? FORMAT_COMPRESSED : FORMAT_BGRA,
+					_atf && _atfFormat == 2 ? FORMAT_COMPRESSED : FORMAT_BGRA,
 					_bitmapData == null && _atf == null
 				);


minor refactor of MeshVisibilityDataProvider

--- src/aerys/minko/scene/data/MeshVisibilityDataProvider.as
+++ src/aerys/minko/scene/data/MeshVisibilityDataProvider.as
@@ -9,12 +9,12 @@
 		private static const DATA_DESCRIPTOR	: Object	= {
 			'visible'			: 'visible',
 			'frustumCulling'	: 'frustumCulling',
-			'inFrustum'			: 'insideFrustum'
+			'insideFrustum'		: 'insideFrustum'
 		};

 		private var _visible			: Boolean	= true;
 		private var _frustumCulling		: uint		= 0;
-		private var _inFrustum			: Boolean	= true;
+		private var _insideFrustum		: Boolean	= true;

 		private var _changed			: Signal	= new Signal('MeshVisibilityDataProvider.changed');
 		private var _propertyChanged	: Signal	= new Signal('MeshVisibilityDataProvider.propertyChanged');
@@ -50,16 +50,16 @@
 			}
 		}

-		public function get inFrustum() : Boolean
+		public function get insideFrustum() : Boolean
 		{
-			return _inFrustum;
+			return _insideFrustum;
 		}
-		public function set inFrustum(value : Boolean) : void
+		public function set insideFrustum(value : Boolean) : void
 		{
-			if (_inFrustum != value)
+			if (_insideFrustum != value)
 			{
-				_inFrustum = value;
-				_changed.execute(this, 'inFrustum');
+				_insideFrustum = value;
+				_changed.execute(this, 'insideFrustum');
 			}
 		}

@@ -84,7 +84,7 @@

 			clone.visible = visible;
 			clone.frustumCulling = frustumCulling;
-			clone.inFrustum = inFrustum;
+			clone.insideFrustum = insideFrustum;

 			return clone;
 		}