Transferred from the Adobe Open Source Subversion Repository

Revision: 2743
Author:   jimurphy@adobe.com
Date:     2008-08-05T19:28:29.575474Z

Log Message:
-----------
Merged 3.0.x revisions [2649,2652,2670,2694,2699-2700,2713,2721-2723,2729,2731-2732] -> trunk

Modified Paths:
--------------
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IFocusManagerBridge.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/oem/Configuration.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/swc/SwcLibrary.java</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/i18n/I18nUtils.java</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/modules/compiler/src/java/flex2/tools_en.properties</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ToolTipManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/ISystemManager2.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/Compc.java</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/SwcChecksums.java" copyfrom-rev="2732" action="A">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/SwcChecksums.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/WindowedSystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Alert.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/CalendarLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/xml/XMLEncoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/CompilerSwcContext.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemManagerProxy.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/ShowAlertRequest.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/SystemChildrenList.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/modules/compiler/src/java/flex2/tools/Mxmlc.java</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/events/SandboxBridgeRequest.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/SWFLoader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/tools/oem/Application.java</path>

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

--- frameworks/projects/framework/src/mx/managers/FocusManager.as
+++ frameworks/projects/framework/src/mx/managers/FocusManager.as
@@ -27,9 +27,9 @@
 import flash.ui.Keyboard;
 import flash.utils.Dictionary;

-import mx.controls.Alert;
 import mx.core.Application;
 import mx.core.FlexSprite;
+import mx.core.IApplicationLoader;
 import mx.core.IButton;
 import mx.core.IChildList;
 import mx.core.IRawChildrenContainer;
@@ -38,11 +38,8 @@
 import mx.events.FlexEvent;
 import mx.events.FocusRequest;
 import mx.events.SandboxBridgeEvent;
-import mx.events.ShowAlertRequest;
-import mx.managers.IFocusManagerBridge;
 import mx.managers.ISystemManager2;
 import mx.sandbox.ISandboxBridgeGroup;
-import mx.sandbox.ISandboxBridgeProvider;
 import mx.utils.DisplayUtil;

 use namespace mx_internal;
@@ -781,7 +778,7 @@
 	        while (o)
 	        {
 	            if ((o is IFocusManagerComponent && IFocusManagerComponent(o).focusEnabled) ||
-	            	 o is IFocusManagerBridge)
+	            	 o is IApplicationLoader)
 	                return o;

 	            o = o.parent;
@@ -1077,8 +1074,8 @@
 	 */
 	private function hasFocusManagerBridge(o:DisplayObject):Boolean
 	{
-		if (o is IFocusManagerBridge &&
-			IFocusManagerBridge(o).sandboxBridge != null)
+		if (o is IApplicationLoader &&
+			IApplicationLoader(o).sandboxBridge != null)
 			return true;

 		return false;
@@ -1237,7 +1234,7 @@
 		if (o)
 		{
 			// VERSION_SKEW
-			if (o is IFocusManagerBridge && IFocusManagerBridge(o).sandboxBridge)
+			if (o is IApplicationLoader && IApplicationLoader(o).sandboxBridge)
 			{
 				// send message to child swf to move focus.
 				// trace("pass focus from " + this.form.systemManager.loaderInfo.url + " to " + DisplayObject(o).loaderInfo.url);
@@ -1246,7 +1243,7 @@
 	    													false, true,
 	    													shiftKey ? FocusRequest.BOTTOM :
 																	   FocusRequest.TOP);
-				var sandboxBridge:IEventDispatcher = IFocusManagerBridge(o).sandboxBridge;
+				var sandboxBridge:IEventDispatcher = IApplicationLoader(o).sandboxBridge;
 				if (sandboxBridge)
     				focusChanged = !sandboxBridge.dispatchEvent(request);
 			}
@@ -1415,9 +1412,9 @@

 			// if we cross a boundry into a bridged application, then return null so
 			// the target is only processed at the lowest level
-			if (o.parent is IFocusManagerBridge)
+			if (o.parent is IApplicationLoader)
 			{
-				if (IFocusManagerBridge(o.parent).sandboxBridge)
+				if (IApplicationLoader(o.parent).sandboxBridge)
 					return null;
 			}
             o = o.parent;
@@ -1649,8 +1646,6 @@
      */
     private function mouseFocusChangeHandler(event:FocusEvent):void
     {
-    	// TODODJL: This handler doesn't seem to do anything.
-
     	// trace("FocusManager: mouseFocusChangeHandler " + event);
         if (event.relatedObject is TextField)
         {
@@ -1660,7 +1655,8 @@
                 return; // pass it on
             }
         }
-
+
+        event.preventDefault();
     }

     /**
@@ -1939,34 +1935,6 @@
 		fireActivatedFocusManagerEvent(eObj);
 	}

-
-	/**
-	 * @private
-	 *
-	 * Message from a child system manager requesting an alert dialog be
-	 * displayed.
-	 *
-	 * Added here from SystemManager to avoid linking UIComponent into SystemManager.
-	 */
-	private function showAlertRequestHandler(event:Event):void
-	{
-		var eObj:Object = Object(event);
-
-		// go up to the root to display the message
-        var sm:ISystemManager2 = ISystemManager2(form.systemManager);
-		if (sm.sandboxBridgeGroup.parentBridge)
-		{
-			sm.sandboxBridgeGroup.parentBridge.dispatchEvent(event);
-			return;
-		}
-
-		eObj.alertComponent = Alert.show(eObj.text, eObj.title, eObj.flags, eObj.parent,
-				   					eObj.closeHandler, eObj.iconClass, eObj.defaultButtonFlag);
-	}
-
-
-
-
 	/**
 	 * This is called on the top-level focus manager and the parent focus
 	 * manager for each new bridge of focusable content created.
@@ -2000,8 +1968,6 @@
    		bridge.addEventListener(FocusRequest.MOVE, focusRequestMoveHandler);
    		bridge.addEventListener(SandboxBridgeEvent.ACTIVATED_FOCUS_MANAGER,
    				    		    bridgeEventActivateHandler);
-		bridge.addEventListener(ShowAlertRequest.SHOW, showAlertRequestHandler, false);
-
 	}

 	/**
@@ -2028,8 +1994,6 @@
    		bridge.removeEventListener(FocusRequest.MOVE, focusRequestMoveHandler);
    		bridge.removeEventListener(SandboxBridgeEvent.ACTIVATED_FOCUS_MANAGER,
    					    		    bridgeEventActivateHandler);
-		bridge.addEventListener(ShowAlertRequest.SHOW, showAlertRequestHandler, false);
-
 		if (bridgedFocusManagers)
 			delete bridgedFocusManagers[bridge];


Transferred from the Adobe Open Source Subversion Repository

Revision: 12192
Author:   egeorgie@adobe.com
Date:     2009-11-25T00:55:11.384090Z

Log Message:
-----------
Adding requestedMinRowCount, requestedMinColumnCount to VerticalLayout, HorizontalLayout.

Note that fixing bug http://bugs.adobe.com/jira/browse/SDK-23634 requires an additional change to ListSkin.mxml.

QE notes: Add tests covering these two new properties.
Doc notes: None
Bugs: In preparation for fixing http://bugs.adobe.com/jira/browse/SDK-23634
Reviewer: Hans
Tests run: checkintests + mustella (cyclone + list, horizontalLayout, verticalLayout)
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LinearLayoutVector.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/HorizontalLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalLayout.as</path>

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

--- frameworks/projects/spark/src/spark/layouts/VerticalLayout.as
+++ frameworks/projects/spark/src/spark/layouts/VerticalLayout.as
@@ -182,6 +182,12 @@

 		// Don't drag-scroll in the horizontal direction
 		dragScrollRegionSizeHorizontal = 0;
+
+        // Virtualization defaults for cases
+        // where there are no items and no typical item.
+        // The llv defaults are the width/height of a Spark Button skin.
+        llv.defaultMinorSize = 71;
+        llv.defaultMajorSize = 22;
     }

     //--------------------------------------------------------------------------
@@ -467,35 +473,79 @@
     }

     //----------------------------------
-    //  requestedRowCount
-    //----------------------------------
-
-    private var _requestedRowCount:int = -1;
+    //  requestedMinRowCount
+    //----------------------------------
+
+    private var _requestedMinRowCount:int = 0;

     [Inspectable(category="General", minValue="-1")]

     /**
-     *  The measured size of this layout is tall enough to display
-     *  the first requestedRowCount layout elements.
-     *
-     *
If requestedRowCount is -1, then the measured
-     *  size will be big enough for all of the layout elements.

-     *
+     *  The measured height of this layout is large enough to display
+     *  at least requestedMinRowCount layout elements.
+     *
+     *
If requestedRowCount is set, then
+     *  this property has no effect.

+     *
      *
If the actual size of the container has been explicitly set,
      *  then this property has no effect.

-     *
-     *  @default -1
+     *
+     *  @default 0
      *
      *  @langversion 3.0
      *  @playerversion Flash 10
      *  @playerversion AIR 1.5
      *  @productversion Flex 4
      */
