Transferred from the Adobe Open Source Subversion Repository

Revision: 9416
Author:   aharui@adobe.com
Date:     2009-08-20T02:15:38.365755Z

Log Message:
-----------
Revert 9399.  The prototypes broke mustella states tests.  Will try again later.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/builder/ComponentBuilder.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/spark/skins/spark/SparkChromeWindowedApplicationSkin.mxml</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/NavigatorChild.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Panel.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/spark/src/spark/components/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ViewStack.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/spark/src/spark/core/IDeferredContentOwner.as" copyfrom-rev="9398" action="A">/flex/sdk/trunk/frameworks/projects/spark/src/spark/core/IDeferredContentOwner.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/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/NavBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler_en.properties</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/INavigatable.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/spark-manifest.xml</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/spark/src/spark/skins/spark/PanelSkin.mxml</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/INavigatorContent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/TabNavigator.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/PanelSkin.mxml</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IDeferredContentOwner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/ApplicationSkin.mxml</path>

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

--- frameworks/projects/mx/src/mx/containers/ViewStack.as
+++ frameworks/projects/mx/src/mx/containers/ViewStack.as
@@ -13,15 +13,14 @@
 {

 import flash.display.DisplayObject;
+import flash.display.DisplayObjectContainer;
 import flash.events.Event;
-
 import mx.automation.IAutomationObject;
 import mx.core.Container;
 import mx.core.ContainerCreationPolicy;
 import mx.core.EdgeMetrics;
+import mx.managers.IHistoryManagerClient;
 import mx.core.IInvalidating;
-import mx.core.INavigatable;
-import mx.core.INavigatorContent;
 import mx.core.IUIComponent;
 import mx.core.ScrollPolicy;
 import mx.core.UIComponent;
@@ -29,15 +28,11 @@
 import mx.effects.Effect;
 import mx.effects.EffectManager;
 import mx.events.ChildExistenceChangedEvent;
-import mx.events.CollectionEvent;
-import mx.events.CollectionEventKind;
 import mx.events.EffectEvent;
 import mx.events.FlexEvent;
 import mx.events.IndexChangedEvent;
-import mx.events.PropertyChangeEvent;
 import mx.geom.RoundedRectangle;
 import mx.managers.HistoryManager;
-import mx.managers.IHistoryManagerClient;

 use namespace mx_internal;

@@ -233,7 +228,7 @@
  *  @playerversion AIR 1.1
  *  @productversion Flex 3
  */
-public class ViewStack extends Container implements IHistoryManagerClient, INavigatable
+public class ViewStack extends Container implements IHistoryManagerClient
 {
     include "../core/Version.as";

@@ -306,7 +301,7 @@
      *  @private
      *  Remember which child has an overlay mask, if any.
      */
-    private var overlayChild:UIComponent;
+    private var overlayChild:Container;

     /**
      *  @private
@@ -613,19 +608,19 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-    public function get selectedChild():INavigatorContent
+    public function get selectedChild():Container
     {
         if (selectedIndex == -1)
             return null;

-        return INavigatorContent(getChildAt(selectedIndex));
+        return Container(getChildAt(selectedIndex));
     }

     /**
      *  @private
      */
     public function set selectedChild(
-                            value:INavigatorContent):void
+                            value:Container):void
     {
         var newIndex:int = getChildIndex(DisplayObject(value));

@@ -821,8 +816,8 @@

         if (numChildren > 0 && selectedIndex != -1)
         {
-            var child:UIComponent =
-                UIComponent(getChildAt(selectedIndex));
+            var child:Container =
+                Container(getChildAt(selectedIndex));

             minWidth = child.minWidth;
             preferredWidth = child.getExplicitOrMeasuredWidth();
@@ -852,7 +847,7 @@
         // cache until we're fully initialized.  (bug 102639)
         // This check was moved from the beginning of this function to
         // here to fix bug 103665.
-        if (selectedChild && INavigatorContent(selectedChild).deferredContentCreated == false)
+        if (selectedChild && Container(selectedChild).numChildrenCreated == -1)
             return;

         // Don't remember sizes if we don't have any children
@@ -912,8 +907,8 @@
         // Stretch the selectedIndex to fill our size
         if (selectedIndex != -1)
         {
-            var child:UIComponent =
-                UIComponent(getChildAt(selectedIndex));
+            var child:Container =
+                Container(getChildAt(selectedIndex));

             var newWidth:Number = w;
             var newHeight:Number = h;
@@ -973,7 +968,7 @@
         // Remember which child has an overlay, so that we don't inadvertently
         // create an overlay on one child and later try to remove the overlay
         // of another child. (bug 100731)
-        overlayChild = (selectedChild as UIComponent);
+        overlayChild = selectedChild;
         if (!overlayChild)
             return;

@@ -981,7 +976,7 @@
         overlayTargetArea = targetArea;

         if (selectedChild &&
-            selectedChild.deferredContentCreated == false)
+            selectedChild.numChildrenCreated == -1)
             // No children have been created
         {
             // Wait for the childrenCreated event before creating the overlay
@@ -1027,11 +1022,11 @@
         {
             for (var i:int = 0; i < numChildren; i++)
             {
-                var containerChild:INavigatorContent =
-                    getChildAt(i) as INavigatorContent;
-
-                if (containerChild && containerChild.deferredContentCreated == false)
-                    containerChild.createDeferredContent();
+                var containerChild:Container =
+                    getChildAt(i) as Container;
+
+                if (containerChild && containerChild.numChildrenCreated == -1)
+                    containerChild.createComponentsFromDescriptors();
             }
         }
     }
@@ -1159,10 +1154,10 @@

         // Stop all currently playing effects
         if (lastIndex != -1 && lastIndex < numChildren)
-            UIComponent(getChildAt(lastIndex)).endEffectsStarted();
+            Container(getChildAt(lastIndex)).endEffectsStarted();

         if (_selectedIndex != -1)
-            (selectedChild as UIComponent).endEffectsStarted();
+            selectedChild.endEffectsStarted();

         // Remember the old index.
         lastIndex = _selectedIndex;
@@ -1189,7 +1184,7 @@

         if (lastIndex != -1 && lastIndex < numChildren)
         {
-            var currentChild:UIComponent = UIComponent(getChildAt(lastIndex));
+            var currentChild:Container = Container(getChildAt(lastIndex));

             currentChild.setVisible(false); // Hide the current child

@@ -1237,11 +1232,11 @@

         // Performance optimization: don't call createComponents if we know
         // that createComponents has already been called.
-        if (selectedChild && selectedChild.deferredContentCreated == false)
+        if (selectedChild && selectedChild.numChildrenCreated == -1)
         {
             if (initialized)  // Only listen if the ViewStack has already been initialized.
                 selectedChild.addEventListener(FlexEvent.CREATION_COMPLETE,childCreationCompleteHandler);
-            selectedChild.createDeferredContent();
+            selectedChild.createComponentsFromDescriptors(true);
         }

         // Do the initial measurement/layout pass for the
@@ -1265,7 +1260,6 @@
         event.newIndex = newIndex;
         event.relatedObject = getChildAt(newIndex);
         dispatchEvent(event);
-        dispatchEvent(new Event("navigationChange"));
     }

     //--------------------------------------------------------------------------
@@ -1333,11 +1327,6 @@
             // They are made as they become the selected child.
             uiChild.visible = false;
         }
-        if (child is INavigatorContent)
-        {
-            child.addEventListener("labelChanged", navigatorChildChangedHandler);
-            child.addEventListener("iconChanged", navigatorChildChangedHandler);
-        }

         // If we just created the first child and no selected index has
         // been proposed, then propose this child to be selected.
@@ -1368,12 +1357,6 @@
         var child:DisplayObject = event.relatedObject;
         var index:int = getChildIndex(child);

-        if (child is INavigatorContent)
-        {
-            child.removeEventListener("labelChanged", navigatorChildChangedHandler);
-            child.removeEventListener("iconChanged", navigatorChildChangedHandler);
-        }
-
         // Handle the simple case.
         if (index > selectedIndex)
             return;
@@ -1411,198 +1394,6 @@
             invalidateProperties();
         }
     }
