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

--- frameworks/projects/spark/src/spark/effects/Animate.as
+++ frameworks/projects/spark/src/spark/effects/Animate.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2008 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.
 //
 ////////////////////////////////////////////////////////////////////////////////
 package spark.effects


readUTF?

readUTF?

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

--- src/as/com/threerings/presents/net/FailureResponse.as
+++ src/as/com/threerings/presents/net/FailureResponse.as
@@ -44,7 +44,7 @@
     {
         super.readObject(ins);
         _oid = ins.readInt();
-        _message = ins.readUTF();
+        _message = ins.readField(String) as String;
     }

     protected var _oid :int;


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

--- frameworks/projects/advancedgrids/src/mx/olap/IOLAPElement.as
+++ frameworks/projects/advancedgrids/src/mx/olap/IOLAPElement.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.olap
 {


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

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


Transferred from the Adobe Open Source Subversion Repository

Revision: 10606
Author:   egeorgie@adobe.com
Date:     2009-09-25T23:01:50.455888Z

Log Message:
-----------
White space cleanup.

Doc notes: None
Bugs: None
Reviewer: Evtim
Tests run: build
Is noteworthy for integration: Nope

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DropDownList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/TransformOffsets.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/states/AddItems.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/OnDemandEventDispatcher.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/VideoDisplay.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/PopUpAnchor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/MatrixUtil.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/Block.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/containers/ViewStack.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/ToggleButtonBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/EffectManager.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/CompoundTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/Container.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Effect.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/LayoutElementUIComponentUtils.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/BitmapFill.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ArrayList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/graphics/GradientBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/DropDownController.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/BasicLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/ListCollectionView.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/geom/Transform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/scrollClasses/ScrollBar.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LinearLayoutVector.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/Path.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/DescribeTypeCache.as</path>
<path kind="file" action="M">/flex/sdk/trunk/development/eclipse/flex/sparkTest/src/testWheel.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/AnimateTransform.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/TileLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/SparkSkin.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/spark/src/spark/effects/supportClasses/AnimateTransformInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Scroller.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/DataGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/AdvancedLayoutFeatures.as</path>

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

--- frameworks/projects/framework/src/mx/geom/TransformOffsets.as
+++ frameworks/projects/framework/src/mx/geom/TransformOffsets.as
@@ -94,7 +94,7 @@
 	 */
 	public function set x(value:Number):void
 	{
-		if(value == _x)
+		if (value == _x)
 			return;
 		_x = value;
 		invalidate(false);
@@ -117,7 +117,7 @@
 	 */
 	public function set y(value:Number):void
 	{
-		if(value == _y)
+		if (value == _y)
 			return;
 		_y = value;
 		invalidate(false);
@@ -141,7 +141,7 @@
 	 */
 	public function set z(value:Number):void
 	{
-		if(value == _z)
+		if (value == _z)
 			return;
 		_z = value;
 		invalidate(true);
@@ -168,7 +168,7 @@
 	 */
 	public function set rotationX(value:Number):void
 	{
-		if(value == _rotationX)
+		if (value == _rotationX)
 			return;
 		_rotationX = value;
 		invalidate(true);
@@ -192,7 +192,7 @@
 	 */
 	public function set rotationY(value:Number):void
 	{
-		if(value == _rotationY)
+		if (value == _rotationY)
 			return;
 		_rotationY = value;
 		invalidate(true);
@@ -216,7 +216,7 @@
 	 */
 	public function set rotationZ(value:Number):void
 	{
-		if(value == _rotationZ)
+		if (value == _rotationZ)
 			return;
 		_rotationZ = value;
 		invalidate(false);
@@ -243,7 +243,7 @@
 	 */
 	public function set scaleX(value:Number):void
 	{
-		if(value == _scaleX)
+		if (value == _scaleX)
 			return;
 		_scaleX = value;
 		invalidate(false);
@@ -267,7 +267,7 @@
 	 */
 	public function set scaleY(value:Number):void
 	{
-		if(value == _scaleY)
+		if (value == _scaleY)
 			return;
 		_scaleY = value;
 		invalidate(false);
@@ -292,7 +292,7 @@
 	 */
 	public function set scaleZ(value:Number):void
 	{
-		if(value == _scaleZ)
+		if (value == _scaleZ)
 			return;
 		_scaleZ = value;
 		invalidate(true);
@@ -313,7 +313,7 @@
 	 */
 	mx_internal function get is3D():Boolean
 	{
-		if((_flags & M3D_FLAGS_VALID) == 0)
+		if ((_flags & M3D_FLAGS_VALID) == 0)
 			update3DFlags();
 		return ((_flags & IS_3D) != 0);
 	}
@@ -332,10 +332,10 @@
   	 */
 	private function invalidate(affects3D:Boolean,dispatchChangeEvent:Boolean = true):void
 	{
-		if(affects3D)
+		if (affects3D)
 			_flags &= ~M3D_FLAGS_VALID;

-		if(dispatchChangeEvent)
+		if (dispatchChangeEvent)
 			dispatchEvent(new Event(Event.CHANGE));
 	}

@@ -348,7 +348,7 @@
   	 */
 	private function update3DFlags():void
 	{
-		if((_flags & M3D_FLAGS_VALID) == 0)
+		if ((_flags & M3D_FLAGS_VALID) == 0)
 		{
 			var matrixIs3D:Boolean = ( // note that rotationZ is the same as rotation, and not a 3D affecting
 			  	(Math.abs(_scaleZ-1) > EPSILON) ||  // property.
@@ -356,7 +356,7 @@
 			  	((Math.abs(_rotationY)+EPSILON)%360) > 2*EPSILON ||
 			  	Math.abs(_z) > EPSILON
 			  	);
-			if(matrixIs3D)
+			if (matrixIs3D)
 				_flags |= IS_3D;
 			else
 				_flags &= ~IS_3D;


Transferred from the Adobe Open Source Subversion Repository

Revision: 12327
Author:   smgilson@adobe.com
Date:     2009-12-01T18:17:23.194369Z

Log Message:
-----------
ASDoc updates in preparation for localization

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

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RadioButtonGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RadioButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/PopUpAnchor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Spinner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Label.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/Panel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IDeferredContentOwner.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/NumericStepper.as</path>

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

--- frameworks/projects/spark/src/spark/components/PopUpAnchor.as
+++ frameworks/projects/spark/src/spark/components/PopUpAnchor.as
@@ -125,7 +125,8 @@
     private var _popUpHeightMatchesAnchorHeight:Boolean = false;

     /**
-     *  If true, the height of the popUp control is set to the value of the PopUpAnchor's height.
+     *  If true, the height of the popUp control is set
+     *  to the value of the PopUpAnchor's height.
      *
      *  @default false
      *
@@ -159,7 +160,8 @@
     private var _popUpWidthMatchesAnchorWidth:Boolean = false;

     /**
-     *  If true, the width of the popUp control is set to the value of the PopUpAnchor's width.
+     *  If true, the width of the popUp control
+     *  is set to the value of the PopUpAnchor's width.
      *
      *  @default false
      *
@@ -194,7 +196,8 @@

     /**
-     *  If true, adds the popUp control to the PopUpManager. If false, removes it.
+     *  If true, adds the popUp control to the PopUpManager.
+     *  If false, it removes the control.
      *
      *  @default false
      *


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

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

 package spark.layouts
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 6858
Author:   egeorgie@adobe.com
Date:     2009-05-12T21:36:09.954248Z

Log Message:
-----------
Fix bug http://bugs.adobe.com/jira/browse/SDK-21027 http://bugs.adobe.com/jira/browse/SDK-20760 http://bugs.adobe.com/jira/browse/SDK-20914

Fix:
1. modify VerticalLayout, HorizontalLayout to align children to the container edges/ middle of container in cases where clipping is disabled.
2. Modify VerticalLayout/HorizontalLayout to take element's min width/height while calculating minimum measured width/height in cases of "justify" alignment.
3. Modify the contentGroup part in the default skins for the Application, Panel, SkinnableContainer to have explicit minimum width/height of (0,0).

QE Notes: None
Doc Notes: None
Bugs: SDK-21027, SDK-20760, SDK-20914
Reviewer: Hans
tests: checkintests, mustella (gumbo/layouts, gumbo/core/Group, gumbo/containers/FxPanel, gumbo/components/FxContainer)

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

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

--- frameworks/projects/spark/src/spark/layouts/VerticalLayout.as
+++ frameworks/projects/spark/src/spark/layouts/VerticalLayout.as
@@ -1008,7 +1008,8 @@
             preferredHeight += height;
             preferredWidth = Math.max(preferredWidth, width);
             minHeight += (isNaN(elt.percentHeight)) ? height : elt.getMinBoundsHeight();
-            minWidth = Math.max(minWidth, (isNaN(elt.percentWidth)) ? width : elt.getMinBoundsWidth());
+            var flexibleWidth:Boolean = !isNaN(elt.percentWidth) || horizontalAlign == HorizontalAlign.JUSTIFY;
+            minWidth = Math.max(minWidth, flexibleWidth ? elt.getMinBoundsWidth() : width);

             eltInLayoutCount += 1;
         }
@@ -1125,7 +1126,8 @@
         }
         layoutTarget.measuredWidth = llv.minorSize + hPadding;

-        layoutTarget.measuredMinWidth = layoutTarget.measuredWidth;
+        layoutTarget.measuredMinWidth = (horizontalAlign == HorizontalAlign.JUSTIFY) ?
+                llv.minMinorSize + hPadding : layoutTarget.measuredWidth;
         layoutTarget.measuredMinHeight = layoutTarget.measuredHeight;
     }

@@ -1489,7 +1491,9 @@
         // TODO: in the center or right case, we end up calculating percentWidth
         // twice.  Once here for the contentWidth and once in distributeHeight
         // to size that particular element.
-        if (horizontalAlign != HorizontalAlign.LEFT)
+        if (horizontalAlign == HorizontalAlign.CONTENT_JUSTIFY ||
+           (clipAndEnableScrolling && (horizontalAlign == HorizontalAlign.CENTER ||
+                                       horizontalAlign == HorizontalAlign.RIGHT)))
         {
             for (var i:int = 0; i < count; i++)
             {
@@ -1507,17 +1511,7 @@
             }
         }

-        // If we're justifying the elements, then all widths should be set to
-        // targetWidth.  If we're content justifying the elements, then
-        // all widths should be set to the contentWidth.
-        // Otherwise restrictedWidth is ignored in distributedHeight.
-        var restrictedWidth:Number;
-        if (horizontalAlign == HorizontalAlign.JUSTIFY)
-            restrictedWidth = targetWidth;
-        else if (horizontalAlign == HorizontalAlign.CONTENT_JUSTIFY)
-            restrictedWidth = containerWidth;
-
-        distributeHeight(targetWidth, targetHeight, restrictedWidth);
+        distributeHeight(targetWidth, targetHeight, containerWidth);

         // default to left (0)
         var hAlign:Number = 0;


TSDemuxer: don't report parsing error on empty NALU

related to https://github.com/mangui/flashls/issues/569

--- src/org/mangui/hls/demux/TSDemuxer.as
+++ src/org/mangui/hls/demux/TSDemuxer.as
@@ -652,7 +652,7 @@
                             Log.debug("TS: SEI parsing error : " + error.message);
                         }
                     }
-                } else if (frame.type == 0) {
+                } else if (frame.type == 0 && frame.length) {
                     // report parsing error
                     if(_callback_error != null) {
                         _callback_error("TS: invalid NALu type found, corrupted fragment ?");


Transferred from the Adobe Open Source Subversion Repository

Revision: 9290
Author:   rfrishbe@adobe.com
Date:     2009-08-13T23:41:54.294561Z

Log Message:
-----------
A skin would almost always be reloaded when setting it via skinFactory when a style invalidation occurs.  skinFactory was being smart about ClassFactories, but since Design View was the only one using this API (as it's undocumented and officially unsupported), the ClassFactory case wasn't helping them much.  Because of this, now we only recreate the skin when the skinFactory style has been explicitly set as per design view's request.

QE notes: -
Doc notes: -
Bugs: -
Reviewer: Glenn
Tests run: checkintests, mustella SkinnableComponent, SkinnableContainer
Is noteworthy for integration: No

Modified Paths:
--------------
/flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as

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

--- frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/SkinnableComponent.as
@@ -19,13 +19,11 @@
 import flash.geom.Point;
 import flash.utils.*;

-import mx.core.ClassFactory;
 import mx.core.IFactory;
-import mx.core.IInvalidating;
 import mx.core.ILayoutElement;
 import mx.core.IVisualElement;
+import mx.core.mx_internal;
 import mx.core.UIComponent;
-import mx.core.mx_internal;
 import mx.events.PropertyChangeEvent;

 use namespace mx_internal;
@@ -330,13 +328,20 @@
             var factory:Object = getStyle("skinFactory");
             var newSkinClass:Class;

+            // if it's a factory, only reload the skin if the skinFactory
+            // style has been explicitly changed.  right now this style is only
+            // used by design view, and this is the contract we have with them.
             if (factory)
-                newSkinClass = (factory is ClassFactory) ? ClassFactory(factory).generator : null;
+                skipReload = !skinFactoryStyleChanged;
             else
+            {
                 newSkinClass = getStyle("skinClass");

-            skipReload = newSkinClass &&
-                getQualifiedClassName(newSkinClass) == getQualifiedClassName(_skin);
+                skipReload = newSkinClass &&
+                    getQualifiedClassName(newSkinClass) == getQualifiedClassName(_skin);
+            }
+
+            skinFactoryStyleChanged = false;
         }

         if (!skipReload)
@@ -411,6 +416,9 @@
         {
             skinChanged = true;
             invalidateProperties();
+
+            if (styleProp == "skinFactory")
+                skinFactoryStyleChanged = true;
         }

         super.styleChanged(styleProp);
@@ -1017,6 +1025,14 @@
      */
     private var skinChanged:Boolean = false;

+    /**
+     *  @private
+     *  True if the skinFactory style has explicitly changed or not.  We use
+     *  this to determine whether we need to actually create a new skin or
+     *  not in validateSkinChange().
+     */
+    private var skinFactoryStyleChanged:Boolean = false;
+

     /**
      *  @private


Transferred from the Adobe Open Source Subversion Repository

Revision: 5098
Author:   gauravj@adobe.com
Date:     2009-02-27T02:21:27.489350Z

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

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

Modified Paths:
--------------
151 paths were modified

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

--- frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
+++ frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingTextStyles.as
@@ -11,45 +11,90 @@

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#blockProgression
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="blockProgression", type="String", enumeration="tb,rl", inherit="yes")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#columnCount
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="columnCount", type="Object", inherit="no")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#columnGap
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="columnGap", type="Number", format="Length", inherit="no")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#columnWidth
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="columnWidth", type="Object", inherit="no")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#firstBaselineOffset
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="firstBaselineOffset", type="Object", inherit="yes")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#leadingModel
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="leadingModel", type="String", enumeration="auto,romanUp,ideographicCenterDown,ideographicCenterUp,ideographicTopDown,ideographicTopUp", inherit="yes")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#tabStops
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="tabStops", type="String", inherit="yes")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#textIndent
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="textIndent", type="Number", format="Length", inherit="yes")]

 /**
  *  @copy flashx.textLayout.formats.ITextLayoutFormat#whiteSpaceCollapse
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 10
+ *  @playerversion AIR 1.5
+ *  @productversion Flex 4
  */
 [Style(name="whiteSpaceCollapse", type="String", enumeration="collapse,preserve", inherit="yes")]


--- as3/com/netease/protobuf/Int64.as
+++ as3/com/netease/protobuf/Int64.as
@@ -28,7 +28,7 @@
 		 * Convert to Number.
 		 */
 		public final function toNumber():Number {
-			return high * 4294967296 + low
+			return high * 4294967296.0 + low
 		}
 		public final function toString(radix:uint = 10):String {
 			if (radix < 2 || radix > 36) {


Remove params "deep" and "clonedObjectsMap" from method Cloner.doCLone().

--- dolly-framework/src/main/actionscript/dolly/Cloner.as
+++ dolly-framework/src/main/actionscript/dolly/Cloner.as
@@ -4,10 +4,8 @@
 import dolly.core.errors.CloningError;
 import dolly.core.metadata.MetadataName;
 import dolly.utils.ClassUtil;
-import dolly.utils.PropertyUtil;

 import flash.utils.ByteArray;
-
 import flash.utils.Dictionary;

 import org.as3commons.reflect.Accessor;
@@ -62,25 +60,20 @@
 		return result;
 	}

-	dolly_internal static function doClone(source:*, deep:int, clonedObjectsMap:Dictionary = null, type:Type = null):* {
-		if (!clonedObjectsMap) {
-			clonedObjectsMap = new Dictionary();
-		}
-
+	dolly_internal static function doClone(source:*, type:Type = null):* {
 		if (!type) {
 			type = Type.forInstance(source);
 		}

-		if(!isTypePreparedForCloning(type)) {
+		if (!isTypePreparedForCloning(type)) {
 			prepareTypeForCloning(type);
 		}

 		const fieldsToClone:Vector.<Field> = findAllWritableFieldsForType(type);

 		for each(var field:Field in fieldsToClone) {
-//			PropertyUtil.cloneProperty(source, clonedInstance, field.name);
 			var fieldType:Type = field.type;
-			if(isTypeCloneable(fieldType) && !isTypePreparedForCloning(fieldType)) {
+			if (isTypeCloneable(fieldType) && !isTypePreparedForCloning(fieldType)) {
 				prepareTypeForCloning(fieldType);
 			}
 		}
@@ -99,9 +92,7 @@

 		failIfTypeIsNotCloneable(type);

-		const deep:int = 2;
-
-		return doClone(source, deep, null, type);
+		return doClone(source, type);
 	}
 }
 }