+    public function get requestedMinRowCount():int
+    {
+        return _requestedMinRowCount;
+    }
+
+    /**
+     *  @private
+     */
+    public function set requestedMinRowCount(value:int):void
+    {
+        if (_requestedMinRowCount == value)
+            return;
+
+        _requestedMinRowCount = value;
+
+        if (target)
+            target.invalidateSize();
+    }
+
+    //----------------------------------
+    //  requestedRowCount
+    //----------------------------------
+
+    private var _requestedRowCount:int = -1;
+
+    [Inspectable(category="General", minValue="-1")]
+
+    /**
+     *  The measured size of this layout is tall enough to display
+     *  the first requestedRowCount layout elements.
+     *
+     *
If requestedRowCount is -1, then the measured
+     *  size will be big enough for all of the layout elements.

+     *
+     *
If the actual size of the container has been explicitly set,
+     *  then this property has no effect.

+     *
+     *  @default -1
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4
+     */
     public function get requestedRowCount():int
     {
         return _requestedRowCount;
     }
-
+
     /**
      *  @private
      */
@@ -503,9 +553,11 @@
     {
         if (_requestedRowCount == value)
             return;
-
+
         _requestedRowCount = value;
-        invalidateTargetSizeAndDisplayList();
+
+        if (target)
+            target.invalidateSize();
     }

     //----------------------------------
@@ -1007,6 +1059,40 @@
     {
         return findLayoutElementBounds(target, lastIndexInView, +1, scrollRect);
     }
+
+    /**
+     *  @private
+     *  Fills in the result with preferred and min sizes of the element.
+     */
+    private function getElementWidth(element:ILayoutElement, justify:Boolean, result:SizesAndLimit):void
+    {
+        // Calculate preferred width first, as it's being used to calculate min width
+        var elementPreferredWidth:Number = Math.ceil(element.getPreferredBoundsWidth());
+
+        // Calculate min width
+        var flexibleWidth:Boolean = !isNaN(element.percentWidth) || justify;
+        var elementMinWidth:Number = flexibleWidth ? Math.ceil(element.getMinBoundsWidth()) :
+                                                     elementPreferredWidth;
+        result.preferredSize = elementPreferredWidth;
+        result.minSize = elementMinWidth;
+    }
+
+    /**
+     *  @private
+     *  Fills in the result with preferred and min sizes of the element.
+     */
+    private function getElementHeight(element:ILayoutElement, fixedRowHeight:Number, result:SizesAndLimit):void
+    {
+        // Calculate preferred height first, as it's being used to calculate min height below
+        var elementPreferredHeight:Number = isNaN(fixedRowHeight) ? Math.ceil(element.getPreferredBoundsHeight()) :
+                                                                    fixedRowHeight;
+        // Calculate min height
+        var flexibleHeight:Boolean = !isNaN(element.percentHeight);
+        var elementMinHeight:Number = flexibleHeight ? Math.ceil(element.getMinBoundsHeight()) :
+                                                       elementPreferredHeight;
+        result.preferredSize = elementPreferredHeight;
+        result.minSize = elementMinHeight;
+    }

     /**
      *  @private
@@ -1022,52 +1108,75 @@
      */
     private function measureReal(layoutTarget:GroupBase):void
     {
-        var layoutEltCount:int = layoutTarget.numElements;
-        var reqEltCount:int = requestedRowCount; // -1 means "all elements"
-        var eltCount:uint = Math.max(reqEltCount, layoutEltCount);
-        var eltInLayoutCount:uint = 0; // elts that have been measured
+        var size:SizesAndLimit = new SizesAndLimit();
+        var justify:Boolean = horizontalAlign == HorizontalAlign.JUSTIFY;
+        var numElements:int = layoutTarget.numElements; // How many elements there are in the target
+        var numElementsInLayout:int = numElements;      // How many elements have includeInLayout == true, start off with numElements.
+        var requestedRowCount:int = this.requestedRowCount;
+        var rowsMeasured:int = 0;                       // How many rows have been measured

         var preferredHeight:Number = 0; // sum of the elt preferred heights
         var preferredWidth:Number = 0;  // max of the elt preferred widths
-        var minHeight:Number = 0; // sum of the elt minimum heights
-        var minWidth:Number = 0;  // max of the elt minimum widths
+        var minHeight:Number = 0;       // sum of the elt minimum heights
+        var minWidth:Number = 0;        // max of the elt minimum widths

         var fixedRowHeight:Number = NaN;
         if (!variableRowHeight)
             fixedRowHeight = rowHeight;  // may query typicalLayoutElement, elt at index=0

-        for (var i:uint = 0; i < eltCount; i++)
-        {
-            if (i < layoutEltCount) // target.numElements
-                var elt:ILayoutElement = layoutTarget.getElementAt(i);
-            else // target.numElements < requestedElementCount, so "pad"
-                elt = typicalLayoutElement;
-            if (!elt || !elt.includeInLayout)
+        var element:ILayoutElement;
+        for (var i:int = 0; i < numElements; i++)
+        {
+            element = layoutTarget.getElementAt(i);
+            if (!element || !element.includeInLayout)
+            {
+                numElementsInLayout--;
                 continue;
+            }

-            // If requestedRowCount is specified, no need to consider the height
-            // of rows outside the bounds of the "requested" range. Otherwise, we
-            // consider each element.
-            if ((reqEltCount == -1) || ((reqEltCount != -1) && eltInLayoutCount < requestedRowCount))
+            // Can we measure this row height?
+            if (requestedRowCount == -1 || rowsMeasured < requestedRowCount)
             {
-                var height:Number = isNaN(fixedRowHeight) ? elt.getPreferredBoundsHeight() : fixedRowHeight;
-                height = Math.ceil(height); // Round up to give it a whole pixel.
-                preferredHeight += height;
-                minHeight += (isNaN(elt.percentHeight)) ? height : Math.ceil(elt.getMinBoundsHeight());
-                eltInLayoutCount += 1;
+                getElementHeight(element, fixedRowHeight, size);
+                preferredHeight += size.preferredSize;
+                minHeight += size.minSize;
+                rowsMeasured++;
             }

             // Consider the width of each element, inclusive of those outside
             // the requestedRowCount range.
-            var width:Number = Math.ceil(elt.getPreferredBoundsWidth());
-            preferredWidth = Math.max(preferredWidth, width);
-            var flexibleWidth:Boolean = !isNaN(elt.percentWidth) || horizontalAlign == HorizontalAlign.JUSTIFY;
-            minWidth = Math.max(minWidth, flexibleWidth ? Math.ceil(elt.getMinBoundsWidth()) : width);
-        }
-
-        if (eltInLayoutCount > 1)
+            getElementWidth(element, justify, size);
+            preferredWidth = Math.max(preferredWidth, size.preferredSize);
+            minWidth = Math.max(minWidth, size.minSize);
+        }
+
+        // Calculate the total number of rows to measure
+        var rowsToMeasure:int = (requestedRowCount != -1) ? requestedRowCount :
+                                                            Math.max(requestedMinRowCount, numElementsInLayout);
+        // Do we need to measure more rows?
+        if (rowsMeasured < rowsToMeasure)
+        {
+            // Use the typical element
+            element = typicalLayoutElement;
+            if (element)
+            {
+                // Height
+                getElementHeight(element, fixedRowHeight, size);
+                preferredHeight += size.preferredSize * (rowsToMeasure - rowsMeasured);
+                minHeight += size.minSize * (rowsToMeasure - rowsMeasured);
+
+                // Width
+                getElementWidth(element, justify, size);
+                preferredWidth = Math.max(preferredWidth, size.preferredSize);
+                minWidth = Math.max(minWidth, size.minSize);
+                rowsMeasured = rowsToMeasure;
+            }
+        }
+
+        // Add gaps
+        if (rowsMeasured > 1)
         {
-            var vgap:Number = gap * (eltInLayoutCount - 1);
+            var vgap:Number = gap * (rowsMeasured - 1);
             preferredHeight += vgap;
             minHeight += vgap;
         }
@@ -1095,7 +1204,7 @@
         {
             var typicalWidth:Number = typicalElt.getPreferredBoundsWidth();
             var typicalHeight:Number = typicalElt.getPreferredBoundsHeight();
-            llv.minorSize = Math.max(llv.minorSize, typicalWidth);
+            llv.defaultMinorSize = typicalWidth;
             llv.defaultMajorSize = typicalHeight;
         }
         if (layoutTarget)
@@ -1139,7 +1248,8 @@
     private function measureVirtual(layoutTarget:GroupBase):void
     {
         var eltCount:uint = layoutTarget.numElements;
-        var measuredEltCount:int = (requestedRowCount != -1) ? requestedRowCount : eltCount;
+        var measuredEltCount:int = (requestedRowCount != -1) ? requestedRowCount :
+                                                               Math.max(requestedMinRowCount, eltCount);

         var hPadding:Number = paddingLeft + paddingRight;
         var vPadding:Number = paddingTop + paddingBottom;
@@ -1223,15 +1333,7 @@
         if (!layoutTarget)
             return;

-        var hPadding:Number = paddingLeft + paddingRight;
-        var vPadding:Number = paddingTop + paddingBottom;
-
-        if (layoutTarget.numElements == 0)
-        {
-            layoutTarget.measuredWidth = layoutTarget.measuredMinWidth = hPadding;
-            layoutTarget.measuredHeight = layoutTarget.measuredMinHeight = vPadding;
-        }
-        else if (useVirtualLayout)
+        if (useVirtualLayout)
             measureVirtual(layoutTarget);
         else
             measureReal(layoutTarget);
@@ -1898,10 +2000,19 @@
 }
 }