-
-
-    /**
-     *  @private
-     */
-    override public function addChildAt(item:DisplayObject, index:int):DisplayObject
-    {
-        var obj:DisplayObject = super.addChildAt(item, index);
-        internalDispatchEvent(CollectionEventKind.ADD, obj, index);
-        return obj;
-    }
-
-    /**
-     *  @private
-     */
-    override public function removeChildAt(index:int):DisplayObject
-    {
-        var obj:DisplayObject = super.removeChildAt(index);
-        internalDispatchEvent(CollectionEventKind.REMOVE, getItemAt(index), index);
-        return obj;
-    }
-
-    /**
-     *  @private
-     */
-    override public function removeAllChildren():void
-    {
-        super.removeAllChildren();
-        internalDispatchEvent(CollectionEventKind.RESET);
-    }
-
-    //--------------------------------------------------------------------------
-    //
-    //  IList Implementation
-    //  Viewstack implements IList so it can be plugged into a Spark ButtonBar
-    //
-    //--------------------------------------------------------------------------
-
-    /**
-     *  @private
-     *  The IList implementation dispatches change events when
-     *  label or icon properties change.
-     */
-    private function navigatorChildChangedHandler(event:Event):void
-    {
-        var pe:PropertyChangeEvent = new PropertyChangeEvent(PropertyChangeEvent.PROPERTY_CHANGE);
-        pe.source = event.target;
-        pe.property = (event.type == "labelChanged") ? "label" : "icon";
-
-        internalDispatchEvent(CollectionEventKind.UPDATE, pe, getChildIndex(event.target as DisplayObject));
-    }
-
-    /**
-     *  Dispatches a collection event with the specified information.
-     *
-     *  @param kind String indicates what the kind property of the event should be
-     *  @param item Object reference to the item that was added or removed
-     *  @param location int indicating where in the source the item was added.
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 9
-     *  @playerversion AIR 1.1
-     *  @productversion Flex 3
-     */
-    private function internalDispatchEvent(kind:String, item:Object = null, location:int = -1):void
-    {
-        if (hasEventListener(CollectionEvent.COLLECTION_CHANGE))
-        {
-            var event:CollectionEvent =
-                new CollectionEvent(CollectionEvent.COLLECTION_CHANGE);
-            event.kind = kind;
-            event.items.push(item);
-            event.location = location;
-            dispatchEvent(event);
-        }
-
-        // now dispatch a complementary PropertyChangeEvent
-        if (hasEventListener(PropertyChangeEvent.PROPERTY_CHANGE) &&
-           (kind == CollectionEventKind.ADD || kind == CollectionEventKind.REMOVE))
-        {
-            var objEvent:PropertyChangeEvent =
-                new PropertyChangeEvent(PropertyChangeEvent.PROPERTY_CHANGE);
-            objEvent.property = location;
-            if (kind == CollectionEventKind.ADD)
-                objEvent.newValue = item;
-            else
-                objEvent.oldValue = item;
-            dispatchEvent(objEvent);
-        }
-    }
-
-    /**
-     *  @private
-     *  IList implementation of length returns numChildren
-     */
-    public function get length():int
-    {
-    	return numChildren;
-    }
-
-    /**
-     *  @private
-     *  IList implementation of addItem calls addChild
-     */
-    public function addItem(item:Object):void
-    {
-    	addChild(item as DisplayObject);
-    }
-
-    /**
-     *  @private
-     *  IList implementation of addItemAt calls addChildAt
-     */
-    public function addItemAt(item:Object, index:int):void
-    {
-    	addChildAt(item as DisplayObject, index);
-    }
-
-    /**
-     *  @private
-     *  IList implementation of getItemAt calls getChildAt
-     */
-    public function getItemAt(index:int, prefetch:int = 0):Object
-    {
-    	return getChildAt(index);
-    }
-
-    /**
-     *  @private
-     *  IList implementation of getItemIndex calls getChildIndex
-     */
-    public function getItemIndex(item:Object):int
-    {
-    	return getChildIndex(item as DisplayObject);
-    }
-
-    /**
-     *  @private
-     *  IList implementation of itemUpdated doesn't do anything
-     */
-    public function itemUpdated(item:Object, property:Object = null,
-                         oldValue:Object = null,
-                         newValue:Object = null):void
-    {
-
-    }
-
-    /**
-     *  @private
-     *  IList implementation of removeAll calls removeAllChildren
-     */
-    public function removeAll():void
-    {
-    	removeAllChildren();
-    }
-
-    /**
-     *  @private
-     *  IList implementation of removeItemAt calls removeChildAt
-     */
-    public function removeItemAt(index:int):Object
-    {
-        return removeChildAt(index);
-    }
-
-    /**
-     *  @private
-     *  IList implementation of setItemAt removes the old
-     *  child and adds the new
-     */
-    public function setItemAt(item:Object, index:int):Object
-    {
-    	var result:Object = removeChildAt(index);
-    	addChildAt(item as DisplayObject,index);
-    	return result;
-    }
-
-    /**
-     *  @private
-     *  IList implementation of toArray returns array of children
-     */
-    public function toArray():Array
-    {
-        var result:Array = [];
-        for(var i:int =0;i<numChildren;i++)
-        {
-        	result.push(getChildAt(i));
-        }
-        return result;
-    }
-
-
 }

 }


Transferred from the Adobe Open Source Subversion Repository

Revision: 11476
Author:   aharui@adobe.com
Date:     2009-11-05T20:39:26.552363Z

Log Message:
-----------
Viewstack wasn't dispatching events when selectedIndex changed if it started out empty and had a child added later.  It will now dispatch VALUE_COMMIT.  ISelectableList was modified to reflect that VALUE_COMMIT and/or CHANGE can be sent when selectedIndex changes.  ButtonBarBase now listens to both events.

QE Notes: Six ButtonBar bitmaps need regeneration as they will now have the first button selected
Doc Notes: ISelectableList added a new event
Bugs: SDK-23528
Reviewer: Ryan
API Change: Yes
Is noteworthy for integration: No
tests: checkintests mustella/gumbo/components/ButtonBar, mustella/containers/ViewStack.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ISelectableList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ViewStack.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ButtonBarBase.as</path>

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