+import mx.containers.utilityClasses.FlexChildInfo;
 import mx.core.ILayoutElement;
-import mx.containers.utilityClasses.FlexChildInfo;

 class LayoutElementFlexChildInfo extends FlexChildInfo
 {
     public var layoutElement:ILayoutElement;
 }
+
+class SizesAndLimit
+{
+    public var preferredSize:Number;
+    public var minSize:Number;
+}
+
+
+


Transferred from the Adobe Open Source Subversion Repository

Revision: 18776
Author:   hmuller@adobe.com
Date:     2010-11-22T16:50:41.107244Z

Log Message:
-----------
BitmapImage now dispatches FlexEvent.MEASURED_SIZE_PRELIMINARY,FINAL events and GridLayout consumes the latter.

QE notes: unrelated test, spark/primitives/Graphic/SWFs/FXG_Integration consistently crashes FP on cyclone server
Doc notes:
Bugs: SDK-28325
Reviewer: Corey
Tests run: checkin, mustella
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/primitives/BitmapImage.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/gridClasses/GridLayout.as</path>

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

--- frameworks/projects/spark/src/spark/primitives/BitmapImage.as
+++ frameworks/projects/spark/src/spark/primitives/BitmapImage.as
@@ -945,6 +945,9 @@
                 measuredHeight = !isNaN(_preliminaryHeight) && (previousHeight == 0) ?
                     _preliminaryHeight : previousHeight;

+                if (parent)
+                    parent.dispatchEvent(new FlexEvent(FlexEvent.MEASURED_SIZE_PRELIMINARY, true, true));
+
                 return;
             }

@@ -1549,7 +1552,7 @@
                     _trustedSource = false;

                     // Dispatch ready event
-                    dispatchEvent(new FlexEvent(FlexEvent.READY));
+                    dispatchEvent(new FlexEvent(FlexEvent.READY));
                 }
             }
             else
@@ -1710,6 +1713,9 @@

             dispatchEvent(event);

+            if (parent)
+                parent.dispatchEvent(new FlexEvent(FlexEvent.MEASURED_SIZE_FINAL, true, true));
+
             // Remove any event listeners from load-event dispatcher.
             clearLoadingContent();
         }


whitespace

whitespace

Change-Id: Ic1943135b8128ae24fafec7ff4763df8ca4d7ec2

--- WeaveAPI/src/JavaScript.as
+++ WeaveAPI/src/JavaScript.as
@@ -251,56 +251,56 @@
 					var extensions = flash[JSON_EXTENSIONS] = [];
 					var symbols = [NaN, Infinity, -Infinity];
 					for (var i in symbols)
-					    lookup[symbols[i] + JSON_SUFFIX] = symbols[i];
+						lookup[symbols[i] + JSON_SUFFIX] = symbols[i];

 					function cacheProxyFunction(id) {
-					    var func = function() {
-					        var params = Array.prototype.slice.call(arguments);
-					        var paramsJson = replace(params);
-					        try {
-					            var resultJson = flash[JSON_CALL](id, paramsJson);
-					        } catch (e) {
+						var func = function() {
+							var params = Array.prototype.slice.call(arguments);
+							var paramsJson = replace(params);
+							try {
+								var resultJson = flash[JSON_CALL](id, paramsJson);
+							} catch (e) {
 								var e2 = new Error();
 								e2.name = e.name;
 								e2.message = e.message;
 								throw e2;
-					        }
-					        return revive(resultJson);
-					    };
-					    func[JSON_FUNCTION_PREFIX] = id;
-					    return lookup[id] = func;
+							}
+							return revive(resultJson);
+						};
+						func[JSON_FUNCTION_PREFIX] = id;
+						return lookup[id] = func;
 					}

 					flash[JSON_REPLACER] = function(key, value) {
-					    if (typeof value === 'function') {
-					        if (!value[JSON_FUNCTION_PREFIX]) {
-					            var id = JSON_FUNCTION_PREFIX + (--functionCounter);
-					            value[JSON_FUNCTION_PREFIX] = id;
-					            lookup[id] = value;
-					        }
-					        value = value[JSON_FUNCTION_PREFIX];
-					    }
-					    else if (typeof value === 'number' && !isFinite(value))
-					        value = value + JSON_SUFFIX;
-					    else if (Array.isArray(value) && !(value instanceof Array))
-					        value = Array.prototype.slice.call(value);
-					    for (var i in extensions)
-					        if (typeof extensions[i] === 'object' && typeof extensions[i].replacer === 'function')
-					            value = extensions[i].replacer.call(flash, key, value);
-					    return value;
+						if (typeof value === 'function') {
+							if (!value[JSON_FUNCTION_PREFIX]) {
+								var id = JSON_FUNCTION_PREFIX + (--functionCounter);
+								value[JSON_FUNCTION_PREFIX] = id;
+								lookup[id] = value;
+							}
+							value = value[JSON_FUNCTION_PREFIX];
+						}
+						else if (typeof value === 'number' && !isFinite(value))
+							value = value + JSON_SUFFIX;
+						else if (Array.isArray(value) && !(value instanceof Array))
+							value = Array.prototype.slice.call(value);
+						for (var i in extensions)
+							if (typeof extensions[i] === 'object' && typeof extensions[i].replacer === 'function')
+								value = extensions[i].replacer.call(flash, key, value);
+						return value;
 					};

 					flash[JSON_REVIVER] = function(key, value) {
-					    if (typeof value === 'string') {
-					        if (lookup.hasOwnProperty(value))
-					            value = lookup[value];
-					        else if (value.substr(0, JSON_FUNCTION_PREFIX.length) == JSON_FUNCTION_PREFIX)
-					            value = cacheProxyFunction(value);
-					    }
-					    for (var i in extensions)
-					        if (typeof extensions[i] === 'object' && typeof extensions[i].reviver === 'function')
-					            value = extensions[i].reviver.call(flash, key, value);
-					    return value;
+						if (typeof value === 'string') {
+							if (lookup.hasOwnProperty(value))
+								value = lookup[value];
+							else if (value.substr(0, JSON_FUNCTION_PREFIX.length) == JSON_FUNCTION_PREFIX)
+								value = cacheProxyFunction(value);
+						}
+						for (var i in extensions)
+							if (typeof extensions[i] === 'object' && typeof extensions[i].reviver === 'function')
+								value = extensions[i].reviver.call(flash, key, value);
+						return value;
 					};
 				]]>
 			);


Transferred from the Adobe Open Source Subversion Repository

Revision: 7918
Author:   chaase@adobe.com
Date:     2009-06-17T16:55:30.271215Z

Log Message:
-----------
Round 2 of effects PARB changes. Some renames and removals of properties/functions, including:
AnimateTransform: removed 18 MotionPath properties, added applyChangesPostLayout property (replaces affectLayout property in subclasses), removed addMotionPath/addPostLayoutMotionPath protected functions
Animation: removed seek(), reverse()
SimpleMotionPath: removed 'duration' arg in constructor

QE Notes: Mustella will break on some of these changes (no surprise, just needs minor updates)
Doc Notes: API updates
Bugs: none
Reviewer: Jason
Tests: checkintests

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateColorInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Move3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Rotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/Animation.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/AnimateTransitionShaderInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/AnimateTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/animation/SimpleMotionPath.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/RotateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Scale3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/FadeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/ResizeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Rotate3D.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/supportClasses/MoveInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/effects/Scale.as</path>

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

--- frameworks/projects/spark/src/spark/effects/Scale.as
+++ frameworks/projects/spark/src/spark/effects/Scale.as
@@ -11,11 +11,20 @@

 package spark.effects
 {
+import mx.core.mx_internal;
 import mx.effects.IEffectInstance;

 import spark.effects.animation.MotionPath;
 import spark.effects.supportClasses.AnimateTransformInstance;
-
+
+use namespace mx_internal;
+
+//--------------------------------------
+//  Excluded APIs
+//--------------------------------------
+
+[Exclude(name="motionPaths", kind="property")]
+
 /**
  *  The Scale effect scales a target object
  *  in the x and y directions around the transform center.
@@ -77,24 +86,6 @@
     //--------------------------------------------------------------------------

     //----------------------------------
-    //  affectLayout
-    //----------------------------------
-    [Inspectable(category="General")]
-    /**
-     *  Specifies whether the parent container of the effect target
-     *  updates its layout based on changes to the effect target
-     *  while the effect plays.
-     *
-     *  @default true
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10
-     *  @playerversion AIR 1.5
-     *  @productversion Flex 4
-     */
-    public var affectLayout:Boolean = true;
-
-    //----------------------------------
     //  scaleYFrom
     //----------------------------------

@@ -224,7 +215,7 @@
      */
     override protected function initInstance(instance:IEffectInstance):void
     {
-        if(affectLayout)
+        if (!applyChangesPostLayout)
         {
             addMotionPath("scaleX", scaleXFrom, scaleXTo, scaleXBy);
             addMotionPath("scaleY", scaleYFrom, scaleYTo, scaleYBy);


Remove duplicate code, handle unknown errors

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

--- src/org/jivesoftware/xiff/conference/Room.as
+++ src/org/jivesoftware/xiff/conference/Room.as
@@ -645,49 +645,53 @@
 	                //trace("ROOM presence: " + presence.from + " : " + nickname);
 					for each(var presence:Presence in eventObj.data)
 					{
-						if (presence.type == Presence.ERROR_TYPE) {
-							switch (presence.errorCode) {
+						if (presence.type == Presence.ERROR_TYPE)
+						{
+							switch (presence.errorCode)
+							{
 								case 401:
 									e = new RoomEvent(RoomEvent.PASSWORD_ERROR);
-									dispatchEvent(e);
 									break;

 								case 403:
 									e = new RoomEvent(RoomEvent.BANNED_ERROR);
-									dispatchEvent(e);
 									break;

 								case 404:
 									e = new RoomEvent(RoomEvent.LOCKED_ERROR);
-									dispatchEvent(e);
 									break;

 								case 407:
 									e = new RoomEvent(RoomEvent.REGISTRATION_REQ_ERROR);
-									dispatchEvent(e);
 									break;

 								case 409:
 									e = new RoomEvent(RoomEvent.NICK_CONFLICT);
 									e.nickname = nickname;
-									dispatchEvent(e);
 									break;

 								case 503:
 									e = new RoomEvent(RoomEvent.MAX_USERS_ERROR);
-									dispatchEvent(e);
+									break;
+
+								default:
+									e = new RoomEvent("MUC Error of type: " + presence.errorCode);
 									break;
 							}
+							dispatchEvent(e);
 						}
-						else if( isThisRoom( presence.from ) ) {
+						else if( isThisRoom( presence.from ) )
+						{
 							// If the presence has our pending nickname, nickname change went through
-							if( presence.from.split( "/" )[1] == pendingNickname ) {
+							if( presence.from.split( "/" )[1] == pendingNickname )
+							{
 								myNickname = pendingNickname;
 								pendingNickname = null;
 							}

 							var user:MUCUserExtension = presence.getAllExtensionsByNS(MUCUserExtension.NS)[0];
-							switch (user.statusCode) {
+							switch (user.statusCode)
+							{
 								case 201:
 									unlockRoom(myIsReserved);
 									break;


Чистка кода

Чистка кода

--- src/main/org/shypl/common/util/FilePath.as
+++ src/main/org/shypl/common/util/FilePath.as
@@ -1,6 +1,4 @@
 package org.shypl.common.util {
-	import mx.utils.StringUtil;
-
 	import org.shypl.common.lang.IllegalStateException;

 	public class FilePath {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5837
Author:   dloverin@adobe.com
Date:     2009-04-01T14:46:58.934420Z

Log Message:
-----------
Fix RTE when running Spark WindowedApplication.

The problem was introduced by an error in the rename change. Changed the include for Button from mx.controls.Button to spark.components.Button.

QE Notes: None
Doc Notes: None
Bugs:
Reviewer:
tests: checkintests

Modified Paths:
--------------
/flex/sdk/trunk/frameworks/projects/airframework/src/spark/components/windowClasses/TitleBar.as

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

--- frameworks/projects/airspark/src/spark/components/windowClasses/TitleBar.as
+++ frameworks/projects/airspark/src/spark/components/windowClasses/TitleBar.as
@@ -22,11 +22,12 @@
 import flash.text.TextFormat;
 import flash.text.TextFormatAlign;

-import mx.controls.Button;
+import mx.core.IWindow;
+import mx.styles.StyleManager;
+
+import spark.components.Button;
 import spark.components.supportClasses.SkinnableComponent;
-import mx.core.IWindow;
 import spark.primitives.SimpleText;
-import mx.styles.StyleManager;

 /**
  *  The default title bar for a WindowedApplication or a Window.


don't remove neutral encampments until replacement is spawned

--- src/battlecode/client/viewer/render/DrawState.as
+++ src/battlecode/client/viewer/render/DrawState.as
@@ -239,14 +239,6 @@
         }

         override public function visitCaptureSignal(s:CaptureSignal):* {
-            var o:DrawRobot = neutralEncampments[s.getLocation()];
-            if (o) {
-                if (o.parent) {
-                    o.parent.removeChild(o);
-                }
-                delete neutralEncampments[s.getLocation()];
-            }
-
             var robot:DrawRobot = getRobot(s.getParentID());
             robot.capture();
         }
@@ -331,10 +323,21 @@
             var robot:DrawRobot = new DrawRobot(s.getRobotID(), s.getRobotType(), s.getTeam());
             robot.setLocation(s.getLocation());
             groundRobots[s.getRobotID()] = robot;
+
             if (s.getRobotType() == RobotType.HQ) {
                 if (s.getTeam() == Team.A) hqA = robot.clone() as DrawRobot;
                 if (s.getTeam() == Team.B) hqB = robot.clone() as DrawRobot;
             }
+
+            if (RobotType.isEncampment(s.getRobotType())) {
+                var o:DrawRobot = neutralEncampments[s.getLocation()];
+                if (o) {
+                    if (o.parent) {
+                        o.parent.removeChild(o);
+                    }
+                    delete neutralEncampments[s.getLocation()];
+                }
+            }
         }

     }


Nasty workaround for the 'named pointer href' thingys that dirk API uses RBL-8840

--- as3/xobjas3/src/com/rpath/xobj/XObjXMLDecoder.as
+++ as3/xobjas3/src/com/rpath/xobj/XObjXMLDecoder.as
@@ -46,18 +46,19 @@
 TODO: explore looking up XMLSchema types using simple parsing ?
 */

+import com.adobe.utils.DateUtil;
+
 import flash.utils.Dictionary;
 import flash.utils.getQualifiedClassName;
 import flash.xml.XMLDocument;
 import flash.xml.XMLNode;
 import flash.xml.XMLNodeType;

+import mx.collections.ICollectionView;
+import mx.collections.IList;
 import mx.collections.ListCollectionView;
 import mx.rpc.xml.*;
 import mx.utils.ObjectProxy;
-import mx.collections.IList;
-import com.adobe.utils.DateUtil;
-import mx.collections.ICollectionView;

 /**
@@ -468,7 +469,11 @@
             {
                 try
                 {
-                    if (result is Date)
+                    if (result is IXObjHref)
+                    {
+                        result.value = temp;
+                    }
+                    else if (result is Date)
                     {
                         try
                         {
@@ -627,6 +632,25 @@
                                 {
                                     // ID conflict. Use OLD object!
                                     partObj = existingByID;
+
+                                    // hack to support RESTHref pointing to real object
+                                    // related to RBL-8840 where we dropped version and stage
+                                    // since href points to already fetched actual object
+                                    // basically, <stage href="..">name</stage> is BAD form
+                                    // for partial object pointers (named pointers? ewww)
+
+                                    if (existing is IXObjHref)
+                                    {
+                                        try
+                                        {
+                                            existing.value = existingByID.name;
+                                            //existing.referenced = existingByID;
+                                        }
+                                        catch (e:Error)
+                                        {
+                                            // can't pull that swizzle here
+                                        }
+                                    }
                                 }
                             }
                             else // node has no ID, so use whatever we get


Added default buildFlags value (RC_CONTOUR_TESS_WALL_EDGES) in rcBuildContours function.

--- as3_lib/src/recastnavigation/recast/contour/rcBuildContours.as
+++ as3_lib/src/recastnavigation/recast/contour/rcBuildContours.as
@@ -4,14 +4,15 @@
 	import recastnavigation.internal_api.internal_rcBuildContours;
 	import recastnavigation.recast.RCCompactHeightfield;
 	import recastnavigation.recast.RCContext;
+	import recastnavigation.recast.enum.RCBuildContoursFlags;

 	use namespace rn_internal;

 	/**
 	 * Builds a contour set from the region outlines in the provided compact heightfield.
 	 */
-	public function rcBuildContours(ctx:RCContext, chf:RCCompactHeightfield, maxError:Number,
-									maxEdgeLen:int, cset:RCContourSet, buildFlags:int):Boolean {
+	public function rcBuildContours(ctx:RCContext, chf:RCCompactHeightfield, maxError:Number, maxEdgeLen:int,
+									cset:RCContourSet, buildFlags:int = RCBuildContoursFlags.RC_CONTOUR_TESS_WALL_EDGES):Boolean {

 		return internal_rcBuildContours(ctx.ptr, chf.ptr, maxError, maxEdgeLen, cset.ptr, buildFlags);


Removed import of nonexistant class.

Removed import of nonexistant class.

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

--- src/as/com/threerings/crowd/data/PlaceObject.as
+++ src/as/com/threerings/crowd/data/PlaceObject.as
@@ -34,7 +34,7 @@

 import com.threerings.crowd.Log;
 import com.threerings.crowd.chat.data.SpeakMarshaller;
-import com.threerings.crowd.chat.data.SpeakObject;
+//import com.threerings.crowd.chat.data.SpeakObject;

 /**
  * A distributed object that contains information on a place that is


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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

 package mx.controls.advancedDataGridClasses
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 17266
Author:   jszeto@adobe.com
Date:     2010-08-11T02:40:00.436172Z

Log Message:
-----------
Mobile 240 DPI Support

- Removed 240 DPI scaling hack from SystemManager.as
- Changed global fontSize from 14 to 24
- Updated padding and gap values for Button, CheckBox, and RadioButton
- Move icon offset from ToggleButtonSkinBase to CheckBoxSkin because RadioButton doesn't need the offset

QE notes: This will probably break any mustella tests run on the phone
Doc notes: none
Bugs: none
Reviewer: Glenn
Tests run: checkintests
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/managers/SystemManager.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/defaults.css</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ToggleButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as</path>

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

--- frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/SelectableButtonSkinBase.as
+++ frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/SelectableButtonSkinBase.as
@@ -27,6 +27,11 @@
     public function ToggleButtonSkinBase()
     {
         super();
+        gap = 15;
+        paddingLeft = 15;
+        paddingRight = 15;
+        paddingTop = 15;
+        paddingBottom = 15;
     }

@@ -108,10 +113,6 @@
         graphics.beginFill(0,0);
         graphics.drawRect(0,0,unscaledWidth, unscaledHeight);
         graphics.endFill();
-
-		// Force strokes to be aligned on the pixel boundries.
-		iconDisplay.x += .5;
-		iconDisplay.y += .5;
     }


Transferred from the Adobe Open Source Subversion Repository

Revision: 19328
Author:   mhorn@adobe.com
Date:     2010-12-13T20:45:00.405533Z

Log Message:
-----------
ASDoc updates

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/MobileSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/NavigationAngledButtonSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionButtonSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/VScrollBarSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/VScrollBarThumbSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/TextSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorApplicationSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderDataTip.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/ActionBarButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/SelectableButtonSkinBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/src/spark/skins/mobile/NavigationButtonSkin.as</path>

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

--- frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/SelectableButtonSkinBase.as
+++ frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/SelectableButtonSkinBase.as
@@ -146,6 +146,9 @@
     //
     //--------------------------------------------------------------------------

+    /**
+     *  @private
+     */
     override protected function createChildren():void
     {
         super.createChildren();


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

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


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

--- frameworks/projects/mx/src/mx/effects/easing/Quadratic.as
+++ frameworks/projects/mx/src/mx/effects/easing/Quadratic.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2004-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.effects.easing
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 3796
Author:   tan@adobe.com
Date:     2008-10-21T22:01:05.695187Z

Log Message:
-----------
Link the FxHSlider, FxVSlider, FxSpinner and FxNumericStepper examples to ASDoc.

Modified Paths:
--------------
<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/components/FxVSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxHSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxSpinner.as</path>

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

--- frameworks/projects/spark/src/spark/components/VSlider.as
+++ frameworks/projects/spark/src/spark/components/VSlider.as
@@ -22,6 +22,8 @@

 /**
  *  The FxVSlider class defines a vertical slider component.
+ *
+ *  @includeExample examples/FxVSliderExample.mxml
  */
 public class FxVSlider extends FxSlider
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 3634
Author:   mhorn@adobe.com
Date:     2008-10-14T20:28:10.010975Z

Log Message:
-----------
asdoc updates

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/FilledElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/Graphic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/IGraphicElement.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/flex4/src/mx/graphics/StrokedElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/graphicsClasses/GraphicElement.as</path>

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

--- frameworks/projects/spark/src/spark/primitives/Graphic.as
+++ frameworks/projects/spark/src/spark/primitives/Graphic.as
@@ -56,6 +56,10 @@
  *
Graphic controls do not have backgrounds or borders
  *  and cannot take focus.

  *
+ *
When placed in a container, a Graphic is positioned by the rules of the container.
+ *  However, the graphics in the Graphic control are always sized and positioned relative
+ *  to the upper-left corner of the Graphics control.

+ *
  *
The Graphic element can optionally contain a <Group> element.

  *
  *  @see mx.graphics.Group
@@ -118,7 +122,14 @@
     private var _viewHeight:Number;

     /**
+     *  Defines the vertical space that the graphic uses in the layout. When you set this value, the content is not scaled.
+     *  Whereas, if you specify the value of the height property, the content is scaled.
      *
+     *
There are two cases where this can be useful:

+     *  1) Specify a viewHeight larger than the natural size of the content. You might do this so that the graphic takes
+     *  up more space than its visual size.

+     *  2) Specify a viewHeight that is smaller than the natural size of the content. You might do this if your graphic has extra
+     *  chrome or a border that extends past the edges of the graphic. In this scenario, be sure to disable clipping in your layout.

      */
     public function get viewHeight():Number
     {
@@ -143,7 +154,14 @@
     private var _viewWidth:Number;

     /**
+     *  Defines the horizontal space that the graphic uses in the layout. When you set this value, the content is not scaled.
+     *  Whereas, if you specify the value of the width property, the content is scaled.
      *
+     *
There are two cases where this can be useful:

+     *  1) Specify a viewWidth larger than the natural size of the content. You might do this so that the graphic takes
+     *  up more space than its visual size.

+     *  2) Specify a viewWidth that is smaller than the natural size of the content. You might do this if your graphic has extra
+     *  chrome or a border that extends past the edges of the graphic. In this scenario, be sure to disable clipping in your layout.

      */
     public function get viewWidth():Number
     {


Tweaked delete hint appearance

Tweaked delete hint appearance

--- src/LevelStates/LevelState.as
+++ src/LevelStates/LevelState.as
@@ -2,6 +2,8 @@
 	import Components.Bloc;
 	import flash.utils.Dictionary;
 	import flash.geom.Point;
+	import Helpers.DeleteHelper;
+	import Helpers.KeyHelper;
 	import Modules.CustomModule;
 	import Modules.SysDelayClock;
 	import org.flixel.*;
@@ -55,6 +57,8 @@
 		private var loadButton:MenuButton;
 		private var resetButton:MenuButton;

+		private var deleteHint:KeyHelper;
+

 		private var displayTime:DTime;
 		private var displayDelay:DDelay;
@@ -163,6 +167,7 @@
 			upperLayer.add(new Scroller);
 			upperLayer.add(new DCurrent(displayWires, displayModules));
 			upperLayer.add(new DModuleInfo(displayModules));
+			upperLayer.add(deleteHint = new DeleteHelper);
 			if (level.delay) {
 				if (!displayDelay)
 					midLayer.add(displayDelay = new DDelay(modules, displayModules));
@@ -701,6 +706,8 @@
 			undoButton.setAlpha(undoAlpha);
 			redoButton.setAlpha(undoAlpha);

+			deleteHint.exists = !currentWire && !currentBloc && !currentModule && (findMousedModule() || findMousedWire());
+
 			if (loadButton) {
 				var successSave:String = findSuccessSave();
 				loadButton.setExists(successSave != savedString && successSave != null);
@@ -833,13 +840,6 @@
 			});
 		}

-		//private function get buttonMoused():MenuButton {
-			//for each (var button:MenuButton in buttons)
-				//if (button.exists && button.moused)
-					//return button;
-			//return null;
-		//}
-

 		public function numMemoryWriters():int {
 			var num:int = 0;
@@ -849,15 +849,20 @@
 			return num;
 		}

+		private function findMousedWire():DWire {
+			if (U.buttonManager.moused)
+				return null;
+
+			for each (var wire:DWire in displayWires)
+				if (wire.exists && wire.overlapsPoint(U.mouseFlxLoc))
+					return wire;
+			return null;
+		}
+
 		private function destroyWires():void {
-			if (U.buttonManager.moused)
-				return;
-
-			for each (var wire:DWire in displayWires)
-				if (wire.exists && wire.overlapsPoint(U.mouseFlxLoc)) {
-					new CustomAction(Wire.remove, Wire.place, wire.wire).execute();
-					//break;
-				}
+			var mousedWire:DWire = findMousedWire();
+			if (mousedWire)
+				new CustomAction(Wire.remove, Wire.place, mousedWire.wire).execute();
 		}

 		private function ensureNothingHeld():void {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5770
Author:   gruehle@adobe.com
Date:     2009-03-30T20:58:54.529722Z

Log Message:
-----------
Add [Alternative] metadata to the Halo components that have a Gumbo replacement.

Bugs: SDK-20190
QA notes: none
Doc notes: Additional ASDoc comments added for many of the classes. These should all be reviewed.
Reviewer: Chet

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TileList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HSlider.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/effects/Zoom.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ToggleButtonBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/HBox.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/framework/src/mx/controls/RadioButtonGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ControlBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Cubic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VSlider.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Fade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/RemoveChildAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/TweenEffect.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextArea.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeRight.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Sine.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/VBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Glow.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/CheckBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Application.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quartic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Box.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeLeft.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ApplicationControlBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Linear.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quintic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Tween.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Tile.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/easing/Quadratic.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/TextInput.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/AddChildAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeDown.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Rotate.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/SetPropertyAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/Canvas.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Resize.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Blur.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/LinkBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Move.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Text.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/HorizontalList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeUp.as</path>

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

--- frameworks/projects/mx/src/mx/containers/VBox.as
+++ frameworks/projects/mx/src/mx/containers/VBox.as
@@ -33,6 +33,8 @@
 //--------------------------------------

 [IconFile("VBox.png")]
+
+[Alternative(replacement="spark.components.VGroup", since="4.0")]

 /**
  *  The Halo VBox container lays out its children in a single vertical column.


Transferred from the Adobe Open Source Subversion Repository

Revision: 5358
Author:   clucier@adobe.com
Date:     2009-03-17T20:24:32.823451Z

Log Message:
-----------
Spark-alike default button theme for halo buttons.
Bugs: SDK-19544.
QE Notes: None.
Doc Notes: None.
Reviewer: Glenn

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/sparkskins/src/SparkSkinsClasses.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Button.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/defaults.css</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/sparkskins/src/mx/skins/spark/DefaultButtonSkin.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/halo/defaults.css</path>

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

--- frameworks/projects/mx/src/mx/controls/Button.as
+++ frameworks/projects/mx/src/mx/controls/Button.as
@@ -819,6 +819,7 @@
      *  Allows subclasses to re-define the skin property names.
      */
     mx_internal var skinName:String = "skin";
+    mx_internal var emphasizedSkinName:String = "emphasizedSkin";
     mx_internal var upSkinName:String = "upSkin";
     mx_internal var overSkinName:String = "overSkin";
     mx_internal var downSkinName:String = "downSkin";
@@ -1966,7 +1967,9 @@
         if (!newSkinClass)
         {
             // Try the default skin
-            newSkinClass = Class(getStyle(skinName));
+            newSkinClass = _emphasized ? Class(getStyle(emphasizedSkinName)) : Class(getStyle(skinName));
+            newSkinClass = !newSkinClass && _emphasized ? Class(getStyle(skinName)) : newSkinClass;
+
             // If we are using the default skin, then
             if (defaultSkinUsesStates)
                 tempSkinName = skinName;


Clean up.

Clean up.

* Consolidate variable names.

* Improve readability.

--- src/com/esri/builder/supportClasses/LayerToXMLUtil.as
+++ src/com/esri/builder/supportClasses/LayerToXMLUtil.as
@@ -56,242 +56,280 @@

     private static function layerToXML(layer:Layer, label:String):XML
     {
-        var lyrXML:XML;
+        var layerXML:XML;

         if (layer is ArcGISDynamicMapServiceLayer)
         {
-            var dynLyr:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
-            lyrXML = <layer label={label}
+            var dynLayer:ArcGISDynamicMapServiceLayer = layer as ArcGISDynamicMapServiceLayer;
+
+            layerXML = <layer label={label}
                     type="dynamic"
-                    visible={dynLyr.visible}
-                    alpha={dynLyr.alpha}
-                    url={dynLyr.url}
-                    useproxy={dynLyr.proxyURL != null}/>;
-            if (dynLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(dynLyr.refreshInterval);
-            }
-            if (dynLyr.showInLegend)
-            {
-                if (dynLyr.showInLegendHiddenLayers)
-                {
-                    lyrXML.@showinlegendhiddenlayers = dynLyr.showInLegendHiddenLayers.join();
+                    visible={dynLayer.visible}
+                    alpha={dynLayer.alpha}
+                    url={dynLayer.url}
+                    useproxy={dynLayer.proxyURL != null}/>;
+
+            if (dynLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(dynLayer.refreshInterval);
+            }
+
+            if (dynLayer.showInLegend)
+            {
+                if (dynLayer.showInLegendHiddenLayers)
+                {
+                    layerXML.@showinlegendhiddenlayers = dynLayer.showInLegendHiddenLayers.join();
                 }
             }
             else
             {
-                lyrXML.@showinlegend = false;
-            }
-            if (dynLyr.visibleLayers)
-            {
-                lyrXML.@visiblelayers = dynLyr.visibleLayers.toArray().join();
-            }
-            if (dynLyr.layerDefinitions && dynLyr.layerDefinitions.length > 0)
+                layerXML.@showinlegend = false;
+            }
+
+            if (dynLayer.visibleLayers)
+            {
+                layerXML.@visiblelayers = dynLayer.visibleLayers.toArray().join();
+            }
+
+            if (dynLayer.layerDefinitions && dynLayer.layerDefinitions.length > 0)
             {
                 // <sublayer id="2" definitionexpression="AGBUR = 'BIA'"/>
-                for each (var layerDefinition:LayerDefinition in dynLyr.layerDefinitions)
-                {
-                    lyrXML.appendChild(<sublayer id={layerDefinition.layerId} definitionexpression={layerDefinition.definition}/>);
+                for each (var layerDefinition:LayerDefinition in dynLayer.layerDefinitions)
+                {
+                    layerXML.appendChild(<sublayer id={layerDefinition.layerId} definitionexpression={layerDefinition.definition}/>);
                 }
             }
         }
         else if (layer is ArcGISImageServiceLayer)
         {
-            var imgLyr:ArcGISImageServiceLayer = layer as ArcGISImageServiceLayer;
-            lyrXML = <layer label={label}
+            var imgLayer:ArcGISImageServiceLayer = layer as ArcGISImageServiceLayer;
+
+            layerXML = <layer label={label}
                     type="image"
-                    visible={imgLyr.visible}
-                    alpha={imgLyr.alpha}
-                    url={imgLyr.url}
-                    useproxy={imgLyr.proxyURL != null}/>;
-            if (imgLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(imgLyr.refreshInterval);
-            }
-            if (!imgLyr.showInLegend)
-            {
-                lyrXML.@showinlegend = false;
-            }
-            if (imgLyr.bandIds)
-            {
-                lyrXML.@bandids = imgLyr.bandIds.join();
+                    visible={imgLayer.visible}
+                    alpha={imgLayer.alpha}
+                    url={imgLayer.url}
+                    useproxy={imgLayer.proxyURL != null}/>;
+
+            if (imgLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(imgLayer.refreshInterval);
+            }
+
+            if (!imgLayer.showInLegend)
+            {
+                layerXML.@showinlegend = false;
+            }
+
+            if (imgLayer.bandIds)
+            {
+                layerXML.@bandids = imgLayer.bandIds.join();
             }
         }
         else if (layer is ArcGISTiledMapServiceLayer)
         {
-            var tiledLyr:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
-            lyrXML = <layer label={label}
+            var tiledLayer:ArcGISTiledMapServiceLayer = layer as ArcGISTiledMapServiceLayer;
+            layerXML = <layer label={label}
                     type="tiled"
-                    visible={tiledLyr.visible}
-                    alpha={tiledLyr.alpha}
-                    url={tiledLyr.url}
-                    useproxy={tiledLyr.proxyURL != null}/>;
-            if (tiledLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(tiledLyr.refreshInterval);
-            }
-            if (tiledLyr.showInLegend)
-            {
-                if (tiledLyr.showInLegendHiddenLayers)
-                {
-                    lyrXML.@showinlegendhiddenlayers = tiledLyr.showInLegendHiddenLayers.join();
+                    visible={tiledLayer.visible}
+                    alpha={tiledLayer.alpha}
+                    url={tiledLayer.url}
+                    useproxy={tiledLayer.proxyURL != null}/>;
+
+            if (tiledLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(tiledLayer.refreshInterval);
+            }
+
+            if (tiledLayer.showInLegend)
+            {
+                if (tiledLayer.showInLegendHiddenLayers)
+                {
+                    layerXML.@showinlegendhiddenlayers = tiledLayer.showInLegendHiddenLayers.join();
                 }
             }
             else
             {
-                lyrXML.@showinlegend = false;
-            }
-            if (tiledLyr.displayLevels)
-            {
-                lyrXML.@displaylevels = tiledLyr.displayLevels.join();
+                layerXML.@showinlegend = false;
+            }
+
+            if (tiledLayer.displayLevels)
+            {
+                layerXML.@displaylevels = tiledLayer.displayLevels.join();
             }
         }
         else if (layer is CSVLayer)
         {
-            var csvLyr:CSVLayer = layer as CSVLayer;
-            lyrXML = <layer label={label}
+            var csvLayer:CSVLayer = layer as CSVLayer;
+
+            layerXML = <layer label={label}
                     type="csv"
-                    visible={csvLyr.visible}
-                    alpha={csvLyr.alpha}
-                    url={csvLyr.url}
-                    longitudefieldname={csvLyr.longitudeFieldName}
-                    latitudefieldname={csvLyr.latitudeFieldName}/>;
-            if (csvLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(csvLyr.refreshInterval);
-            }
-            if (!csvLyr.showInLegend)
-            {
-                lyrXML.@showinlegend = false;
-            }
-            if (csvLyr.columnDelimiter != ",")
-            {
-                lyrXML.@columndelimiter = csvLyr.columnDelimiter;
-            }
-            if (csvLyr.sourceFields)
+                    visible={csvLayer.visible}
+                    alpha={csvLayer.alpha}
+                    url={csvLayer.url}
+                    longitudefieldname={csvLayer.longitudeFieldName}
+                    latitudefieldname={csvLayer.latitudeFieldName}/>;
+
+            if (csvLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(csvLayer.refreshInterval);
+            }
+
+            if (!csvLayer.showInLegend)
+            {
+                layerXML.@showinlegend = false;
+            }
+
+            if (csvLayer.columnDelimiter != ",")
+            {
+                layerXML.@columndelimiter = csvLayer.columnDelimiter;
+            }
+
+            if (csvLayer.sourceFields)
             {
                 var fields:Array = [];
-                for each (var field:Field in csvLyr.sourceFields)
+                for each (var field:Field in csvLayer.sourceFields)
                 {
                     fields.push(field.name + "|" + field.alias + "|" + field.type);
                 }
-                lyrXML.@sourcefields = fields.join();
+                layerXML.@sourcefields = fields.join();
             }
         }
         else if (layer is FeatureLayer && !(layer is CSVLayer))
         {
-            var feaLyr:FeatureLayer = layer as FeatureLayer;
-            if (!feaLyr.featureCollection)
-            {
-                lyrXML = <layer label={label}
+            var feaLayer:FeatureLayer = layer as FeatureLayer;
+
+            if (!feaLayer.featureCollection)
+            {
+                layerXML = <layer label={label}
                         type="feature"
-                        visible={feaLyr.visible}
-                        alpha={feaLyr.alpha}
-                        mode={feaLyr.mode}
-                        url={feaLyr.url}
-                        iseditable={feaLyr.isEditable}
-                        useproxy={feaLyr.proxyURL != null}/>;
-                if (feaLyr.refreshInterval > 0)
-                {
-                    lyrXML.@autorefresh = minutesToSeconds(feaLyr.refreshInterval);
-                }
-                if (!feaLyr.showInLegend)
-                {
-                    lyrXML.@showinlegend = false;
+                        visible={feaLayer.visible}
+                        alpha={feaLayer.alpha}
+                        mode={feaLayer.mode}
+                        url={feaLayer.url}
+                        iseditable={feaLayer.isEditable}
+                        useproxy={feaLayer.proxyURL != null}/>;
+
+                if (feaLayer.refreshInterval > 0)
+                {
+                    layerXML.@autorefresh = minutesToSeconds(feaLayer.refreshInterval);
+                }
+
+                if (!feaLayer.showInLegend)
+                {
+                    layerXML.@showinlegend = false;
                 }
             }
         }
         else if (layer is GeoRSSLayer)
         {
             var geoRSSLayer:GeoRSSLayer = layer as GeoRSSLayer;
-            lyrXML = <layer label={label}
+
+            layerXML = <layer label={label}
                     type="georss"
                     visible={geoRSSLayer.visible}
                     alpha={geoRSSLayer.alpha}
                     url={geoRSSLayer.url}/>;
+
             if (geoRSSLayer.refreshInterval > 0)
             {
-                lyrXML.@autorefresh = minutesToSeconds(geoRSSLayer.refreshInterval);
-            }
+                layerXML.@autorefresh = minutesToSeconds(geoRSSLayer.refreshInterval);
+            }
+
             if (!geoRSSLayer.showInLegend)
             {
-                lyrXML.@showinlegend = false;
-            }
+                layerXML.@showinlegend = false;
+            }
+
             if (geoRSSLayer.serviceURL)
             {
-                lyrXML.@serviceurl = geoRSSLayer.serviceURL;
-            }
+                layerXML.@serviceurl = geoRSSLayer.serviceURL;
+            }
+
             if (geoRSSLayer.pointSymbol)
             {
-                lyrXML.appendChild(getPointSymbolXML(geoRSSLayer.pointSymbol));
-            }
+                layerXML.appendChild(getPointSymbolXML(geoRSSLayer.pointSymbol));
+            }
+
             if (geoRSSLayer.polylineSymbol)
             {
-                lyrXML.appendChild(getLineSymbolXML(geoRSSLayer.polylineSymbol));
-            }
+                layerXML.appendChild(getLineSymbolXML(geoRSSLayer.polylineSymbol));
+            }
+
             if (geoRSSLayer.polygonSymbol)
             {
-                lyrXML.appendChild(getPolygonSymbolXML(geoRSSLayer.polygonSymbol));
+                layerXML.appendChild(getPolygonSymbolXML(geoRSSLayer.polygonSymbol));
             }
         }
         else if (layer is KMLLayer)
         {
-            var kmlLyr:KMLLayer = layer as KMLLayer;
-            lyrXML = <layer label={label}
+            var kmlLayer:KMLLayer = layer as KMLLayer;
+
+            layerXML = <layer label={label}
                     type="kml"
-                    visible={kmlLyr.visible}
-                    alpha={kmlLyr.alpha}
-                    url={kmlLyr.url}/>;
-            if (kmlLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(kmlLyr.refreshInterval);
-            }
-            if (!kmlLyr.showInLegend)
-            {
-                lyrXML.@showinlegend = false;
+                    visible={kmlLayer.visible}
+                    alpha={kmlLayer.alpha}
+                    url={kmlLayer.url}/>;
+
+            if (kmlLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(kmlLayer.refreshInterval);
+            }
+
+            if (!kmlLayer.showInLegend)
+            {
+                layerXML.@showinlegend = false;
             }
         }
         else if (layer is OpenStreetMapLayer)
         {
-            var osmLyr:OpenStreetMapLayer = layer as OpenStreetMapLayer;
-            lyrXML = <layer label={label}
+            var osmLayer:OpenStreetMapLayer = layer as OpenStreetMapLayer;
+
+            layerXML = <layer label={label}
                     type="osm"
-                    visible={osmLyr.visible}
-                    alpha={osmLyr.alpha}/>;
-            if (osmLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(osmLyr.refreshInterval);
-            }
-            if (!osmLyr.showInLegend)
-            {
-                lyrXML.@showinlegend = false;
+                    visible={osmLayer.visible}
+                    alpha={osmLayer.alpha}/>;
+
+            if (osmLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(osmLayer.refreshInterval);
+            }
+
+            if (!osmLayer.showInLegend)
+            {
+                layerXML.@showinlegend = false;
             }
         }
         else if (layer is VETiledLayer)
         {
-            var veLyr:VETiledLayer = layer as VETiledLayer;
-            lyrXML = <layer label={label}
+            var veLayer:VETiledLayer = layer as VETiledLayer;
+
+            layerXML = <layer label={label}
                     type="bing"
-                    visible={veLyr.visible}
-                    alpha={veLyr.alpha}
-                    style={veLyr.mapStyle}/>;
-            if (veLyr.refreshInterval > 0)
-            {
-                lyrXML.@autorefresh = minutesToSeconds(veLyr.refreshInterval);
-            }
-            if (!veLyr.showInLegend)
-            {
-                lyrXML.@showinlegend = false;
-            }
-            if (veLyr.displayLevels)
-            {
-                lyrXML.@displaylevels = veLyr.displayLevels.join();
+                    visible={veLayer.visible}
+                    alpha={veLayer.alpha}
+                    style={veLayer.mapStyle}/>;
+
+            if (veLayer.refreshInterval > 0)
+            {
+                layerXML.@autorefresh = minutesToSeconds(veLayer.refreshInterval);
+            }
+
+            if (!veLayer.showInLegend)
+            {
+                layerXML.@showinlegend = false;
+            }
+
+            if (veLayer.displayLevels)
+            {
+                layerXML.@displaylevels = veLayer.displayLevels.join();
             }
         }
         else if (layer is WMSLayer)
         {
             var wmsLayer:WMSLayer = layer as WMSLayer;
-            lyrXML = <layer label={label}
+
+            layerXML = <layer label={label}
                     type="wms"
                     visible={wmsLayer.visible}
                     alpha={wmsLayer.alpha}
@@ -299,39 +337,47 @@
                     skipgetcapabilities={wmsLayer.skipGetCapabilities}
                     imageformat={wmsLayer.imageFormat}
                     url={wmsLayer.url}/>;
+
             if (wmsLayer.refreshInterval > 0)
             {
-                lyrXML.@autorefresh = minutesToSeconds(wmsLayer.refreshInterval);
-            }
+                layerXML.@autorefresh = minutesToSeconds(wmsLayer.refreshInterval);
+            }
+
             if (!wmsLayer.showInLegend)
             {
-                lyrXML.@showinlegend = false;
-            }
+                layerXML.@showinlegend = false;
+            }
+
             if (wmsLayer.copyright)
             {
-                lyrXML.@copyright = wmsLayer.copyright;
-            }
+                layerXML.@copyright = wmsLayer.copyright;
+            }
+
             if (wmsLayer.spatialReference)
             {
-                lyrXML.@wkid = wmsLayer.spatialReference.wkid;
-            }
+                layerXML.@wkid = wmsLayer.spatialReference.wkid;
+            }
+
             if (wmsLayer.maxImageHeight > 0)
             {
-                lyrXML.@maximageheight = wmsLayer.maxImageHeight;
-            }
+                layerXML.@maximageheight = wmsLayer.maxImageHeight;
+            }
+
             if (wmsLayer.maxImageWidth > 0)
             {
-                lyrXML.@maximagewidth = wmsLayer.maxImageWidth;
-            }
+                layerXML.@maximagewidth = wmsLayer.maxImageWidth;
+            }
+
             if (wmsLayer.visibleLayers)
             {
-                lyrXML.@visiblelayers = wmsLayer.visibleLayers.toArray().join();
+                layerXML.@visiblelayers = wmsLayer.visibleLayers.toArray().join();
             }
         }
         else if (layer is WMTSLayer)
         {
             var wmtsLayer:WMTSLayer = layer as WMTSLayer;
-            lyrXML = <layer label={label}
+
+            layerXML = <layer label={label}
                     type="wmts"
                     visible={wmtsLayer.visible}
                     alpha={wmtsLayer.alpha}
@@ -339,25 +385,30 @@
                     imageformat={wmtsLayer.imageFormat}
                     url={wmtsLayer.url}
                     useproxy={wmtsLayer.proxyURL != null}/>;
+
             if (wmtsLayer.refreshInterval > 0)
             {
-                lyrXML.@autorefresh = minutesToSeconds(wmtsLayer.refreshInterval);
-            }
+                layerXML.@autorefresh = minutesToSeconds(wmtsLayer.refreshInterval);
+            }
+
             if (!wmtsLayer.showInLegend)
             {
-                lyrXML.@showinlegend = false;
-            }
+                layerXML.@showinlegend = false;
+            }
+
             if (wmtsLayer.layerId)
             {
-                lyrXML.@layerid = wmtsLayer.layerId;
-            }
+                layerXML.@layerid = wmtsLayer.layerId;
+            }
+
             if (wmtsLayer.serviceMode)
             {
-                lyrXML.@mode = wmtsLayer.serviceMode;
-            }
+                layerXML.@mode = wmtsLayer.serviceMode;
+            }
+
             if (wmtsLayer.style)
             {
-                lyrXML.@style = wmtsLayer.style;
+                layerXML.@style = wmtsLayer.style;
             }
         }
         else if (layer is WebTiledLayer)
@@ -369,35 +420,40 @@
             var hasSupportedTileInfo:Boolean = ObjectUtil.compare(defaultTileInfo, webTiledLayer.tileInfo) == 0;
             if (hasSupportedTileInfo)
             {
-                lyrXML = <layer label={label}
+                layerXML = <layer label={label}
                         type="webtiled"
                         visible={webTiledLayer.visible}
                         alpha={webTiledLayer.alpha}
                         url={webTiledLayer.urlTemplate}/>;
+
                 if (webTiledLayer.refreshInterval > 0)
                 {
-                    lyrXML.@autorefresh = minutesToSeconds(webTiledLayer.refreshInterval);
-                }
+                    layerXML.@autorefresh = minutesToSeconds(webTiledLayer.refreshInterval);
+                }
+
                 if (!webTiledLayer.showInLegend)
                 {
-                    lyrXML.@showinlegend = false;
-                }
+                    layerXML.@showinlegend = false;
+                }
+
                 if (webTiledLayer.copyright)
                 {
-                    lyrXML.@copyright = webTiledLayer.copyright;
-                }
+                    layerXML.@copyright = webTiledLayer.copyright;
+                }
+
                 if (webTiledLayer.displayLevels)
                 {
-                    lyrXML.@displaylevels = webTiledLayer.displayLevels.join();
-                }
+                    layerXML.@displaylevels = webTiledLayer.displayLevels.join();
+                }
+
                 if (webTiledLayer.subDomains)
                 {
-                    lyrXML.@subdomains = webTiledLayer.subDomains.join();
-                }
-            }
-        }
-
-        return lyrXML;
+                    layerXML.@subdomains = webTiledLayer.subDomains.join();
+                }
+            }
+        }
+
+        return layerXML;
     }

     private static function minutesToSeconds(minutes:Number):Number


Transferred from the Adobe Open Source Subversion Repository

Revision: 19795
Author:   rfrishbe@adobe.com
Date:     2011-01-18T19:15:14.349353Z

Log Message:
-----------
Bunch of small, mostly ASDoc cleanups:

1) Cleaning up ASDoc around alternatingItemColors (after SVN 19684) and mis-spelling "Destroy"

2) Cleaning up an un-needed style in defaults.css since it's set in Scroller.

3) In Spark ListBase, removing an un-needed FIXME, but fixing up the documentation since we were actually doing it correctly before, but the documentation was just wrong.

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

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mx/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobiletheme/defaults.css</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mx/src/mx/controls/Menu.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/ViewMenu.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DefaultItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/wireframe/src/spark/skins/wireframe/DefaultItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mx/src/mx/controls/List.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as</path>

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

--- frameworks/projects/mx/src/mx/controls/List.as
+++ frameworks/projects/mx/src/mx/controls/List.as
@@ -1199,7 +1199,7 @@

         var colors:Array;
 		var colorsStyle:Object = getStyle("alternatingItemColors");
-		colorsStyle = getStyle("alternatingItemColors");
+
 		if (colorsStyle)
 			colors = (colorsStyle is Array) ? (colorsStyle as Array) : [colorsStyle];


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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

 package mx.controls
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 5104
Author:   clucier@adobe.com
Date:     2009-02-27T14:51:34.248850Z

Log Message:
-----------
Default button support for Spark containers and editable text controls.
QE Notes:
Doc Notes:
Bugs: SDK-19420
Reviewer: Glenn, Gordon

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/baseClasses/FxContainerBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ContainerGlobals.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/FxButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/IFocusManagerContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/defaults.css</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/colorPickerClasses/SwatchPanel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Menu.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/managers/FocusManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/TextView.as</path>
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/skins/spark/FxDefaultButtonSkin.mxml</path>

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

--- frameworks/projects/mx/src/mx/controls/Menu.as
+++ frameworks/projects/mx/src/mx/controls/Menu.as
@@ -41,6 +41,7 @@
 import mx.core.ClassFactory;
 import mx.core.EdgeMetrics;
 import mx.core.EventPriority;
+import mx.core.IFlexDisplayObject;
 import mx.core.ScrollPolicy;
 import mx.core.UIComponent;
 import mx.core.UIComponentGlobals;
@@ -1011,6 +1012,26 @@
     }

     //--------------------------------------------------------------------------
+    //  defaultButton
+    //--------------------------------------------------------------------------
+
+    /**
+     *  @private
+     */
+    public function get defaultButton():IFlexDisplayObject
+    {
+        return null;
+    }
+
+    /**
+     *  @private
+     */
+    public function set defaultButton(value:IFlexDisplayObject):void
+    {
+
+    }
+
+    //--------------------------------------------------------------------------
     //
     //  Event handlers
     //


Do not attempt to localize MRU scene list in editor.

--- bin/Data/Scripts/Editor/EditorUI.as
+++ bin/Data/Scripts/Editor/EditorUI.as
@@ -363,7 +363,7 @@
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'E', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'E', QUAL_ALT));
         }
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
         {
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'H'));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'H', QUAL_ALT));
@@ -740,7 +740,7 @@
         menuCallbacks[variant.GetUInt()]();
 }