--- frameworks/projects/mx/src/mx/containers/ViewStack.as
+++ frameworks/projects/mx/src/mx/containers/ViewStack.as
@@ -1347,8 +1347,7 @@
         // been proposed, then propose this child to be selected.
         if (numChildren == 1 && proposedSelectedIndex == -1)
         {
-            proposedSelectedIndex = 0;
-            invalidateProperties();
+            selectedIndex = 0;
         }
         else if (index <= selectedIndex && numChildren > 1 && proposedSelectedIndex == -1)
         {


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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

 package mx.controls
 {


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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


Transferred from the Adobe Open Source Subversion Repository

Revision: 972
Author:   mhorn@adobe.com
Date:     2008-03-27T20:24:16.905716Z

Log Message:
-----------
Minor ASDoc fixes.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/AbstractInvoker.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBase.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/rpc/src/mx/rpc/AbstractService.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/AbstractWebService.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/logging/AbstractTarget.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridBase.as</path>

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

--- frameworks/projects/rpc/src/mx/rpc/AbstractService.as
+++ frameworks/projects/rpc/src/mx/rpc/AbstractService.as
@@ -67,6 +67,11 @@
     //
     //-------------------------------------------------------------------------

+    /**
+     *  Constructor.
+     *
+     *  @param destination The destination of the service.
+     */
     public function AbstractService(destination:String = null)
     {
         super();
@@ -89,7 +94,7 @@
      *  @private
      */
     private var resourceManager:IResourceManager =
-									ResourceManager.getInstance();
+                                    ResourceManager.getInstance();

     //-------------------------------------------------------------------------
     //
@@ -272,8 +277,8 @@
      */
     override flash_proxy function setProperty(name:*, value:*):void
     {
-		var message:String = resourceManager.getString(
-			"rpc", "operationsNotAllowedInService", [ getLocalName(name) ]);
+        var message:String = resourceManager.getString(
+            "rpc", "operationsNotAllowedInService", [ getLocalName(name) ]);
         throw new Error(message);
     }

@@ -355,10 +360,10 @@
     }

     /**
-	 *  Disconnects the service's network connection and removes any pending
-	 *  request responders.
-	 *  This method does not wait for outstanding network operations to complete.
-	 */
+     *  Disconnects the service's network connection and removes any pending
+     *  request responders.
+     *  This method does not wait for outstanding network operations to complete.
+     */
     public function disconnect():void
     {
         asyncRequest.disconnect();


Transferred from the Adobe Open Source Subversion Repository

Revision: 9939
Author:   aharui@adobe.com
Date:     2009-09-02T21:11:43.633128Z

Log Message:
-----------
Resubmit: Panel skin changes per XD spec, and a few other Panel Skin bugs.  Default Panel size changed to match spec.  Panel titles are now single-line and show ellipsis.

QE Notes: Lots of Panel-related bitmap compares will need upgrading
Doc Notes: None
Bugs: SDK-21680, SDK-21671, SDK-21666, SDK-19962, SDK-19959
Reviewer: Ryan
API Change: No
Is noteworthy for integration: No
tests: checkintests mustella/managers/Panel

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/src/WireframeClasses.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/PanelSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/PanelSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/ApplicationSkin.mxml</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/ApplicationSkin.mxml" copyfrom-rev="9892" action="A">/flex/sdk/trunk/frameworks/projects/wireframe/src/spark/skins/wireframe/ApplicationSkin.mxml</path>

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

--- frameworks/projects/wireframe/src/WireframeClasses.as
+++ frameworks/projects/wireframe/src/WireframeClasses.as
@@ -24,6 +24,7 @@
  */
 internal class WireframeClasses
 {
+	import spark.skins.wireframe.ApplicationSkin; ApplicationSkin;
 	import spark.skins.wireframe.ButtonBarFirstButtonSkin; ButtonBarFirstButtonSkin;
 	import spark.skins.wireframe.ButtonBarLastButtonSkin; ButtonBarLastButtonSkin;
 	import spark.skins.wireframe.ButtonBarMiddleButtonSkin; ButtonBarMiddleButtonSkin;


prevent double views

prevent double views

--- frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
+++ frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
@@ -1317,7 +1317,13 @@
                 {
                     var view:IBeadView = new c as IBeadView;
                     if (view)
-                        addBead(view);
+                    {
+                        COMPILE::JS
+                        {
+                            _view = view;
+                        }
+                        addBead(view);
+                    }
                 }
             }
             if (getBeadByType(IBeadController) == null)


Transferred from the Adobe Open Source Subversion Repository

Revision: 17616
Author:   egeorgie@adobe.com
Date:     2010-09-08T20:59:44.959494Z

Log Message:
-----------
Add mobile perf re-layout tests to ComponentCatalog

In this change:
- ComponentCatalog layout tests simulate orientation change re-layout for the SettingsView and BrowseView.
- Added PerfUitl.detailedSampling var, defaults to false.
- Layout manager detailed validateSize() and updateDisplayList() instrumentation when "PerfUtil.detailedSampling" is set to true.
- update the app.xml for the TestRunner

QE notes:  None
Doc notes: None
Bugs: None
Reviewer: Ryan
Tests run: local build
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/utils/PerfUtil.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/tests/performance/mobile/ComponentCatalog/src/ScriptRunner.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/tests/performance/mobile/ComponentCatalog/src/controls/SimpleTextInput.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/tests/performance/mobile/ComponentCatalog/.actionScriptProperties</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/tools/TestRunner/src/TestRunner-app.xml</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/tests/performance/mobile/ComponentCatalog/ComponentCatalog-metrics.xml</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/managers/LayoutManager.as</path>

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

--- frameworks/projects/framework/src/mx/managers/LayoutManager.as
+++ frameworks/projects/framework/src/mx/managers/LayoutManager.as
@@ -652,7 +652,13 @@
         while (obj)
         {
             // trace("LayoutManager calling validateSize() on " + Object(obj));
-
+            CONFIG::performanceInstrumentation
+            {
+                var objToken:int;
+                if (PerfUtil.detailedSampling)
+                    objToken = perfUtil.markStart();
+            }
+
 			if (obj.nestLevel)
 			{
 				currentObject = obj;
@@ -663,7 +669,12 @@
 		            obj.updateCompletePendingFlag = true;
 		        }
 			}
-
+
+            CONFIG::performanceInstrumentation
+            {
+                if (PerfUtil.detailedSampling)
+                    perfUtil.markEnd(".validateSize()", objToken, 2 /*tolerance*/, obj);
+            }
             // trace("LayoutManager validateSize: " + Object(obj) + " " + IFlexDisplayObject(obj).measuredWidth + " " + IFlexDisplayObject(obj).measuredHeight);

             obj = ILayoutManagerClient(invalidateSizeQueue.removeLargest());
@@ -712,7 +723,13 @@
         while (obj)
         {
             // trace("LayoutManager calling validateDisplayList on " + Object(obj) + " " + DisplayObject(obj).width + " " + DisplayObject(obj).height);
-
+            CONFIG::performanceInstrumentation
+            {
+                var objToken:int;
+                if (PerfUtil.detailedSampling)
+                    objToken = perfUtil.markStart();
+            }
+
 			if (obj.nestLevel)
 			{
 				currentObject = obj;
@@ -724,6 +741,12 @@
 	            }
 			}
             // trace("LayoutManager return from validateDisplayList on " + Object(obj) + " " + DisplayObject(obj).width + " " + DisplayObject(obj).height);
+
+            CONFIG::performanceInstrumentation
+            {
+                if (PerfUtil.detailedSampling)
+                    perfUtil.markEnd(".validateDisplayList()", objToken, 2 /*tolerance*/, obj);
+            }

             // Once we start, don't stop.
             obj = ILayoutManagerClient(invalidateDisplayListQueue.removeSmallest());


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

--- frameworks/projects/framework/src/mx/states/SetEventHandler.as
+++ frameworks/projects/framework/src/mx/states/SetEventHandler.as
@@ -1,3 +1,15 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.
+//
+//  AdobePatentID="B770"
+//
+////////////////////////////////////////////////////////////////////////////////

 package mx.states
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 8486
Author:   smgilson@adobe.com
Date:     2009-07-09T18:42:45.734868Z

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

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

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DropDownList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Group.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/PopUpAnchor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ButtonBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/NumericStepper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Slider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/ToggleButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Spinner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/TrackBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/HScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ItemRenderer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Scroller.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/Range.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataGroup.as</path>

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

--- frameworks/projects/spark/src/spark/components/DropDownList.as
+++ frameworks/projects/spark/src/spark/components/DropDownList.as
@@ -132,7 +132,7 @@
  *      the item and closes the drop-down list.

  *

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

  *
  *


def: 5680 if custom preloader is required for buffer anim, load it even if app is already running.

git-svn-id: 3f608e5a9a704dd448217c0a64c508e7f145cfa1@90042 6b8eccd3-e8c5-4e7d-8186-e12b5326b719

--- KDP3/src/ApplicationLoader.as
+++ KDP3/src/ApplicationLoader.as
@@ -140,7 +140,8 @@
 		 * @param e
 		 */
 		protected function loadPreloader(e:Event):void {
-			if (!_isGoing) {
+			// only load custom preloader if app is not yet running or it is required as buffer anim
+			if (!_isGoing || parameters.usePreloaderBufferAnimation=='true') {
 				if (hasEventListener(Event.ADDED_TO_STAGE)) {
 					removeEventListener(Event.ADDED_TO_STAGE, loadPreloader);
 				}
@@ -164,18 +165,18 @@
 					var rqst:URLRequest = new URLRequest(getPath());
 					_ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, clearListeners, false, 0, true);
 					_ldr.contentLoaderInfo.addEventListener(SecurityErrorEvent.SECURITY_ERROR, clearListeners, false, 0, true);
-					_ldr.contentLoaderInfo.addEventListener(Event.INIT, clearListeners, false, 0, true);
 					_ldr.contentLoaderInfo.addEventListener(Event.COMPLETE, onLoadComplete);
 					_ldr.load(rqst, context);
 				}

-
 				stage.addEventListener(Event.RESIZE, centerLoader);
 			}
 		}

 		private function onLoadComplete(event:Event) : void {
 			_ldr.contentLoaderInfo.removeEventListener(Event.COMPLETE, onLoadComplete);
+			clearListeners(null);
+
 			//if the loader registration point is not in the middle, center it
 			if (parameters.centerPreloader && parameters.centerPreloader=='true' && stage && _ldr.content)
 			{
@@ -222,9 +223,11 @@
 		 * @param e error event
 		 */
 		protected function clearListeners(e:Event):void {
+			if (e) {
+				trace("external preloader load failed: " + e.type);
+			}
 			_ldr.contentLoaderInfo.removeEventListener(IOErrorEvent.IO_ERROR, clearListeners, false);
 			_ldr.contentLoaderInfo.removeEventListener(SecurityErrorEvent.SECURITY_ERROR, clearListeners, false);
-			_ldr.contentLoaderInfo.removeEventListener(Event.INIT, clearListeners, false);
 		}

 		/**


adding a connecting line from the deleted first reason to other reasons

--- Arguments/src/components/AgoraMap.as
+++ Arguments/src/components/AgoraMap.as
@@ -240,7 +240,7 @@
 					for each(argumentTypeModel in model.supportingArguments){
 						//get the point one grid before the first reason horizontally.
 						var rspx:int = (argumentTypeModel.reasonModels[0].ygrid - 1) * gridWidth;
-						var rspy:int = argumentTypeModel.reasonModels[0].xgrid * gridWidth + 30;
+						var rspy:int = argumentTypeModel.xgrid * gridWidth + 30;
 						//get the point in front of the last reason
 						var rfpy:int = layoutController.getBottomReason(argumentTypeModel).xgrid * gridWidth + 30;


Transferred from the Adobe Open Source Subversion Repository

Revision: 12883
Author:   dsubrama@adobe.com
Date:     2009-12-12T23:53:50.782255Z

Log Message:
-----------
Remove the skin classes from the halo theme project to avoid redundancy with the airframework/framework swcs.

QE notes: No
Doc notes: No
Bugs: SDK-24293
Reviewer: Glenn
Tests run: Checkintests, smattering of Halo and AIR mustella tests
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="dir" action="D">/flex/sdk/trunk/frameworks/projects/halo/assets</path>
<path kind="dir" action="D">/flex/sdk/trunk/frameworks/projects/halo/src/mx/skins</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/WindowBackground.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/halo/src/HaloClasses.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/halo/build.xml</path>

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


Added current count using dots beneath numeric counter for total count

--- swfcat.as
+++ swfcat.as
@@ -48,8 +48,10 @@
         /* Badge with a client counter */
         [Embed(source="badge_con_counter.png")]
         private var BadgeImage:Class;
-        private var client_count_tf:TextField;
-        private var client_count_fmt:TextFormat;
+        private var tot_client_count_tf:TextField;
+        private var tot_client_count_fmt:TextFormat;
+        private var cur_client_count_tf:TextField;
+        private var cur_client_count_fmt:TextFormat;

         public function puts(s:String):void
         {
@@ -59,10 +61,16 @@

         public function update_client_count():void
         {
+            /* Update total client count. */
             if (String(total_proxy_pairs).length == 1)
-                client_count_tf.text = "0" + String(total_proxy_pairs);
+                tot_client_count_tf.text = "0" + String(total_proxy_pairs);
             else
-                client_count_tf.text = String(total_proxy_pairs);
+                tot_client_count_tf.text = String(total_proxy_pairs);
+
+            /* Update current client count. */
+            cur_client_count_tf.text = "";
+            for(var i:Number=0; i<num_proxy_pairs; i++)
+                cur_client_count_tf.appendText(".");;
         }

         public function swfcat()
@@ -79,19 +87,34 @@
             output_text.textColor = 0x44cc44;

             /* Setup client counter for badge. */
-            client_count_fmt = new TextFormat();
-            client_count_fmt.color = 0xFFFFFF;
-            client_count_fmt.align = "center";
-            client_count_fmt.font = "courier-new";
-            client_count_fmt.bold = true;
-            client_count_fmt.size = 10;
-            client_count_tf = new TextField();
-            client_count_tf.width = 20;
-            client_count_tf.height = 17;
-            client_count_tf.background = false;
-            client_count_tf.defaultTextFormat = client_count_fmt;
-            client_count_tf.x=47;
-            client_count_tf.y=3;
+            tot_client_count_fmt = new TextFormat();
+            tot_client_count_fmt.color = 0xFFFFFF;
+            tot_client_count_fmt.align = "center";
+            tot_client_count_fmt.font = "courier-new";
+            tot_client_count_fmt.bold = true;
+            tot_client_count_fmt.size = 10;
+            tot_client_count_tf = new TextField();
+            tot_client_count_tf.width = 20;
+            tot_client_count_tf.height = 17;
+            tot_client_count_tf.background = false;
+            tot_client_count_tf.defaultTextFormat = tot_client_count_fmt;
+            tot_client_count_tf.x=47;
+            tot_client_count_tf.y=0;
+
+            cur_client_count_fmt = new TextFormat();
+            cur_client_count_fmt.color = 0xFFFFFF;
+            cur_client_count_fmt.align = "center";
+            cur_client_count_fmt.font = "courier-new";
+            cur_client_count_fmt.bold = true;
+            cur_client_count_fmt.size = 10;
+            cur_client_count_tf = new TextField();
+            cur_client_count_tf.width = 20;
+            cur_client_count_tf.height = 17;
+            cur_client_count_tf.background = false;
+            cur_client_count_tf.defaultTextFormat = cur_client_count_fmt;
+            cur_client_count_tf.x=47;
+            cur_client_count_tf.y=6;
+

             /* Update the client counter on badge. */
             update_client_count();
@@ -113,7 +136,8 @@
                 addChild(new BadgeImage());
                 /* Tried unsuccessfully to add counter to badge. */
                 /* For now, need two addChilds :( */
-                addChild(client_count_tf);
+                addChild(tot_client_count_tf);
+                addChild(cur_client_count_tf);
             }

             fac_spec = this.loaderInfo.parameters["facilitator"];
@@ -183,15 +207,19 @@

             num_proxy_pairs++;
             total_proxy_pairs++;
+            /* Update the client count on the badge. */
+            update_client_count();
+
             proxy_pair = new ProxyPair(this, client_addr, DEFAULT_TOR_ADDR);
             proxy_pair.addEventListener(Event.COMPLETE, function(e:Event):void {
                 proxy_pair.log("Complete.");
+
                 num_proxy_pairs--;
+                /* Update the client count on the badge. */
+                update_client_count();
             });
             proxy_pair.connect();

-            /* Update the client count on the badge. */
-            update_client_count();
         }

         /* Parse an address in the form "host:port". Returns an Object with


Minor cleanup.

Minor cleanup.

--- swfcat.as
+++ swfcat.as
@@ -29,8 +29,8 @@
             port: 9002
         };

-        /* Default Tor client to use in case of RTMFP connection */
-        private const DEFAULT_TOR_CLIENT_ADDR:Object = {
+        /* Local Tor client to use in case of RTMFP connection. */
+        private const LOCAL_TOR_CLIENT_ADDR:Object = {
             host: "127.0.0.1",
             port: 9002
         };
@@ -44,8 +44,6 @@
         public const RATE_LIMIT:Number = undefined;
         // Seconds.
         private const RATE_LIMIT_HISTORY:Number = 5.0;
-
-        private var proxy_mode:Boolean;

         /* TextField for debug output. */
         private var output_text:TextField;
@@ -103,15 +101,13 @@
             else
                 addChild(badge);

-            proxy_mode = (this.loaderInfo.parameters["proxy"] != null);
-
             fac_addr = get_param_addr("facilitator", DEFAULT_FACILITATOR_ADDR);
             if (!fac_addr) {
                 puts("Error: Facilitator spec must be in the form \"host:port\".");
                 return;
             }

-            if (proxy_mode)
+            if (this.loaderInfo.parameter["proxy"])
                 proxy_main();
             else
                 client_main();
@@ -228,7 +224,7 @@
             proxy_pair = new ProxyPair(this, rs, function ():void {
                 /* Do nothing; already connected. */
             }, s_t, function ():void {
-                s_t.connect(DEFAULT_TOR_CLIENT_ADDR.host, DEFAULT_TOR_CLIENT_ADDR.port);
+                s_t.connect(LOCAL_TOR_CLIENT_ADDR.host, LOCAL_TOR_CLIENT_ADDR.port);
             });
             proxy_pair.connect();
         }


Removed node/edit tooltips at 1/4X zoom

Removed node/edit tooltips at 1/4X zoom

--- src/Displays/DModule.as
+++ src/Displays/DModule.as
@@ -175,12 +175,14 @@
 		}

 		public function descriptionAt(fp:FlxPoint):HighlightFormat {
-			for each (var displayNode:DNode in displayNodes)
-				if (displayNode.overlapsPoint(fp))
-					return HighlightFormat.plain(displayNode.node.getLabel());
-
-			if (editButton && editButton.moused)
-				return new HighlightFormat("{}", ColorText.singleVec(new ColorText(U.CONFIG_COLOR, "Edit")));
+			if (U.zoom >= 0.5) {
+				for each (var displayNode:DNode in displayNodes)
+					if (displayNode.overlapsPoint(fp))
+						return HighlightFormat.plain(displayNode.node.getLabel());
+
+				if (editButton && editButton.moused)
+					return new HighlightFormat("{}", ColorText.singleVec(new ColorText(U.CONFIG_COLOR, "Edit")));
+			}

 			var format:HighlightFormat = module.getHighlitDescription();
 			if (format) {


added getHexColors() and updated typings

--- WeaveJS/src/weavejs/util/ColorRamp.as
+++ WeaveJS/src/weavejs/util/ColorRamp.as
@@ -99,7 +99,7 @@
 		 */
 		private var _colorNodes:Array = [];

-		public function getColors():Array
+		public function getColors():Array/*/<number>/*/
 		{
 			validate();

@@ -108,6 +108,14 @@
 			for(var i:int = 0; i < _colorNodes.length; i++)
 				colors.push((_colorNodes[i] as ColorNode).color);

+			return colors;
+		}
+
+		public function getHexColors():Array/*/<string>/*/
+		{
+			var colors:Array = getColors();
+			for (var i:int = 0; i < colors.length; i++)
+				colors[i] = StandardLib.getHexColor(colors[i]);
 			return colors;
 		}

@@ -222,7 +230,7 @@
 		/**
 		 * @return An Object with "name", "tags", and "colors" properties.
 		 */
-		public static function getColorRampByName(rampName:String):Object
+		public static function getColorRampByName(rampName:String):/*/{name:string, tags:string, colors:number[]}/*/Object
 		{
 			for each (var ramp:Object in allColorRamps)
 			if (ramp.name === rampName)
@@ -233,7 +241,7 @@
 		/**
 		 * @return An Object with "name", "tags", and "colors" properties.
 		 */
-		public static function findMatchingColorRamp(ramp:ColorRamp):Object
+		public static function findMatchingColorRamp(ramp:ColorRamp):/*/{name:string, tags:string, colors:number[]}/*/Object
 		{
 			var colors:Array = ramp.getColors();
 			for each (var obj:Object in allColorRamps)
@@ -242,7 +250,7 @@
 			return null;
 		}

-		public static const allColorRamps:Array = [
+		public static const allColorRamps:Array/*/<{name:string, tags:string, colors:number[]}>/*/ = [
 			{name: "Campfire", tags: "OIC,aesthetic", colors: [0x660000,0xFF0000,0xFFFF00]},
 			{name: "Pink Rose", tags: "OIC,aesthetic", colors: [0xffc7fa,0xfa0094,0x660066]},
 			{name: "Linear Gray", tags: "OIC,visualization,colorblind-safe,single-hue", colors: [0x000000,0xffffff]},


Removed small code-smell in Injector

Removed small code-smell in Injector

--- src/org/swiftsuspenders/Injector.as
+++ src/org/swiftsuspenders/Injector.as
@@ -51,7 +51,7 @@

 		public function map(dependency : Class) : InjectionRule
 		{
-			return _mappings[dependency] || createRule(dependency);
+			return _mappings[dependency] ||= createRule(dependency);
 		}

 		public function unmap(dependency : Class) : void
@@ -215,7 +215,7 @@
 		//----------------------         Private / Protected Methods        ----------------------//
 		private function createRule(requestType : Class) : InjectionRule
 		{
-			return (_mappings[requestType] = new InjectionRule(this, requestType));
+			return new InjectionRule(this, requestType);
 		}
 	}
 }


Fixes bugs with the injector's handling of default providers

--- src/org/swiftsuspenders/Injector.as
+++ src/org/swiftsuspenders/Injector.as
@@ -12,6 +12,7 @@
 	import flash.events.EventDispatcher;
 	import flash.system.ApplicationDomain;
 	import flash.utils.Dictionary;
+	import flash.utils.getDefinitionByName;
 	import flash.utils.getQualifiedClassName;

 	import org.swiftsuspenders.dependencyproviders.ClassProvider;
@@ -350,7 +351,7 @@
 		public function getInstance(type : Class, name : String = '', targetType : Class = null) : *
 		{
 			const mappingId : String = getQualifiedClassName(type) + '|' + name;
-			const provider : DependencyProvider = getProvider(mappingId);
+			const provider : DependencyProvider = getProvider(mappingId, false);
 			if (provider)
 			{
 				const ctor : ConstructorInjectionPoint = _classDescriptor.getDescription(type).ctor;
@@ -511,7 +512,8 @@
 			return instance;
 		}

-		SsInternal function getProvider(mappingId : String) : DependencyProvider
+		SsInternal function getProvider(
+			mappingId : String, fallbackToDefault : Boolean = true) : DependencyProvider
 		{
 			var softProvider : DependencyProvider;
 			var injector : Injector = this;
@@ -536,7 +538,11 @@
 				}
 				injector = injector.parentInjector;
 			}
-			return softProvider || getDefaultProvider(mappingId);
+			if (softProvider)
+			{
+				return softProvider;
+			}
+			return fallbackToDefault ? getDefaultProvider(mappingId) : null;
 		}

 		SsInternal function getDefaultProvider(mappingId : String) : DependencyProvider
@@ -552,7 +558,22 @@
 			{
 				return null;
 			}
-			const type : Class = Class(_applicationDomain.getDefinition(parts.pop()));
+			const typeName : String = parts.pop();
+			try
+			{
+				const definition : Object = _applicationDomain.hasDefinition(typeName)
+					? _applicationDomain.getDefinition(typeName)
+					: getDefinitionByName(typeName);
+			}
+			catch (e : Error)
+			{
+				return null;
+			}
+			if (!definition || !(definition is Class))
+			{
+				return null;
+			}
+			const type : Class = Class(definition);
 			var description : TypeDescription = _classDescriptor.getDescription(type);
 			if (!description.ctor)
 			{


added weave.ui.annotation to list of default packages.

Change-Id: I2668b3be54b13c6f703c102ab195f898b092c907

--- WeaveUI/src/_InitializeWeaveUI.as
+++ WeaveUI/src/_InitializeWeaveUI.as
@@ -178,6 +178,7 @@
 			WeaveXMLDecoder.includePackages(
 				"weave.editors",
 				"weave.ui",
+				"weave.ui.annotation",
 				"weave.utils",
 				"weave.visualization",
 				"weave.visualization.tools",


Transferred from the Adobe Open Source Subversion Repository

Revision: 3925
Author:   jimurphy@adobe.com
Date:     2008-10-28T15:28:25.006190Z

Log Message:
-----------
Merged gumbo_alpha revisions 3857-3860,3870,3872,3874-3876,3881,3884,3886,3889,3891,3893,3895,3908,3912 -> trunk

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxRotateEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/TransformOffsets.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxFadeEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/CubicBezierSegment.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/gumbo_alpha/frameworks/projects/flex4/src/mx/skins/spark/FxFocusSkin.as" copyfrom-rev="3895" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/skins/spark/FxFocusSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxVSliderExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/LineSegment.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/DataGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxFadeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/FxFade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxListExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxMoveEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/PathSegment.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/Group.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/CompoundTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/TextGraphic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/textLayout_conversion.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxAnimateColorEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/textLayout_core.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxAnimateEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxCheckBoxExample.mxml</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxNumericStepper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxAnimateInstance.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/gumbo_alpha/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/DataGroupExample.mxml" copyfrom-rev="3895" action="A">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/DataGroupExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/FxAnimateColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/Path.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flash/css/StyleDeclaration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxButton.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/gumbo_alpha/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/GroupExample.mxml" copyfrom-rev="3895" action="A">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/GroupExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxSpinner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/QuadraticBezierSegment.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/flex4/src/mx/graphics/graphicsClasses/GraphicElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxNumericStepperExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/effects/examples/FxResizeEffectExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxRotateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/FxRotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/Flex4Classes.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxButtonExample.mxml</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/flex4/src/mx/effects/FxResize.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxToggleButtonExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxSpinnerExample.mxml</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/mx/effects/PropertyValuesHolder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxMoveInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/textLayout_edit.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/TextViewExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/FxMove.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StyleModule.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/asdoc/en_US/mx/components/examples/FxHSliderExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/Animation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/utils/MatrixUtil.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StyleDef.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/AdvancedLayoutFeatures.as</path>

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

--- frameworks/projects/framework/src/mx/geom/TransformOffsets.as
+++ frameworks/projects/framework/src/mx/geom/TransformOffsets.as
@@ -65,7 +65,7 @@

     /**
      * @private
-     * general storage for all of ur flags.
+     * general storage for all of our flags.
      */
     private var _flags:uint =  0;

@@ -76,7 +76,7 @@
 	//----------------------------------------------------------------------------

 	/**
-	 * the  x value of the transform
+	 * the  x value added to the transform
 	 */
 	public function set x(value:Number):void
 	{
@@ -94,7 +94,7 @@
 	}

 	/**
-	 * the y value of the transform
+	 * the y value added to the transform
 	 */
 	public function set y(value:Number):void
 	{
@@ -113,7 +113,7 @@
 	}

 	/**
-	 * the z value of the transform
+	 * the z value added to the transform
 	 */
 	public function set z(value:Number):void
 	{
@@ -135,7 +135,7 @@

 	/**
-	 * the rotationX, in degrees, of the transform
+	 * the rotationX, in degrees, added to the transform
 	 */
 	public function set rotationX(value:Number):void
 	{
@@ -154,7 +154,7 @@
 	}

 	/**
-	 * the rotationY, in degrees, of the transform
+	 * the rotationY, in degrees, added to the transform
 	 */
 	public function set rotationY(value:Number):void
 	{
@@ -173,7 +173,7 @@
 	}

 	/**
-	 * the rotationZ, in degrees, of the transform
+	 * the rotationZ, in degrees, added to the transform
 	 */
 	public function set rotationZ(value:Number):void
 	{
@@ -195,7 +195,7 @@

 	/**
-	 * the scaleX of the transform
+	 * the multiplier applied to the scaleX of the transform.
 	 */
 	public function set scaleX(value:Number):void
 	{
@@ -214,7 +214,7 @@
 	}

 	/**
-	 * the scaleY of the transform
+	 * the multiplier applied to the scaleY of the transform.
 	 */
 	public function set scaleY(value:Number):void
 	{
@@ -234,7 +234,7 @@

 	/**
-	 * the scaleZ of the transform
+	 * the multiplier applied to the scaleZ of the transform.
 	 */
 	public function set scaleZ(value:Number):void
 	{
@@ -310,12 +310,20 @@
 		}
 	}

+	/**
+	 * A utility method to update the rotation and scale of the transform while keeping a particular point, specified in the component's own coordinate space,
+	 * fixed in the parent's coordinate space.  This function will assign the rotation and scale values provided, then update the x/y/z properties
+	 * as necessary to keep tx/ty/tz fixed.
+	 * @param rx,ry,rz the new values for the rotation of the transform
+	 * @param sx,sy,sz the new values for the scale of the transform
+	 * @param tx,ty,tz the point, in the component's own coordinates, to keep fixed relative to its parent.
+	 */
 	public function transformAround(rx:Number,ry:Number,rz:Number,sx:Number,sy:Number,sz:Number,tx:Number,ty:Number,tz:Number):void
 	{
 		if(owner != null)
 		{
 			var is3D:Boolean = ((!isNaN(rx) && rx != 0) || (!isNaN(ry) && ry != 0) || (!isNaN(sz) && sz != 1));
-			var token:* = owner.prepareForTransformCenterAdjustment(false,is3D,tx,ty,tz);
+			var token:Object = owner.prepareForTransformCenterAdjustment(false,is3D,tx,ty,tz);


Transferred from the Adobe Open Source Subversion Repository

Revision: 17331
Author:   jasonsj@adobe.com
Date:     2010-08-16T17:37:24.374535Z

Log Message:
-----------
Added DiscouragedForProfile metadata for use with FB mobile projects.

QE notes: DiscouragedForProfile features should now be visible in FB
Doc notes: ASDoc content omitted for DiscouragedForProfile where the boilerplate comment is desired
Bugs:
Reviewer: gruehle
Tests run: checkintests
Is noteworthy for integration: Yes

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/NumericStepper.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/VSlider.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/ComboBox.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/TitleWindow.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/ToggleButton.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Spinner.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/DataGrid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/BorderContainer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/FormHeading.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/VideoPlayer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/RichEditableText.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/DropDownList.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/RichText.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/HSlider.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/TabBar.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/VideoDisplay.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Panel.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/ButtonBar.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Form.as</path>

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

--- frameworks/projects/spark/src/spark/components/FormHeading.as
+++ frameworks/projects/spark/src/spark/components/FormHeading.as
@@ -42,6 +42,18 @@
  *  @productversion Flex 4
  */
 [Style(name="backgroundColor", type="uint", format="Color", inherit="no", theme="spark")]
+
+//--------------------------------------
+//  Other metadata
+//--------------------------------------
+
+/**
+ * Because this component does not define a skin for the mobile theme, Adobe
+ * recommends that you not use it in a mobile application. Alternatively, you
+ * can define your own mobile skin for the component. For more information,
+ * see Spark Skinning.
+ */
+[DiscouragedForProfile("mobileDevice")]

 /**
  * A simple form item component which contains a label. It is used to


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

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


Transferred from the Adobe Open Source Subversion Repository

Revision: 10908
Author:   cframpto@adobe.com
Date:     2009-10-07T15:49:10.995440Z

Log Message:
-----------
RadioButton bugs.  Make RadioButton value bindable.  Handle the case where the radio button group sets the selectedValue before the radio buttons have been initialized and inserted into the radio button group.

QE notes:
Doc notes:
Bugs: SDK-23333, SDK-23098
Reviewer: Corey
Tests run: checkintests
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RadioButton.as</path>

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

--- frameworks/projects/spark/src/spark/components/RadioButton.as
+++ frameworks/projects/spark/src/spark/components/RadioButton.as
@@ -395,6 +395,8 @@
      */
     private var _value:Object;

+    [Bindable("change")]
+    [Bindable("valueChanged")]
     [Inspectable(category="General", defaultValue="")]

     /**


Transferred from the Adobe Open Source Subversion Repository

Revision: 12651
Author:   smgilson@adobe.com
Date:     2009-12-08T15:04:12.651288Z

Log Message:
-----------
ASDoc prep for L10N, and add a few new examples

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

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/VolumeBar.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/examples/VideoDisplayExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoDisplay.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/ScrubBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/DynamicStreamingVideoItem.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/examples/VideoPlayerExample.mxml</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/mediaClasses/examples/DynamicStreamingVideoSourceExample.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/DynamicStreamingVideoSource.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/mediaClasses/MuteButton.as</path>
<path kind="dir" action="A">/flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/mediaClasses/examples</path>
<path kind="dir" action="A">/flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/mediaClasses</path>

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

--- frameworks/projects/spark/src/spark/components/VideoPlayer.as
+++ frameworks/projects/spark/src/spark/components/VideoPlayer.as
@@ -456,6 +456,8 @@
  *    typographicCase="default"
  *  />
  *  </pre>
+ *
+ *  @includeExample examples/VideoPlayerExample.mxml
  *
  *  @langversion 3.0
  *  @playerversion Flash 10


fix coding style

fix coding style

--- src/aerys/minko/scene/node/Scene.as
+++ src/aerys/minko/scene/node/Scene.as
@@ -34,14 +34,14 @@

 		private var _numTriangles	: uint;

-		private var _enterFrame			: Signal;
-		private var _renderingBegin		: Signal;
-		private var _renderingEnd		: Signal;
-		private var _exitFrame			: Signal;
+		private var _enterFrame		: Signal;
+		private var _renderingBegin	: Signal;
+		private var _renderingEnd	: Signal;
+		private var _exitFrame		: Signal;

 		private var _assets				: AssetsLibrary;

-		public function get assets():AssetsLibrary
+		public function get assets() : AssetsLibrary
 		{
 			return _assets;
 		}


Transferred from the Adobe Open Source Subversion Repository

Revision: 20014
Author:   smgilson@adobe.com
Date:     2011-01-31T16:26:42.605584Z

Log Message:
-----------
Add ASDoc comment about method params added for Flex 4

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

Modified Paths:
--------------
/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/binding/utils/BindingUtils.as

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

--- frameworks/projects/framework/src/mx/binding/utils/BindingUtils.as
+++ frameworks/projects/framework/src/mx/binding/utils/BindingUtils.as
@@ -89,10 +89,11 @@
      *  Typically these tags are used to indicate fine-grained value changes,
      *  such as modifications in a text field prior to confirmation.
      *
-     *  @param useWeakReference (default = false) Determines whether
+     *  @param useWeakReference Determines whether
      *  the reference to the host is strong or weak. A strong
      *  reference (the default) prevents the host from being
      *  garbage-collected. A weak reference does not.
+     *  Added for Flex 4.
      *
      *  @return A ChangeWatcher instance, if at least one property name has
      *  been specified to the chain argument; null otherwise.
@@ -152,10 +153,11 @@
      *  called only on committing change events.
      *  See the bindProperty() method for more information.
      *
-     *  @param useWeakReference (default = false) Determines whether
+     *  @param useWeakReference Determines whether
      *  the reference to the host is strong or weak. A strong
      *  reference (the default) prevents the host from being
      *  garbage-collected. A weak reference does not.
+     *  Added for Flex 4.
      *
      *  @return A ChangeWatcher instance, if at least one property name
      *  has been  specified to the chain argument; null otherwise.


Transferred from the Adobe Open Source Subversion Repository

Revision: 7113
Author:   gosmith@adobe.com
Date:     2009-05-20T05:16:39.956387Z

Log Message:
-----------
Added [RichTextContent] metadata to the 'content' property of RichText, RichEditableText, and TextArea.

This metadata tells the MXML compiler to disable some of its default interpreation of the value specified for the 'content' property. Normally, for properties of type Object, it assumes that things looking like numbers are numbers and things looking like arrays are arrays. But <content>1</content> should generate code to set the content to  the String "1", not the int 1, and <content>[1]</content> hould set it to the String "[1]", not the Array [ 1 ]. However, {...} continues to be interpreted as a databinding expression, and @Resource(...), @Embed(...), etc. as compiler directives.

Similar metadata on the mxmlChildren property in TLF's FlowGroupElement and SpanElement classes causes the same rules to apply within <p>, <span>, etc.

QE Notes: None
Doc Notes: None
Bugs: Part of SDK-17748 and SDK-18877
Reviewer: Peter

Modified Paths:
--------------
<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/flex4/src/spark/components/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/primitives/RichText.as</path>

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

--- frameworks/projects/spark/src/spark/components/RichEditableText.as
+++ frameworks/projects/spark/src/spark/components/RichEditableText.as
@@ -838,6 +838,23 @@
     private var contentChanged:Boolean = false;

     /**
+     *  @private
+     *  This metadata tells the MXML compiler to disable some of its default
+     *  interpreation of the value specified for the 'content' property.
+     *  Normally, for properties of type Object, it assumes that things
+     *  looking like numbers are numbers and things looking like arrays
+     *  are arrays. But <content>1</content> should generate code to set the
+     *  content to  the String "1", not the int 1, and <content>[1]</content>
+     *  should set it to the String "[1]", not the Array [ 1 ].
+     *  However, {...} continues to be interpreted as a databinding
+     *  expression, and @Resource(...), @Embed(...), etc.
+     *  as compiler directives.
+     *  Similar metadata on TLF classes causes the same rules to apply
+     *  within <p>, <span>, etc.
+     */
+    [RichTextContent]
+
+    /**
      *  Documentation is not currently available.
      *
      *  @langversion 3.0


Transferred from the Adobe Open Source Subversion Repository

Revision: 10919
Author:   gosmith@adobe.com
Date:     2009-10-07T22:15:33.759089Z

Log Message:
-----------
Integrated TLF Build 517.

This isn't the latest TLF build, but it is the one that introduced a significant API change, so I want to take it before taking other TLF changes. The ITextLineCreator interface, with its createTextLine() and recreateTextLine() methods, has been replaced with an ISWFContext interface with a callInContext() method. This required changes in 11 framework classes and in the MXML compiler's autogenerated code for the module factory classes.

The purpose of both the old and the new interface is to support cross-SWF font embedding, by allowing certain FTE calls such as textBlock.createTextLine() to execute in the SWF where the font you're using is embedded.

QE notes: None
Doc notes: None
Bugs: None
Reviewer: Alex should review
Tests run: ant checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/compose/TextFlowLine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IFlexModuleFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RichText.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/compose/IFlowComposer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/mx/core/UIFTETextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/mx/core/FTETextField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_edit/src/flashx/textLayout/container/TextContainerManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/TextFieldFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/CoreClasses.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/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/textLayout/textLayout_core/src/flashx/textLayout/BuildInfo.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/compose/ComposeState.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/ReleaseNotes.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/compose/FlowComposerBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/FlexModuleFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/factory/StringTextLineFactory.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/compose/SimpleCompose.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/elements/FlowLeafElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RichEditableText.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/textLayout/textLayout_core/src/flashx/textLayout/factory/TextLineFactoryBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/tlf.properties</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/textLayout_core/src/flashx/textLayout/factory/TextFlowTextLineFactory.as</path>

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

--- frameworks/projects/framework/src/mx/core/IFlexModuleFactory.as
+++ frameworks/projects/framework/src/mx/core/IFlexModuleFactory.as
@@ -78,13 +78,14 @@
      *  @return Whatever the function returns, if anything.
      *
      *  @see Function.apply
-
+	 *
      *  @langversion 3.0
      *  @playerversion Flash 10
      *  @playerversion AIR 1.5
      *  @productversion Flex 3
      */
-    function callInContext(fn:Function, thisArg:*, argArray:*, returns:Boolean=true):*;
+    function callInContext(fn:Function, thisArg:Object,
+						   argArray:Array, returns:Boolean = true):*;

     /**
      *  A factory method that requests


Transferred from the Adobe Open Source Subversion Repository

Revision: 10633
Author:   dloverin@adobe.com
Date:     2009-09-28T13:24:30.559033Z

Log Message:
-----------
Use styleManager instance instead of StyleManager singleton (framework and compiler generated code)

Modified compiler generated style code for the FlexInit class. The style related changes are only available with the -keep option. AST generation is coming later.

Only the framework project is changed here. The other projects are will be changed soon.

QE notes: None.
Doc notes: None.
Bugs:
Reviewer: Alex and Paul
Tests run: checkintests, all Mustella tests(no new failures)
Is noteworthy for integration: no.

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ButtonBarButtonSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/HaloBorder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/accordionClasses/AccordionHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/utilityClasses/CanvasLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateChooser.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/dragClasses/DragProxy.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ButtonSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/configuration_en.properties</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ProgressIndeterminateSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/DateChooserMonthArrowSkin.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/skins/halo/SliderThumbSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DateField.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/DividedBox.as</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/skins/halo/ScrollThumbSkin.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/styles/IStyleModule.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Form.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/IStyleManager2.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/styles/StyleManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/DataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/gen/ClassDefLib.vm</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ProgressTrackSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/TitleBackground.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/NumericStepperDownSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/PopUpButtonSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/ProgrammaticSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/TabSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/textClasses/TextRange.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/LayoutContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/AccordionHeaderSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/CheckBoxIcon.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/NumericStepperUpSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/RadioButtonIcon.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/states/SetStyle.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ComboBoxArrowSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeaderBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/FormItem.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/dataGridClasses/DataGridHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/MenuBarBackgroundSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ProgressBarSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/SWFLoader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/BusyCursor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/Request.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/MenuBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Tree.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/containers/Accordion.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/SliderTrackSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StyleModule.vm</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/skins/halo/ScrollTrackSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/TileBase.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/skins/halo/DataGridHeaderBackgroundSkin.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/CursorManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/modules/ModuleManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/effectClasses/SetStyleActionInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/css/StyleDef.vm</path>

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

--- frameworks/projects/mx/src/mx/controls/textClasses/TextRange.as
+++ frameworks/projects/mx/src/mx/controls/textClasses/TextRange.as
@@ -258,7 +258,7 @@
 	public function set color(value:Object):void
 	{
 		var tf:TextFormat = getTextFormat();
-		var colorNumber:uint = StyleManager.getColorName(value);
+		var colorNumber:uint = owner.styleManager.getColorName(value);
 		if (colorNumber != StyleManager.NOT_A_COLOR)
 			value = colorNumber;
 		else


Transferred from the Adobe Open Source Subversion Repository

Revision: 1083
Author:   shodgson@adobe.com
Date:     2008-04-02T23:33:46.996974Z

Log Message:
-----------
Merge 1082 from branches/3.0.x to trunk.

Modified Paths:
--------------
<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/rpc/src/mx/messaging/ChannelSet.as</path>

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

--- frameworks/projects/rpc/src/mx/messaging/config/ServerConfig.as
+++ frameworks/projects/rpc/src/mx/messaging/config/ServerConfig.as
@@ -628,7 +628,7 @@
         else
         {
 			channelIds = getChannelIds(destinationConfig);
-			clustered = (destinationConfig.properties.network.cluster.length() > 0) ? true : false;
+			clustered = (destinationConfig.properties.network.cluster.length() > 0) ? true : false;
         }

         var channelSetId:String = channelIds.join(",") + ":" + clustered;
@@ -640,6 +640,10 @@
         else
         {
             var channelSet:ChannelSet = new ChannelSet(channelIds, clustered);
+            if (clustered)
+            {
+                channelSet.initialDestinationId = destinationId;
+            }
             _channelSets[channelSetId] = channelSet;
             return channelSet;
         }