-Menu@ CreateMenuItem(const String&in title, MENU_CALLBACK@ callback = null, int accelKey = 0, int accelQual = 0, bool addToQuickMenu = true, String quickMenuText="")
+Menu@ CreateMenuItem(const String&in title, MENU_CALLBACK@ callback = null, int accelKey = 0, int accelQual = 0, bool addToQuickMenu = true, String quickMenuText="", bool autoLocalize = true)
 {
     Menu@ menu = Menu(title);
     menu.defaultStyle = uiStyle;
@@ -758,7 +758,7 @@
     menu.AddChild(menuText);
     menuText.style = "EditorMenuText";
     menuText.text = title;
-    menuText.autoLocalizable = true;
+    menuText.autoLocalizable = autoLocalize;

     if (addToQuickMenu)
         AddQuickMenuItem(callback, quickMenuText.empty ? title : quickMenuText);
@@ -1637,7 +1637,7 @@
     {
         recentSceneMenu.enabled = true;
         for (uint i=0; i < uiRecentScenes.length; ++i)
-            mruScenesPopup.AddChild(CreateMenuItem(uiRecentScenes[i], @LoadMostRecentScene, 0, 0, false));
+            mruScenesPopup.AddChild(CreateMenuItem(uiRecentScenes[i], @LoadMostRecentScene, 0, 0, false, "", false));
     }
     else
         recentSceneMenu.enabled = false;


fixed bug in error handling

fixed bug in error handling

--- WeaveAPI/src/JavaScript.as
+++ WeaveAPI/src/JavaScript.as
@@ -604,7 +604,7 @@

 				const CATCH_CODE:String = marshallExceptions
 					? 'if (e.toString() == "[object Error]") e.toString = function(){ return this.name + ": " + this.message; }; throw e;'
-					: 'e.message += "\\n" + code; if (typeof console != "undefined") console.error(e);';
+					: 'e.message += "\\n" + ' + CODE_PARAM + '; if (typeof console != "undefined") console.error(e);';

 				var evalFunc:String = 'function(' + CODE_PARAM + ', ' + ARGS_PARAM + '){ try {\n' + TRY_CODE + '\n} catch (e) {\n' + CATCH_CODE + '\n} }';


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

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

 package mx.olap
 {