Transferred from the Adobe Open Source Subversion Repository

Revision: 11468
Author:   smgilson@adobe.com
Date:     2009-11-05T16:54:31.738281Z

Log Message:
-----------
Part 1 of ASDoc localization bug fixes

QE notes: -
Doc notes: -
Bugs: - FLEXDOCS-934, FLEXDOCS-909, FLEXDOCS-908, FLEXDOCS-906, FLEXDOCS-882, FLEXDOCS-883, FLEXDOCS-881
Reviewer: -
Tests run: - checkintests
Is noteworthy for integration: No

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/Pause.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/effects/WipeLeft.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/Tween.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/easing/Quadratic.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/effects/WipeDown.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/HSBColor.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/ArrayUtil.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/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/effects/DefaultListEffect.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/effects/WipeUp.as</path>

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

--- frameworks/projects/mx/src/mx/effects/easing/Quadratic.as
+++ frameworks/projects/mx/src/mx/effects/easing/Quadratic.as
@@ -13,7 +13,7 @@
 {

 /**
- *  The new effects provided as of Flex 4 use classes which implement the
+ *  The Spark effects provided as of Flex 4 use classes which implement the
  *  IEaser interface instead of the easing functions in classes like Quadratic for
  *  the earlier Flex 3 effects. To achieve the same functionality of Quadratic,
  *  create a Power instance with an exponent of 2 and set the
@@ -35,24 +35,24 @@
  */
 public class Quadratic
 {
-	include "../../core/Version.as";
+    include "../../core/Version.as";

-	//--------------------------------------------------------------------------
-	//
-	//  Class methods
-	//
-	//--------------------------------------------------------------------------
+    //--------------------------------------------------------------------------
+    //
+    //  Class methods
+    //
+    //--------------------------------------------------------------------------

     /**
      *  The easeIn() method starts motion from a zero velocity,
      *  and then accelerates motion as it executes.
      *
      *  @param t Specifies time.
-	 *
+     *
      *  @param b Specifies the initial position of a component.
-	 *
+     *
      *  @param c Specifies the total change in position of the component.
-	 *
+     *
      *  @param d Specifies the duration of the effect, in milliseconds.
      *
      *  @return Number corresponding to the position of the component.
@@ -62,22 +62,22 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-	public static function easeIn(t:Number, b:Number,
-								  c:Number, d:Number):Number
-	{
-		return c * (t /= d) * t + b;
-	}
+    public static function easeIn(t:Number, b:Number,
+                                  c:Number, d:Number):Number
+    {
+        return c * (t /= d) * t + b;
+    }

     /**
      *  The easeOut() method starts motion fast,
      *  and then decelerates motion to a zero velocity as it executes.
      *
      *  @param t Specifies time.
-	 *
+     *
      *  @param b Specifies the initial position of a component.
-	 *
+     *
      *  @param c Specifies the total change in position of the component.
-	 *
+     *
      *  @param d Specifies the duration of the effect, in milliseconds.
      *
      *  @return Number corresponding to the position of the component.
@@ -87,24 +87,24 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-	public static function easeOut(t:Number, b:Number,
-								   c:Number, d:Number):Number
-	{
-		return -c * (t /= d) * (t - 2) + b;
-	}
+    public static function easeOut(t:Number, b:Number,
+                                   c:Number, d:Number):Number
+    {
+        return -c * (t /= d) * (t - 2) + b;
+    }

     /**
      *  The easeInOut() method combines the motion
      *  of the easeIn() and easeOut() methods
-	 *  to start the motion from a zero velocity,
+     *  to start the motion from a zero velocity,
      *  accelerate motion, then decelerate to a zero velocity.
      *
      *  @param t Specifies time.
-	 *
+     *
      *  @param b Specifies the initial position of a component.
-	 *
+     *
      *  @param c Specifies the total change in position of the component.
-	 *
+     *
      *  @param d Specifies the duration of the effect, in milliseconds.
      *
      *  @return Number corresponding to the position of the component.
@@ -114,14 +114,14 @@
      *  @playerversion AIR 1.1
      *  @productversion Flex 3
      */
-	public static function easeInOut(t:Number, b:Number,
-									 c:Number, d:Number):Number
-	{
-		if ((t /= d / 2) < 1)
-			return c / 2 * t * t + b;
+    public static function easeInOut(t:Number, b:Number,
+                                     c:Number, d:Number):Number
+    {
+        if ((t /= d / 2) < 1)
+            return c / 2 * t * t + b;

-		return -c / 2 * ((--t) * (t - 2) - 1) + b;
-	}
+        return -c / 2 * ((--t) * (t - 2) - 1) + b;
+    }
 }

 }


- change: added new convenience method UIComponent#addElement, which is similar to UIComponent#addComponent but has an improved argument order and takes AS class instances instead of AS classes

git-svn-id: e38e7cdd6ace00d8230583a2d3b43e9a55f5c011@859 bc4816be-ef27-423a-9c4d-fc420be121a2

--- src/reprise/ui/UIComponent.as
+++ src/reprise/ui/UIComponent.as
@@ -190,42 +190,67 @@
 		 * provided. This instance is immediately attached to the elements display list and
 		 * initialized with the given CSS classes and ID.
 		 *
-		 * @param classes The css classes the component should have.
-		 * @param id The css id the component should have.
+		 * @param cssClasses The css classes the component should have.
+		 * @param cssID The css id the component should have.
 		 * @param componentClass The ActionScript class to instantiate. If this is
 		 * omitted, an instance of UIComponent will be created.
 		 * @param index The index at which the element should be added. If this is
-		 * omitted, the element will be created at the next available index.
+		 * omitted, the element will be added at the next available index.
 		 *
 		 * @return The newly created element
 		 */
-		public function addComponent(classes : String = null, id : String = null,
+		public function addComponent(cssClasses : String = null, cssID : String = null,
 			componentClass : Class = null, index : int = -1) : UIComponent
 		{
 			if (!componentClass)
 			{
 				componentClass = UIComponent;
 			}
-			var component : UIComponent;
+			var component : UIComponent = new componentClass();
+			return addElement(cssClasses, component, cssID, index);
+		}
+
+		/**
+		 * Convenience method that eases the process to add a child element.
+		 *
+		 * Attaches the given element to the display list or creates a new UIComponent if no
+		 * element is provided. This element is then initialized with the given CSS classes and ID.
+		 *
+		 * @param cssClasses The css classes the component should have.
+		 * @param cssID The css id the component should have.
+		 * @param element The Element to add. If this is omitted, an instance of UIComponent will
+		 * be created.
+		 * @param index The index at which the element should be added. If this is
+		 * omitted, the element will be added at the next available index.
+		 *
+		 * @return The newly added element
+		 */
+		public function addElement(cssClasses : String = null, element : UIComponent = null,
+			cssID : String = null, index : int = -1) : UIComponent
+		{
+			if (!element)
+			{
+				element = new UIComponent();
+			}
 			if (index == -1)
 			{
-				component = UIComponent(addChild(new componentClass()));
+				addChild(element);
 			}
 			else
 			{
-				component = UIComponent(addChildAt(new componentClass(), index));
-			}
-			if (id)
-			{
-				component.cssID = id;
-			}
-			if (classes)
-			{
-				component.cssClasses = classes;
-			}
-			return component;
-		}
-
+				addChildAt(element, index);
+			}
+			if (cssID)
+			{
+				element.cssID = cssID;
+			}
+			if (cssClasses)
+			{
+				element.cssClasses = cssClasses;
+			}
+			return element;
+		}
+
 		/**
 		 * initializes the UIComponent structure from the given xml structure,
 		 * creating child views as needed.


Transferred from the Adobe Open Source Subversion Repository

Revision: 3509
Author:   jimurphy@adobe.com
Date:     2008-10-07T18:19:17.646255Z

Log Message:
-----------
Rename of flex -> mx.

For compatibility reasons it was decided that the new functionality remain integrated with the old framework, although we will continue to build two separate SWCs, one with primarily existing framework classes, and one with new Flex 4 classes. This change removes duplicate names from the Flex 4 framework to avoid class name overlapping with the old framework code.  The naming overlap consists of two major areas:  New Components, and New Effects

Modified Paths:
--------------
386 paths were modified

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

--- frameworks/projects/spark/src/spark/effects/CallAction.as
+++ frameworks/projects/spark/src/spark/effects/CallAction.as
@@ -9,13 +9,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-package flex.effects
+package mx.effects
 {
 import flash.events.IEventDispatcher;

 import mx.effects.Effect;
 import mx.effects.IEffectInstance;
-import flex.effects.effectClasses.CallFunctionActionInstance;
+import mx.effects.effectClasses.CallActionInstance;

 //--------------------------------------
 //  Excluded APIs
@@ -30,9 +30,9 @@
  * effect sequences where some function call can be choreographed
  * with other effects.
  *
- * @see flex.effects.effectClasses.CallFunctionActionInstance
+ * @see mx.effects.effectClasses.CallFunctionActionInstance
  */
-public class CallFunctionAction extends Effect
+public class CallAction extends Effect
 {
     include "../core/Version.as";

@@ -47,11 +47,11 @@
      *
      *  @param target The Object to animate with this effect.
      */
-    public function CallFunctionAction(target:Object = null)
+    public function CallAction(target:Object = null)
     {
         super(target);

-        instanceClass = CallFunctionActionInstance;
+        instanceClass = CallActionInstance;
     }

     //--------------------------------------------------------------------------
@@ -92,7 +92,7 @@
     {
         super.initInstance(instance);

-        var callInstance:CallFunctionActionInstance = CallFunctionActionInstance(instance);
+        var callInstance:CallActionInstance = CallActionInstance(instance);

         callInstance.functionName = functionName;
         callInstance.parameters = parameters;


Transferred from the Adobe Open Source Subversion Repository

Revision: 4554
Author:   smgilson@adobe.com
Date:     2009-01-16T13:39:03.727931Z

Log Message:
-----------
Fix ASDoc comment to replace literal < with <

QE Notes: None
Doc Notes: None
Bugs: -

Modified Paths:
--------------
/flex/sdk/trunk/frameworks/projects/flex4/src/mx/layout/TileLayout.as

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

--- frameworks/projects/spark/src/spark/layouts/TileLayout.as
+++ frameworks/projects/spark/src/spark/layouts/TileLayout.as
@@ -50,7 +50,7 @@
  *
  *  In other cases the measured size may not be big enough to fit all elements -
  *  for example when both columnCount and rowCount are explicitly set to values
- *  such that columnCount * rowCount < element count.
+ *  such that columnCount * rowCount < element count.
  *
  *  The minimum measured size is calculated the same way as the measured size but
  *  it's guaranteed to encompass enough rows/columns along the minor axis to fit


RTSPClient: Buffer less on pause

RTSPClient: Buffer less on pause

The NetStream must be closed when pausing the RTP stream (via RTSP).
If not, it seems as NetStream is interpreting this pause as
extremely bad connection to server and buffers data for as many
seconds as we were paused. Not what we want for live data.

--- src/com/axis/rtspclient/RTSPClient.as
+++ src/com/axis/rtspclient/RTSPClient.as
@@ -4,6 +4,7 @@
   import flash.events.Event;
   import flash.utils.ByteArray;
   import flash.net.Socket;
+  import mx.utils.ObjectUtil;

   import com.axis.rtspclient.FLVMux;
   import com.axis.rtspclient.RTP;
@@ -62,13 +63,12 @@
     }

     public function start():Boolean {
-      trace('state:', state);
       if (state !== STATE_INITIAL) {
         trace('Cannot start unless in initial state.');
         return false;
       }
+      sendDescribeReq();
       state = STATE_DESCRIBE_SENT;
-      sendDescribeReq();
       return true;
     }

@@ -78,8 +78,8 @@
         trace('Unable to pause a stream if not playing');
         return false;
       }
+      sendPauseReq();
       state = STATE_PAUSE_SENT;
-      sendPauseReq();
       return true;
     }

@@ -89,8 +89,8 @@
         trace('Unable to resume a stream if not paused.');
         return false;
       }
+      sendPlayReq();
       state = STATE_PLAY_SENT;
-      sendPlayReq();
       return true;
     }

@@ -100,8 +100,8 @@
         trace('Unable to stop if we never reached play.');
         return false;
       }
+      sendTeardownReq();
       state = STATE_TEARDOWN_SENT;
-      sendTeardownReq();
       return true;
     }

@@ -333,6 +333,11 @@
     }

     private function sendPlayReq():void {
+      if (state === STATE_PAUSED) {
+        /* NetStream was closed when pausing. Play it again if that is the case. */
+        Player.getNetStream().play(null);
+      }
+
       var req:String =
         "PLAY " + contentBase + " RTSP/1.0\r\n" +
         "CSeq: " + (++cSeq) + "\r\n" +
@@ -344,6 +349,11 @@
     }

     private function sendPauseReq():void {
+      /* NetStream must be closed here, otherwise it will think of this rtsp pause
+         as a very bad connection and buffer a lot before playing again. Not
+         excellent for live data. */
+      Player.getNetStream().close();
+
       var req:String =
         "PAUSE " + contentBase + " RTSP/1.0\r\n" +
         "CSeq: " + (++cSeq) + "\r\n" +


call demux.close() when finished with it

--- src/org/mangui/hls/loader/FragmentLoader.as
+++ src/org/mangui/hls/loader/FragmentLoader.as
@@ -554,7 +554,7 @@

             if (_demux) {
                 _demux.cancel();
-                // XXX bahaa: _demux.close();
+                _demux.close();
                 _demux = null;
             }

@@ -745,7 +745,8 @@
                 _keystreamloader.addEventListener(Event.COMPLETE, _keyLoadCompleteHandler);
             }
             if (_hasDiscontinuity || _switchlevel) {
-                // XXX bahaa: _demux.close();
+                if (_demux)
+                    _demux.close();
                 _demux = null;
             }
             frag.metrics.loading_request_time = getTimer();


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

--- frameworks/projects/mobilecomponents/src/spark/components/ContentBackgroundAppearance.as
+++ frameworks/projects/mobilecomponents/src/spark/components/ContentBackgroundAppearance.as
@@ -1,11 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2011 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.
 //
 ////////////////////////////////////////////////////////////////////////////////


 - changed
 	- ImageResource
 		- ::bitmap() has now second parameter for smoothing

git-svn-id: e38e7cdd6ace00d8230583a2d3b43e9a55f5c011@575 bc4816be-ef27-423a-9c4d-fc420be121a2

--- src/reprise/external/ImageResource.as
+++ src/reprise/external/ImageResource.as
@@ -43,7 +43,7 @@
 			return m_resource;
 		}

-		public function bitmap(backgroundColor:Number = NaN) : BitmapData
+		public function bitmap(backgroundColor:Number = NaN, smoothing : Boolean = false) : BitmapData
 		{
 			var transparent : Boolean = false;
 			if (isNaN(backgroundColor))
@@ -53,7 +53,7 @@
 			}
 			var bmp : BitmapData = new BitmapData(m_loader.width, m_loader.height,
 				transparent, backgroundColor);
-			bmp.draw(m_loader);
+			bmp.draw(m_loader, null, null, null, null, smoothing);
 			return bmp;
 		}


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

--- frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.as
+++ frameworks/projects/automation/src/mx/automation/codec/ListDataObjectCodec.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.automation.codec
 {


Transferred from the Adobe Open Source Subversion Repository

Revision: 3973
Author:   rfrishbe@adobe.com
Date:     2008-10-30T20:30:13.007923Z

Log Message:
-----------
Adding IVisualContainer interface.  Group, FxContainer, and FxScroller implement this interface now.  Added owner and parent to IVisualItem.  GraphicElement and UIComponent implement this interface--work had to be done in GraphicElement to do this.  In doing so, elementHost is going to be renamed to parent.  For now, I added parent in GraphicElement and left elementHost in there; however, it is removed from IGraphicElement.  I’ve removed all references to elementHost in our code; however, I think mustella needs to be updated as do mustella tests, so I’m not going to remove elementHost until later.

Most of the changes here are name changes dealing with "elementHost" -> "parent".  If we decide that Gumbo components only support IVisualItems, we should clean up some of the code, but for now, I kept any assumptions that were in the original code (meaning we may be able to support DisplayObjects and old definitions of UIComponents/IUIComponents that aren’t IVisualItems).

I ran checkin tests, Group mustella tests, DataGroup mustella tests, FxContainer mustella tests, graphic tags tests, and all effects Mustella tests.

QE Notes: We will need to update mustella and mustella tests to use elementHost rather than parent.  We can also update mustella to use IVisualContainer rather than what it's doing now.  However, let's wait on these changes for now.  I'll send out an email when we're ready to make these changes and remove elementHost from GraphicElement.
Doc Notes: None
Bugs: -
Reviewer: Chet

Modified Paths:
--------------
<path kind="file" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/core/IVisualContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxScroller.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/RemoveActionInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/RemoveAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/DataGroup.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxFadeInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/FxFade.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IUIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/Group.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxAnimate3DInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxAnimateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IVisualItem.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/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/AddActionInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/graphics/graphicsClasses/GraphicElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/AddAction.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/components/FxContainer.as</path>

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

--- frameworks/projects/spark/src/spark/effects/supportClasses/AnimateInstance.as
+++ frameworks/projects/spark/src/spark/effects/supportClasses/AnimateInstance.as
@@ -111,7 +111,7 @@
      * effect to manually keep the item around and remove it when the
      * transition completes. In order to use this capability, subclasses
      * should set this variable to true and also expose the "parent"
-     * and "elementHost" properties in their affectedProperties array so
+     * property in their affectedProperties array so
      * that the effect instance has enough information about the target
      * and container to do the job.
      */
@@ -584,16 +584,6 @@
                     needsRemoval = true;
                 }
             }
-            else if ("elementHost" in target && !target.elementHost)
-            {
-                var hostStart:* = propertyChanges.start["elementHost"];
-                var hostEnd:* = propertyChanges.end["elementHost"];
-                if (hostStart && !hostEnd)
-                {
-                    hostStart.addItem(target);
-                    needsRemoval = true;
-                }
-            }
         }
     }

@@ -623,13 +613,6 @@
                     else
                         parentStart.removeChild(target);
                 }
-            }
-            else if ("elementHost" in target && target.elementHost)
-            {
-                var hostStart:* = propertyChanges.start["elementHost"];
-                var hostEnd:* = propertyChanges.end["elementHost"];
-                if (hostStart && !hostEnd)
-                    hostStart.removeItem(target);
             }
         }
     }
@@ -672,10 +655,6 @@
                     {
                         parentH = target.parent.height;
                     }
-                    else if ("elementHost" in target && target.elementHost)
-                    {
-                        parentH = target.elementHost.height;
-                    }
                 }

                 // For 'right' or 'horizontalCenter' we need the parent width
@@ -685,10 +664,6 @@
                     if ("parent" in target && target.parent)
                     {
                         parentW = target.parent.width;
-                    }
-                    else if ("elementHost" in target && target.elementHost)
-                    {
-                        parentW = target.elementHost.width;
                     }
                 }

@@ -851,10 +826,7 @@
         {
             parent = target.parent;
         }
-        else if ("elementHost" in target && target.elementHost)
-        {
-            parent = target.elementHost;
-        }
+
         if (parent)
         {
             if (parent is Container)


Transferred from the Adobe Open Source Subversion Repository

Revision: 4030
Author:   clucier@adobe.com
Date:     2008-11-06T18:54:43.093125Z

Log Message:
-----------
Addressing a few FxAnimateFilter bugs.
Doc Notes: None
Bugs: None
Reviewer: Chet

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxAnimateInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/effects/effectClasses/FxAnimateFilterInstance.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/mx/filters/ShaderFilter.as</path>

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

--- frameworks/projects/spark/src/spark/effects/supportClasses/AnimateInstance.as
+++ frameworks/projects/spark/src/spark/effects/supportClasses/AnimateInstance.as
@@ -324,24 +324,7 @@
             if (!property || (property == ""))
                 throw new Error("Illegal property value: " + property);

-            if (property in target)
-            {
-                isStyleMap[property] = false;
-            }
-            else
-            {
-                try {
-                    target.getStyle(property);
-                    isStyleMap[property] = true;
-                }
-                catch (err:Error)
-                {
-                    throw new Error("Property " + property + " is neither " +
-                        "a property or a style on object " + target + ": " + err);
-                }
-                // TODO: check to make sure that the throw above won't
-                // let the code flow get to here
-            }
+            setupStyleMapEntry(property);

             // Set any NaN from/to values to the current values in the target
             if (!isNaN(propValues[0]))
@@ -767,7 +750,7 @@
      * set on the target prior to completely setting up the effect's
      * propertyValuesList data values (from which the styleMap is created)
      */
-    private function setupStyleMapEntry(property:String):void
+    protected function setupStyleMapEntry(property:String):void
     {
         // TODO (chaase): Find a better way to set this up just once
         if (isStyleMap[property] == undefined)


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

--- frameworks/projects/spark/src/spark/components/supportClasses/InvalidatingSprite.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/InvalidatingSprite.as
@@ -1,13 +1,3 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  ADOBE SYSTEMS INCORPORATED
-//  Copyright 2008 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.components.supportClasses
 {


+ deliberately break the build to test cruise control

git-svn-id: d62bde4b5aa582fdf07c8d403e53e0399a7ed285@11350 fa20e4f9-1d0a-0410-b5f3-dc9c16b8b17c

--- WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
+++ WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
@@ -711,7 +711,7 @@
           trace("debugClick "+event + " " +event.target);
       }

-      /** setX( Number:x )
+      /** setX( String:x )
           o Moves the sprite to the specified x coordinate
       */
       public function setX ( x:Number ):void {


viewport now has the correct position when added anywhere in the display list

--- src/aerys/minko/stage/Viewport.as
+++ src/aerys/minko/stage/Viewport.as
@@ -15,6 +15,7 @@

 	import flash.display.Sprite;
 	import flash.display.Stage;
+	import flash.display.Stage3D;
 	import flash.display.StageAlign;
 	import flash.display.StageScaleMode;
 	import flash.display3D.Context3D;
@@ -39,11 +40,12 @@

 		private static const ZERO2		: Point						= new Point();

+		private var _version			: uint						= 0;
+
 		private var _width				: Number					= 0.;
 		private var _height				: Number					= 0.;
 		private var _autoResize			: Boolean					= false;
-
-		private var _version			: uint						= 0;
+		private var _aa					: int						= 0;

 		private var _wdExtracterQuery	: WorldDataExtracterVisitor	= null;
 		private var _renderingQuery		: RenderingVisitor			= null;
@@ -52,13 +54,10 @@
 		private var _sceneSize			: uint						= 0;
 		private var _drawTime			: int						= 0;

+		private var _stage3d			: Stage3D					= null;
 		private var _rendererClass		: Class						= null;
 		private var _renderer			: IRenderer					= null;
-		private var _context			: Context3D					= null;
-
-		private var _aa					: int						= 0;
-
-		private var _defaultEffect	: IEffect			= new BasicEffect();
+		private var _defaultEffect		: IEffect					= new BasicEffect();

 		public function get version() : uint
 		{
@@ -94,7 +93,7 @@
 				_width = value;
 				++_version;

-				resetContext3D();
+				resetStage3D();
 			}
 		}

@@ -120,7 +119,7 @@
 				_height = value;
 				++_version;

-				resetContext3D();
+				resetStage3D();
 			}
 		}

@@ -142,7 +141,7 @@
 				_aa = value;
 				++_version;

-				resetContext3D();
+				resetStage3D();
 			}
 		}

@@ -195,7 +194,7 @@

 		public function get renderMode() : String
 		{
-			return _context ? _context.driverInfo : null;
+			return _stage3d ? _stage3d.context3D.driverInfo : null;
 		}

 		/**
@@ -218,13 +217,11 @@
 			_rendererClass = rendererType || DirectRenderer;

 			addEventListener(Event.ADDED_TO_STAGE, addedToStageHandler);
+			addEventListener(Event.ADDED, addedHandler);
 		}

 		private function addedToStageHandler(event : Event) : void
 		{
-			stage.addChild(this);
-			stage.scaleMode = StageScaleMode.NO_SCALE;
-			stage.align = StageAlign.TOP_LEFT;
 			stage.stage3Ds[0].addEventListener(Event.CONTEXT3D_CREATE, contextCreatedHandler);
 			stage.stage3Ds[0].requestContext3D(Context3DRenderMode.AUTO);

@@ -237,6 +234,11 @@
 			}

 			showLogo();
+		}
+
+		private function addedHandler(event : Event) : void
+		{
+			updateRectangle();
 		}

 		private function stageResizeHandler(event : Event) : void
@@ -248,23 +250,24 @@
 			if (stage.stageHeight)
 				height = stage.stageHeight;

-			resetContext3D();
+			resetStage3D();
 		}

 		private function contextCreatedHandler(event : Event) : void
 		{
-			_context = stage.stage3Ds[0].context3D;
-			resetContext3D();
-		}
-
-		private function resetContext3D(event : Event = null) : void
-		{
-			if (_context)
+			_stage3d = stage.stage3Ds[0];
+
+			resetStage3D();
+		}
+
+		private function resetStage3D(event : Event = null) : void
+		{
+			if (_stage3d)
 			{
 				updateRectangle();
-				_context.configureBackBuffer(_width, _height, _aa, true);
-
-				_renderer = new DirectRenderer(this, _context);
+				_stage3d.context3D.configureBackBuffer(_width, _height, _aa, true);
+
+				_renderer = new DirectRenderer(this, _stage3d.context3D);

 				_wdExtracterQuery = new WorldDataExtracterVisitor();
 				_renderingQuery = new RenderingVisitor(_renderer);
@@ -273,11 +276,11 @@

 		private function updateRectangle() : void
 		{
-			if (_context)
+			if (_stage3d)
 			{
 				var origin : Point = localToGlobal(ZERO2);

-				stage.stage3Ds[0].viewPort = new Rectangle(origin.x, origin.y, _width, _height);
+				_stage3d.viewPort = new Rectangle(origin.x, origin.y, _width, _height);
 			}
 		}


Initial ChildInjector ApplicationDomain fix

--- src/org/robotlegs/mvcs/Context.as
+++ src/org/robotlegs/mvcs/Context.as
@@ -129,8 +129,10 @@
 			if (_contextView != value)
 			{
 				_contextView = value;
-				mediatorMap.contextView = value;
-				viewMap.contextView = value;
+				// Hack: We have to clear these out and re-map them
+				_commandMap = null;
+				_mediatorMap = null;
+				_viewMap = null;
 				mapInjections();
 				checkAutoStartup();
 			}
@@ -145,7 +147,7 @@
 		 */
 		protected function get injector():IInjector
 		{
-			return _injector || (_injector = new SwiftSuspendersInjector());
+			return _injector ||= new SwiftSuspendersInjector();
 		}

 		/**
@@ -161,7 +163,7 @@
 		 */
 		protected function get reflector():IReflector
 		{
-			return _reflector || (_reflector = new SwiftSuspendersReflector());
+			return _reflector ||= new SwiftSuspendersReflector();
 		}

 		/**
@@ -177,7 +179,7 @@
 		 */
 		protected function get commandMap():ICommandMap
 		{
-			return _commandMap || (_commandMap = new CommandMap(eventDispatcher, injector.createChild(), reflector));
+			return _commandMap ||= new CommandMap(eventDispatcher, createChildInjector(), reflector);
 		}

 		/**
@@ -193,7 +195,7 @@
 		 */
 		protected function get mediatorMap():IMediatorMap
 		{
-			return _mediatorMap || (_mediatorMap = new MediatorMap(contextView, injector.createChild(), reflector));
+			return _mediatorMap ||= new MediatorMap(contextView, createChildInjector(), reflector);
 		}

 		/**
@@ -209,7 +211,7 @@
 		 */
 		protected function get viewMap():IViewMap
 		{
-			return _viewMap || (_viewMap = new ViewMap(contextView, injector));
+			return _viewMap ||= new ViewMap(contextView, injector);
 		}

 		/**
@@ -266,6 +268,16 @@
 			contextView.removeEventListener(Event.ADDED_TO_STAGE, onAddedToStage);
 			startup();
 		}
+
+		/**
+		 * @private
+		 */
+		protected function createChildInjector():IInjector
+		{
+			if (contextView && contextView.loaderInfo)
+				return injector.createChild(contextView.loaderInfo.applicationDomain);
+			return injector.createChild();
+		}

 	}
 }


Transferred from the Adobe Open Source Subversion Repository

Revision: 5101
Author:   gauravj@adobe.com
Date:     2009-02-27T05:22:45.887116Z

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:
--------------
663 paths were modified

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

--- frameworks/projects/framework/src/mx/collections/errors/CollectionViewError.as
+++ frameworks/projects/framework/src/mx/collections/errors/CollectionViewError.as
@@ -17,6 +17,11 @@
  *  within a collection that are not related to specific activities
  *  such as Cursor seeking.
  *  Errors of this class are thrown by the ListCollectionView class.
+ *
+ *  @langversion 3.0
+ *  @playerversion Flash 9
+ *  @playerversion AIR 1.1
+ *  @productversion Flex 3
  */
 public class CollectionViewError extends Error
 {
@@ -32,6 +37,11 @@
      *  Constructor.
 	 *
 	 *  @param message A message providing information about the error cause.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 9
+     *  @playerversion AIR 1.1
+     *  @productversion Flex 3
      */
     public function CollectionViewError(message:String)
     {


Transferred from the Adobe Open Source Subversion Repository

Revision: 2919
Author:   aharui@adobe.com
Date:     2008-08-20T15:15:30.618954Z

Log Message:
-----------
Subversion always seems to hide new files

Modified Paths:
--------------
<path kind="file" action="A">/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/managers/systemClasses/StageEventProxy.as</path>
<path kind="file" action="A">/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/managers/systemClasses/PlaceholderData.as</path>
<path kind="dir" action="A">/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/managers/systemClasses</path>
<path kind="file" action="A">/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/managers/systemClasses/RemotePopUp.as</path>
<path kind="file" action="A">/flex/sdk/branches/3.0.x/frameworks/projects/framework/src/mx/managers/systemClasses/EventProxy.as</path>

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

--- frameworks/projects/framework/src/mx/managers/systemClasses/PlaceholderData.as
+++ frameworks/projects/framework/src/mx/managers/systemClasses/PlaceholderData.as
@@ -0,0 +1,35 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2003-2006 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.managers.systemClasses
+{
+import flash.events.IEventDispatcher;
+
+[ExcludeClass]
+
+/**
+ * Simple class to track placeholders for RemotePopups.
+ */
+public class PlaceholderData extends Object
+{
+	public function PlaceholderData(id:String, bridge:IEventDispatcher, data:Object)
+	{
+		this.id = id;
+		this.bridge = bridge;
+		this.data = data;
+	}
+
+	public var id:String;				// id of string at this node in the display list
+	public var bridge:IEventDispatcher; // bridge to next child application
+	public var data:Object;				// either a popup or a bridge to the next application
+}
+
+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 88
Author:   open-source-svn-admin@adobe.com
Date:     2008-01-03T22:47:56.499469Z

Log Message:
-----------
Perforce Change 191925 by proberts@proberts-laptop-flex on 2008/01/03 16:47:12 Severity: ignore Details: doc additions/clean up for FlexNativeMenu. Also FLEXDOCS-320 (update documentation for FlexNativeMenuEvent.MENU_SHOW to explain that the index, label, and item properties are null) Affected files ...

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/in/air/air_version.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/Consumer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/NoChannelAvailableError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemHistoryButton.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/DirectHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemTree.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/HTML.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/config/ServerConfig.as</path>
<path kind="file" action="M">/flex/sdk/trunk/in/air/mac/AIR Integration Kit.tbz2</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingConnectionHandler.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/HTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/MessagingError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/InvalidChannelError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXDecoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractProducer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/MessageSerializationError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/config/ConfigMap.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/Channel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemComboBox.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemList.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/in/air/win/AIR Integration Kit.zip</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractConsumer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FileSystemDataGrid.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXContext.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/AMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/events/FlexNativeMenuEvent.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/PollingChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/lib/flex-messaging-common.jar</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/NetConnectionChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXHeader.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/remoting/mxml/RemoteObject.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/Tree.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/listClasses/ListBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/StreamingAMFChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/mxml/Grammar.jj</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ConsumerMessageDispatcher.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/SecureHTTPChannel.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/errors/InvalidDestinationError.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXResult.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/channels/amfx/AMFXEncoder.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/ChannelSet.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/controls/FlexNativeMenu.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/rpc/src/mx/messaging/AbstractMessageStore.as</path>

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

--- frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as
+++ frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as
@@ -1,21 +1,14 @@
-/*************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * __________________
- *
- *  [2002] - [2007] Adobe Systems Incorporated
- *  All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated
- * and its suppliers and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- */
+////////////////////////////////////////////////////////////////////////////////
+//
+//  ADOBE SYSTEMS INCORPORATED
+//  Copyright 2007 Adobe Systems Incorporated
+//  All Rights Reserved.
+//
+//  NOTICE: Adobe permits you to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 package mx.messaging.channels
 {

@@ -59,4 +52,4 @@
     }
 }

-}+}


Transferred from the Adobe Open Source Subversion Repository

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

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

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

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

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

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

--- frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as
+++ frameworks/projects/rpc/src/mx/messaging/channels/SecureStreamingAMFChannel.as
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * __________________
+ *
+ *  [2002] - [2007] Adobe Systems Incorporated
+ *  All Rights Reserved.
+ *
+ * NOTICE:  All information contained herein is, and remains
+ * the property of Adobe Systems Incorporated and its suppliers,
+ * if any.  The intellectual and technical concepts contained
+ * herein are proprietary to Adobe Systems Incorporated
+ * and its suppliers and may be covered by U.S. and Foreign Patents,
+ * patents in process, and are protected by trade secret or copyright law.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe Systems Incorporated.
+ */
+package mx.messaging.channels
+{
+
+/**
+ *  The SecureStreamingAMFChannel class is identical to the StreamingAMFChannel
+ *  class except that it uses a secure protocol, HTTPS, to send messages to an
+ *  AMF endpoint.
+ */
+public class SecureStreamingAMFChannel extends StreamingAMFChannel
+{
+    //--------------------------------------------------------------------------
+    //
+    // Constructor
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  Creates an new SecureStreamingAMFChannel instance.
+     *
+	 *  @param id The id of this Channel.
+	 *
+	 *  @param uri The uri for this Channel.
+     */
+    public function SecureStreamingAMFChannel(id:String = null, uri:String = null)
+    {
+        super(id, uri);
+    }
+
+    //--------------------------------------------------------------------------
+    //
+    // Properties
+    //
+    //--------------------------------------------------------------------------
+
+    /**
+     *  Returns the protocol for this channel (https).
+     */
+    override public function get protocol():String
+    {
+        return "https";
+    }
+}
+
+}


Transferred from the Adobe Open Source Subversion Repository

Revision: 19467
Author:   cframpto@adobe.com
Date:     2010-12-17T21:27:38.093578Z

Log Message:
-----------
Fix DG tooltips for rtl layoutDirection and centralize the toolTipShowHandler() for the DG item renderers.  Fix optimization in scrollPositionChanged so it works as intended.
Added for tooling - if UIComponentGlobals.designMode, initialize exceptions will be caught and an intializeError event dispatched.

QE notes:
Doc notes:
Bugs: SDK-28743, SDK-28894
Reviewer: Ryan (SDK-28743), Hans (SDK-28894)
Tests run: cyclone
Is noteworthy for integration: yes: if UIComponentGlobals.designMode, initialize exceptions will be caught and an intializeError event dispatched

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/UITextFieldGridItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderGroupLayout.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/TextFieldGridItemRendererInclude.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/gridClasses/GridItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DefaultGridItemRenderer.as</path>

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

--- frameworks/projects/spark/src/spark/skins/spark/UITextFieldGridItemRenderer.as
+++ frameworks/projects/spark/src/spark/skins/spark/UITextFieldGridItemRenderer.as
@@ -18,10 +18,14 @@
 {
 import flash.text.TextFieldAutoSize;

+import mx.core.mx_internal;
 import mx.core.UITextField;
 import mx.styles.IStyleClient;

+import spark.components.gridClasses.GridItemRenderer;
 import spark.components.gridClasses.IGridItemRenderer;
+
+use namespace mx_internal;

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

         autoSize = TextFieldAutoSize.NONE;

-        addEventListener(ToolTipEvent.TOOL_TIP_SHOW, toolTipShowHandler);
+        addEventListener(ToolTipEvent.TOOL_TIP_SHOW,
+						 GridItemRenderer.toolTipShowHandler);
     }

 include "TextFieldGridItemRendererInclude.as"


Update to use the ESC api in bug 432242

Update to use the ESC api in bug 432242

--- axscript/mscom.as
+++ axscript/mscom.as
@@ -239,16 +239,10 @@

 	public function compileString(str, fname:String = "", startLineNumber:int = 0)
 	{
-// Bug 432242 is adding a 'compileStringToBytes' function, but its not checked in
-// yet - so reimplement it ourselves.  Note that line numbers will be broken until
-// that bug is fixed.
-//		use namespace ESC;
-//		var bytes = ESC::compileStringToBytes(str, fname, startLineNumber+1);
-		var bytes;
-		ESC::compile( function () { return str },
-					  function (abc) { bytes = abc.getBytes() },
-					  fname);
-		return bytes;
+		// NOTE: This requires the patch to bug 432242 (and by the time this
+		// comment is stale, we should remove compileString() completely and
+		// inline it!
+		return ESC::compileStringToBytes(str, fname, startLineNumber+1);
 	}
 }


fix Signal.add() and Signal.remove() error checks to take the tmp _toAdd/_toRemove tmp lists into account

--- src/aerys/minko/type/Signal.as
+++ src/aerys/minko/type/Signal.as
@@ -27,7 +27,22 @@
 		public function add(callback : Function) : void
 		{
             if (_callbacks.indexOf(callback) >= 0)
-                throw new Error('The same callback cannot be added twice.');
+            {
+                var removeIndex : int = _toRemove ? _toRemove.indexOf(callback) : -1;
+
+                // if that callback is in the temp. remove list, we simply remove it from this list
+                // instead of removing/adding it all over again
+                if (removeIndex >= 0)
+                {
+                    --_numRemoved;
+                    _toRemove[removeIndex] = _toRemove[_numRemoved];
+                    _toRemove.length = _numRemoved;
+
+                    return;
+                }
+                else
+                    throw new Error('The same callback cannot be added twice.');
+            }

 			if (_executed)
 			{
@@ -49,7 +64,20 @@
 			var index : int = _callbacks.indexOf(callback);

 			if (index < 0)
-				throw new Error('This callback does not exist.');
+            {
+                var addIndex : int = _toAdd ? _toAdd.indexOf(callback) : -1;
+
+                // if that callback is in the temp. add list, we simply remove it from this list
+                // instead of adding/removing it all over again
+                if (addIndex)
+                {
+                    --_numAdded;
+                    _toAdd[addIndex] = _toAdd[_numAdded];
+                    _toAdd.length = _numAdded;
+                }
+                else
+    				throw new Error('This callback does not exist.');
+            }

 			if (_executed)
 			{


Fix error vs. fatal confusion.

Fix error vs. fatal confusion.

	* build-aux/base.as: here.

--- build-aux/base.as
+++ build-aux/base.as
@@ -117,7 +117,7 @@
   local thing=$[3]
   shift 3
   test $flag "$thing" ||
-    fatal OSFILE "$error" "$[@]"
+    error OSFILE "$error" "$[@]"
 }

 # require_dir DIR [HINT]


Tweaked beq descr

Tweaked beq descr

--- src/Values/InstructionValue.as
+++ src/Values/InstructionValue.as
@@ -43,7 +43,7 @@
 				case OpcodeValue.OP_JMP:
 					return operation.getName() + " OVER " + destArg;
 				case OpcodeValue.OP_BEQ:
-					return operation.getName() + " OVER " + destArg + " IF R" + sourceArg +" is R"+targetArg;
+					return operation.getName() + " R" + sourceArg +"=R"+targetArg + " OVER " + destArg;

 				case OpcodeValue.OP_SAVI:
 					return operation.getName() + " M[" + targetArg + "]=" + sourceArg;
@@ -78,7 +78,7 @@
 				case OpcodeValue.OP_JMP:
 					return formatFrom("OVER {}", [U.DESTINATION]);
 				case OpcodeValue.OP_BEQ:
-					return formatFrom("OVER {} IF R{}==R{}", [U.DESTINATION, U.SOURCE, U.TARGET]);
+					return formatFrom("R{}=R{} OVER {}", [U.SOURCE, U.TARGET, U.DESTINATION]);

 				case OpcodeValue.OP_SAVI:
 					return formatFrom("M[{}] = {}", [U.TARGET, U.SOURCE]);


be smarter about when ContentArea is resized

--- frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
+++ frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
@@ -81,10 +81,62 @@
 		override public function set strand(value:IStrand):void
 		{
 			super.strand = value;
-            changeHandler(null);
-            IEventDispatcher(_strand).addEventListener("childrenAdded", changeHandler);
-            IEventDispatcher(_strand).addEventListener("widthChanged", changeHandler);
-            IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler);
+
+            var host:UIBase = value as UIBase;
+
+            if (_strand.getBeadByType(IBeadLayout) == null)
+            {
+                var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
+                if (c)
+                {
+                    var layout:IBeadLayout = new c() as IBeadLayout;
+                    _strand.addBead(layout);
+                }
+            }
+
+            if (host.isWidthSizedToContent() && host.isHeightSizedToContent())
+            {
+                host.addEventListener("childrenAdded", changeHandler);
+                checkActualParent();
+            }
+            else
+            {
+                host.addEventListener("widthChanged", changeHandler);
+                host.addEventListener("heightChanged", changeHandler);
+                host.addEventListener("sizeChanged", sizeChangeHandler);
+                if (!isNaN(host.explicitWidth) && !isNaN(host.explicitHeight))
+                    sizeChangeHandler(null);
+                else
+                    checkActualParent();
+            }
+        }
+
+        private function checkActualParent():Boolean
+        {
+            var host:UIBase = UIBase(_strand);
+            if (contentAreaNeeded())
+            {
+                if (actualParent == null || actualParent == host)
+                {
+                    actualParent = new ContainerContentArea();
+                    host.addElement(actualParent);
+                    Container(host).setActualParent(actualParent);
+                }
+                return true;
+            }
+            else
+            {
+                actualParent = host;
+            }
+            return false;
+        }
+
+        private function sizeChangeHandler(event:Event):void
+        {
+            var host:UIBase = UIBase(_strand);
+            host.addEventListener("childrenAdded", changeHandler);
+            host.addEventListener("layoutNeeded", changeHandler);
+            changeHandler(event);
         }

         private var inChangeHandler:Boolean;
@@ -107,14 +159,8 @@

 			var padding:Object = determinePadding();

-			if (contentAreaNeeded())
-			{
-                if (actualParent == null || actualParent == host)
-                {
-    				actualParent = new ContainerContentArea();
-    				host.addElement(actualParent);
-                    Container(host).setActualParent(actualParent);
-                }
+			if (checkActualParent())
+			{
 				actualParent.x = padding.paddingLeft;
 				actualParent.y = padding.paddingTop;
                 var pb:Number = padding.paddingBottom;
@@ -124,18 +170,14 @@
                 if (isNaN(pr))
                     pr = 0;
                 if (!isNaN(host.explicitWidth) || !isNaN(host.percentWidth))
-                    actualParent.width = host.width - padding.paddingLeft - pr;
+                    actualParent.setWidth(host.width - padding.paddingLeft - pr);
                 else
                     host.dispatchEvent(new Event("widthChanged"));

                 if (!isNaN(host.explicitHeight) || !isNaN(host.percentHeight))
-                    actualParent.height = host.height - padding.paddingTop - pb;
+                    actualParent.setHeight(host.height - padding.paddingTop - pb);
                 else
                     host.dispatchEvent(new Event("heightChanged"));
-			}
-			else
-			{
-				actualParent = host;
 			}

 			var backgroundColor:Object = ValuesManager.valuesImpl.getValue(host, "background-color");
@@ -161,16 +203,6 @@
 				if (host.getBeadByType(IBorderBead) == null)
                     host.addBead(new (ValuesManager.valuesImpl.getValue(host, "iBorderBead")) as IBead);
 			}
-
-            if (_strand.getBeadByType(IBeadLayout) == null)
-            {
-                var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
-                if (c)
-                {
-                    var mapper:IBeadLayout = new c() as IBeadLayout;
-                    _strand.addBead(mapper);
-                }
-            }

             inChangeHandler = false;
 		}


Transferred from the Adobe Open Source Subversion Repository

Revision: 17841
Author:   hmuller@adobe.com
Date:     2010-09-24T15:36:59.172298Z

Log Message:
-----------
The ColumnHeaderBar classes have been substantially revised simplified and some of the horizontal scrolling flashing has been eliminated.  I've temporarily removed the column header bar event handling code since we weren't using it.   It will be restored when the column resizing feature is added.

The new versions of ColumnHeaderBar and ColumnHeaderBarLayout only depend on Grid (not GridDimensions or GridLayout).

QE notes: Failing mustella tests (bitmap and geometry changes) have been excluded
Doc notes:
Bugs: SDK-27967
Reviewer: Kevin
Tests run: checkin, mustella cyclone
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/IGridItemRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as</path>
<path kind="file" action="A">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DefaultGridHeaderRendererSkin.mxml</path>
<path kind="file" action="A">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DefaultGridHeaderRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/spark-manifest.xml</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridRowNode.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridLayout.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/DataGrid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/ColumnHeaderBarLayout.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Grid.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/IGridRowBackground.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/SparkClasses.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/ColumnHeaderBar.as</path>
<path kind="file" action="D">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/DefaultColumnHeaderRenderer.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridColumn.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/defaults.css</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/supportClasses/GridRowList.as</path>

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

--- frameworks/projects/spark/src/spark/components/gridClasses/IGridItemRenderer.as
+++ frameworks/projects/spark/src/spark/components/gridClasses/IGridItemRenderer.as
@@ -1,3 +1,14 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.components
 {
 import mx.core.IDataRenderer;


Transferred from the Adobe Open Source Subversion Repository

Revision: 11039
Author:   chaase@adobe.com
Date:     2009-10-20T23:37:59.923557Z

Log Message:
-----------
Added and corrected ASDocs for the various transformPointToParent() functions. Also modified parameter names to be more correct (and understandable).

QE notes: -
Doc notes: Added ASDocs, fixes bug 23337
Bugs: SDK-23337
Reviewer: Ely
Tests run: checkintests, mustella spark transform effects
Is noteworthy for integration: no

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/core/SpriteVisualElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/primitives/supportClasses/GraphicElement.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flash-integration/src/mx/flash/UIMovieClip.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/core/AdvancedLayoutFeatures.as</path>

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

--- frameworks/projects/spark/src/spark/primitives/supportClasses/GraphicElement.as
+++ frameworks/projects/spark/src/spark/primitives/supportClasses/GraphicElement.as
@@ -2135,26 +2135,40 @@
     }

     /**
-     *  FIXME (chaase) : FLEXDOCS-1031
+     * A utility method to transform a point specified in the local
+     * coordinates of this object to its location in the object's parent's
+     * coordinates. The pre-layout and post-layout result will be set on
+     * the position and postLayoutPosition
+     * parameters, if they are non-null.
      *
-     *  @langversion 3.0
-     *  @playerversion Flash 10
-     *  @playerversion AIR 1.5
-     *  @productversion Flex 4
-     */
-    public function transformPointToParent(transformCenter:Vector3D,position:Vector3D,postLayoutPosition:Vector3D):void
+     * @param localPosition The point to be transformed, specified in the
+     * local coordinates of the object.
+     * @position A Vector3D point that will hold the pre-layout
+     * result. If null, the parameter is ignored.
+     * @postLayoutPosition A Vector3D point that will hold the post-layout
+     * result. If null, the parameter is ignored.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4
+     */
+    public function transformPointToParent(localPosition:Vector3D,
+                                           position:Vector3D,
+                                           postLayoutPosition:Vector3D):void
     {
         if (layoutFeatures != null)
         {
-            layoutFeatures.transformPointToParent(true,transformCenter,position,postLayoutPosition);
+            layoutFeatures.transformPointToParent(true, localPosition, position,
+                postLayoutPosition);
         }
         else
         {
             var xformPt:Point = new Point();
-            if (transformCenter)
+            if (localPosition)
             {
-                xformPt.x = transformCenter.x;
-                xformPt.y = transformCenter.y;
+                xformPt.x = localPosition.x;
+                xformPt.y = localPosition.y;
             }
             if (position != null)
             {


Transferred from the Adobe Open Source Subversion Repository

Revision: 20013
Author:   harishs@adobe.com
Date:     2011-01-31T15:32:09.255609Z

Log Message:
-----------
QE notes: Globalization changes. Full cyclone run has been done. Default locale changes and sort bug fixes since Dec 14 2010
Doc notes: ASDOC comments for all classes have been updated.
Bugs: SDK-29132 SDK-29127 SDK-28163  SDK-29075 SDK-28600 SDK-28492 SDK-28856

Reviewer: Gordon Smith, Xie Fang, Zhigang Qi
Tests run: cyclone and checkintests
Is noteworthy for integration:

Modified Paths:
--------------
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/styles/AdvancedStyleClient.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/collections/SortField.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/validators/supportClasses/NumberValidatorBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/collections/ISort.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/validators/supportClasses/GlobalizationValidatorBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/supportClasses/CollatorBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/formatters/NumberFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/collections/ISortField.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/formatters/CurrencyFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/collections/Sort.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/validators/NumberValidator.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/formatters/DateTimeFormatter.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/validators/CurrencyValidator.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/core/UIComponent.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/collections/SortField.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/components/Group.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/supportClasses/GlobalizationBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/validators/supportClasses/GlobalizationUtils.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/SortingCollator.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/StringTools.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/LastOperationStatus.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/framework/src/mx/collections/Sort.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/formatters/supportClasses/NumberFormatterBase.as</path>
<path kind="file" action="M">/private/flex/sdk/branches/hero_private/frameworks/projects/spark/src/spark/globalization/MatchingCollator.as</path>

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

--- frameworks/projects/spark/src/spark/globalization/supportClasses/GlobalizationBase.as
+++ frameworks/projects/spark/src/spark/globalization/supportClasses/GlobalizationBase.as
@@ -16,6 +16,7 @@
 import flash.events.Event;
 import flash.events.EventDispatcher;

+import mx.core.FlexGlobals;
 import mx.core.mx_internal;
 import mx.styles.AdvancedStyleClient;

@@ -116,6 +117,14 @@
      *  simply copied into a new instance.
      */
     private var basicProperties:Object = null;
+
+    /**
+     *  @private
+     *  Properties object to be used by higher level class ONLY.
+     *
+     *  Store overriden properties.
+     */
+    mx_internal var properties:Object = null;

     /**
      *  @private
@@ -263,30 +272,21 @@
     //
     //--------------------------------------------------------------------------

-    /**
-     *  @private
-     *  Detects changes to style properties. When any style property is set,
-     *  Flex calls the styleChanged() method,
-     *  passing to it the name of the style being set.
-     *
-     *  For the Collator class this method determines whether or not the
-     *  locale style has changed and if needed updates the instance of
-     *  the class to reflect this change. If the locale has been
-     *  updated the change event will be dispatched and
-     *  uses of the bindable methods or properties will be updated.
-     *
-     *  @param styleProp The name of the style property, or null if
-     *  all styles for this component have changed.
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10.1
-     *  @playerversion AIR 2.5
-     *  @productversion Flex 4.5
-     */
-    override public function styleChanged(styleProp:String):void
-    {
-        localeChanged();
-        super.styleChanged(styleProp);
+    override public function getStyle(styleProp:String):*
+    {
+        if (styleProp != "locale")
+            return super.getStyle(styleProp);
+
+        if ((localeStyle !== undefined) && (localeStyle !== null))
+            return localeStyle;
+
+        if (styleParent)
+            return styleParent.getStyle(styleProp);
+
+        if (FlexGlobals.topLevelApplication)
+            return FlexGlobals.topLevelApplication.getStyle(styleProp);
+
+        return undefined;
     }

     /**
@@ -310,6 +310,32 @@
         localeChanged();
     }

+    /**
+     *  @private
+     *  Detects changes to style properties. When any style property is set,
+     *  Flex calls the styleChanged() method,
+     *  passing to it the name of the style being set.
+     *
+     *  For the Collator class this method determines whether or not the
+     *  locale style has changed and if needed updates the instance of
+     *  the class to reflect this change. If the locale has been
+     *  updated the change event will be dispatched and
+     *  uses of the bindable methods or properties will be updated.
+     *
+     *  @param styleProp The name of the style property, or null if
+     *  all styles for this component have changed.
+     *
+     *  @langversion 3.0
+     *  @playerversion Flash 10.1
+     *  @playerversion AIR 2.5
+     *  @productversion Flex 4.5
+     */
+    override public function styleChanged(styleProp:String):void
+    {
+        localeChanged();
+        super.styleChanged(styleProp);
+    }
+
     //--------------------------------------------------------------------------
     //
     //  Methods
@@ -327,6 +353,32 @@
     {
         // This method must be overridden by the inherited class.
         throw new IllegalOperationError();
+    }
+
+    /**
+     *  @private
+     *  Ensure some style source exists for this instance of a globalization
+     *  object.
+     *
+     *  A style source is considered exist if (A) styleParent value is non-null,
+     *  or (B) localeStyle value has some useable value.
+     *  If neither is the case, this style client will be added to the
+     *  FlexGlobals.topLevelApplication as a child if possible.
+     *
+     *  As a side effect this will call the styleChanged method and if the
+     *  locale has changed will cause the createWorkingInstance method
+     *  to be called.
+     */
+    mx_internal function ensureStyleSource():void
+    {
+        if (!styleParent &&
+            ((localeStyle === undefined) || (localeStyle === null)))
+        {
+            if (FlexGlobals.topLevelApplication)
+            {
+                FlexGlobals.topLevelApplication.addStyleClient(this);
+            }
+        }
     }

    /**
@@ -360,8 +412,17 @@
      */
     mx_internal function getBasicProperty(obj:Object, propertyName:String):*
     {
+        ensureStyleSource();
+
         if (obj)
+        {
             return obj[propertyName];
+        }
+        // ensureStyleSource() above could have created properties.
+        else if (properties)
+        {
+            return properties[propertyName];
+        }

         // Note that there is the rule in flash.globalization class is that the
         // getters do not update lastOperationStatus property. So we are
@@ -441,7 +502,7 @@
      */
     private function localeChanged():void
     {
-        const newlocaleStyle:*= getStyle("locale") ;
+        const newlocaleStyle:* = super.getStyle("locale") ;

         if (localeStyle === newlocaleStyle)
             return;


- bugfix: Changed invalidation system in DocumentView. Event.RENDER seems to be unreliable in some browser/flashplayer-combinations

git-svn-id: e38e7cdd6ace00d8230583a2d3b43e9a55f5c011@713 bc4816be-ef27-423a-9c4d-fc420be121a2

--- src/reprise/ui/DocumentView.as
+++ src/reprise/ui/DocumentView.as
@@ -238,9 +238,12 @@

 		reprise function markChildAsInvalid(child : UIObject) : void
 		{
+			if (m_invalidChildren.length == 0)
+			{
+				addEventListener(Event.ENTER_FRAME, self_enterFrame);
+			}
 			//TODO: check if child.toString() is ok to use
 			m_invalidChildren.push({element : child, path : child.toString()});
-			stage.invalidate();
 		}

 		reprise function markChildAsValid(child : UIObject) : void
@@ -298,7 +301,6 @@
 			stage.addEventListener(Event.RESIZE, stage_resize);
 			super.initialize();
 			stage.stageFocusRect = false;
-			stage.addEventListener(Event.RENDER, stage_render);
 			stage.addEventListener(KeyboardEvent.KEY_DOWN, key_down);
 			stage.addEventListener(FocusEvent.KEY_FOCUS_CHANGE, stage_keyFocusChange);
 			stage.addEventListener(FocusEvent.MOUSE_FOCUS_CHANGE, stage_mouseFocusChange);
@@ -390,7 +392,7 @@
 			//validate elements that have been marked as invalid during validation
 			if (m_invalidChildren.length)
 			{
-				m_stageInvalidationTimeout = setTimeout(invalidateStage, 5);
+				addEventListener(Event.ENTER_FRAME, self_enterFrame);
 			}
 			m_documentIsValidating = false;
 		}
@@ -497,8 +499,9 @@
 			}
 		}

-		protected function stage_render(event : Event) : void
-		{
+		protected function self_enterFrame(event : Event) : void
+		{
+			removeEventListener(Event.ENTER_FRAME, self_enterFrame);
 			validateElements();
 		}


make support box disappear

make support box disappear

--- Arguments/src/components/AgoraMap.as
+++ Arguments/src/components/AgoraMap.as
@@ -163,7 +163,15 @@
 			}catch(e:Error){
 			}
 			addChild(firstClaimHelpText);
-
+			for each(var info:UIComponent in getChildren())
+			{
+				if(info is InfoBox)
+				{
+				var info1:InfoBox = info as InfoBox;
+				if(info1.helptext == Language.lookup('ArgComplete'))
+					removeChild(info);
+				}
+			}
 			var newPanels:ArrayCollection = AGORAModel.getInstance().agoraMapModel.newPanels;
 			for(var i:int=0; i< newPanels.length; i++){
 				if(StatementModel(newPanels[i]).statementFunction == StatementModel.INFERENCE){


DeluxeSignal now extends Signal, which allows us to remove a lot of duplicated logic.

--- src/org/osflash/signals/DeluxeSignal.as
+++ src/org/osflash/signals/DeluxeSignal.as
@@ -21,12 +21,9 @@
 	 *

 	 * Project home: http://github.com/robertpenner/as3-signals/
 	 */
-	public class DeluxeSignal implements ISignalOwner, IPrioritySignal
+	public class DeluxeSignal extends Signal implements ISignalOwner, IPrioritySignal
 	{
 		protected var _target:Object;
-		protected var _valueClasses:Array;
-		protected var slots:Array;
-		protected var slotsNeedCloning:Boolean = false;

 		/**
 		 * Creates a DeluxeSignal instance to dispatch events on behalf of a target object.
@@ -43,35 +40,10 @@
 		public function DeluxeSignal(target:Object = null, ...valueClasses)
 		{
 			_target = target;
-			slots = [];
-			// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
-			if (valueClasses.length == 1 && valueClasses[0] is Array)
-				valueClasses = valueClasses[0];
-			this.valueClasses = valueClasses;
-		}
-
-		/** @inheritDoc */
-		[ArrayElementType("Class")]
-		public function get valueClasses():Array { return _valueClasses; }
-
-		/** @inheritDoc */
-		public function set valueClasses(value:Array):void
-		{
-			// Clone so the Array cannot be affected from outside.
-			_valueClasses = value ? value.slice() : [];
-			for (var i:int = _valueClasses.length; i--; )
-			{
-				if (!(_valueClasses[i] is Class))
-				{
-					throw new ArgumentError('Invalid valueClasses argument: item at index ' + i
-						+ ' should be a Class but was:<' + _valueClasses[i] + '>.');
-				}
-			}
-		}
-
-		/** @inheritDoc */
-		public function get numListeners():uint { return slots.length; }
-
+			super(valueClasses);
+		}
+
+		/** @inheritDoc */
 		/** @inheritDoc */
 		public function get target():Object { return _target; }

@@ -83,20 +55,19 @@
 			_target = value;
 		}

-		/** @inheritDoc */
 		//TODO: @throws
-		public function add(listener:Function):Function
+		override public function add(listener:Function):Function
 		{
 			return addWithPriority(listener)
 		}

 		public function addWithPriority(listener:Function, priority:int = 0):Function
 		{
-			registerListener(listener, false, priority);
+			registerListenerWithPriority(listener, false, priority);
 			return listener;
 		}

-		public function addOnce(listener:Function):Function
+		override public function addOnce(listener:Function):Function
 		{
 			return addOnceWithPriority(listener)
 		}
@@ -104,37 +75,12 @@
 		/** @inheritDoc */
 		public function addOnceWithPriority(listener:Function, priority:int = 0):Function
 		{
-			registerListener(listener, true, priority);
+			registerListenerWithPriority(listener, true, priority);
 			return listener;
 		}

 		/** @inheritDoc */
-		public function remove(listener:Function):Function
-		{
-			if (indexOfListener(listener) == -1) return listener;
-			if (slotsNeedCloning)
-			{
-				slots = slots.slice();
-				slotsNeedCloning = false;
-			}
-			slots.splice(indexOfListener(listener), 1);
-			return listener;
-		}
-
-		/** @inheritDoc */
-		public function removeAll():void
-		{
-			// Looping backwards is more efficient when removing array items.
-			for (var i:uint = slots.length; i--; )
-			{
-				// This is the "proper" type-safe way, but perhaps not the fastest.
-				// TODO: Test for speed.
-				remove(Slot(slots[i]).listener);
-			}
-		}
-
-		/** @inheritDoc */
-		public function dispatch(...valueObjects):void
+		override public function dispatch(...valueObjects):void
 		{
 			// Validate value objects against pre-defined value classes.
 			var valueObject:Object;
@@ -221,16 +167,12 @@
 			}
 		}

-		protected function indexOfListener(listener:Function):int
-		{
-			for (var i:int = slots.length; i--; )
-			{
-				if (Slot(slots[i]).listener == listener) return i;
-			}
-			return -1;
-		}
-
-		protected function registerListener(listener:Function, once:Boolean = false, priority:int = 0):void
+		override protected function registerListener(listener:Function, once:Boolean = false):void
+		{
+			registerListenerWithPriority(listener, once);
+		}
+
+		protected function registerListenerWithPriority(listener:Function, once:Boolean = false, priority:int = 0):void
 		{
 			// function.length is the number of arguments.
 			if (listener.length < _valueClasses.length)


Transferred from the Adobe Open Source Subversion Repository

Revision: 6306
Author:   egeorgie@adobe.com
Date:     2009-04-28T01:17:42.359155Z

Log Message:
-----------
Layout PARB changes - rename "layout" package to "layouts"

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

Modified Paths:
--------------
<path kind="dir" action="D">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/DataGroup.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/BasicLayout.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/BasicLayout.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/supportClasses/LayoutElementHelper.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/supportClasses/LayoutElementHelper.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/Group.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/RowAlign.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/RowAlign.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/supportClasses/Block.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/supportClasses/Block.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/VerticalAlign.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/VerticalAlign.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/supportClasses/LinearLayoutVector.as" copyfrom-rev="6301" action="A">/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/components/supportClasses/ButtonBarHorizontalLayout.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/HorizontalLayout.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/HorizontalLayout.as</path>
<path kind="dir" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/supportClasses</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableDataContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/HGroup.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/TileLayout.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/TileLayout.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/RichEditableText2.as</path>
<path kind="dir" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/SkinnableContainer.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/List.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/ScrollerLayout.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/supportClasses/LayoutBase.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/supportClasses/LayoutBase.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/HorizontalAlign.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/HorizontalAlign.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/supportClasses/GroupBase.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/components/VGroup.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/VerticalLayout.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/VerticalLayout.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/ColumnAlign.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/ColumnAlign.as</path>
<path kind="file" copyfrom-path="/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layout/TileOrientation.as" copyfrom-rev="6301" action="A">/flex/sdk/trunk/frameworks/projects/flex4/src/spark/layouts/TileOrientation.as</path>

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

--- frameworks/projects/spark/src/spark/components/supportClasses/ButtonBarHorizontalLayout.as
+++ frameworks/projects/spark/src/spark/components/supportClasses/ButtonBarHorizontalLayout.as
@@ -14,7 +14,7 @@

 import spark.components.supportClasses.GroupBase;
 import mx.core.ILayoutElement;
-import spark.layout.supportClasses.LayoutBase;
+import spark.layouts.supportClasses.LayoutBase;

 /**
  *  The ButtonBarHorizontalLayout is a layout specifically designed for the


Exposed argName. Public for now, wire up a getter/setter if it ever needs the complexity.

git-svn-id: b675b909355d5cf946977f44a8ec5a6ceb3782e4@739 ed5b42cb-e716-0410-a449-f6a68f950b19

--- src/as/com/threerings/flex/CommandComboBox.as
+++ src/as/com/threerings/flex/CommandComboBox.as
@@ -36,18 +36,22 @@
 public class CommandComboBox extends ComboBox
 {
     /**
+     * The attribute of the selectedItem object that used as the argument to the
+     * command or function. If null, the entire selectedItem is passed as the argument.
+     */
+    public var argName :String;
+
+    /**
      * Create a command combobox.
      *
      * @param cmdOrFn either a String, which will be the CommandEvent command to dispatch,
      *        or a function, which will be called when changed.
-     * @param argName The attribute of the selectedItem object that used as the argument to the
-     *        command or function. If null, the entire selectedItem is passed as the argument.
      */
     public function CommandComboBox (cmdOrFn :* = null, argName :String = "data")
     {
         CommandButton.validateCmd(cmdOrFn);
         _cmdOrFn = cmdOrFn;
-        _argName = argName;
+        this.argName = argName;

         addEventListener(ListEvent.CHANGE, handleChange);
     }
@@ -72,14 +76,12 @@
     {
         if (this.selectedItem != null) {
             CommandEvent.dispatch(this, _cmdOrFn,
-                (_argName != null) ? this.selectedItem[_argName] : this.selectedItem);
+                (this.argName != null) ? this.selectedItem[this.argName] : this.selectedItem);
         }
     }

     /** The command (String) to submit, or the function (Function) to call
      * when changed,  */
     protected var _cmdOrFn :Object;
-
-    protected var _argName :String;
 }
 }


More debugging when debug is activated.

More debugging when debug is activated.

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

--- src/as/com/threerings/io/ObjectInputStream.as
+++ src/as/com/threerings/io/ObjectInputStream.as
@@ -83,7 +83,7 @@
                     log.warning("OMG, cannot stream " + jname);
                     return null;
                 }
-//                log.debug("Got streamer (" + streamer + ")");
+                if (DEBUG) log.debug(DEBUG_ID + "Got streamer (" + streamer + ")");

                 var cname :String = Translations.getFromServer(jname);
                 cmap = new ClassMapping(code, cname, streamer);


Set layer min/max scale when converting web map.

--- src/com/esri/viewer/managers/ConfigManager.as
+++ src/com/esri/viewer/managers/ConfigManager.as
@@ -1049,6 +1049,8 @@
                     type="dynamic"
                     visible={dynLyr.visible}
                     alpha={dynLyr.alpha}
+                    minscale={dynLyr.minScale}
+                    maxscale={dynLyr.maxScale}
                     showinlegend={dynLyr.showInLegend}
                     useproxy={dynLyr.proxyURL != null}
                     url={dynLyr.url}/>;
@@ -1068,6 +1070,8 @@
                     type="image"
                     visible={imgLyr.visible}
                     alpha={imgLyr.alpha}
+                    minscale={imgLyr.minScale}
+                    maxscale={imgLyr.maxScale}
                     showinlegend={imgLyr.showInLegend}
                     useproxy={imgLyr.proxyURL != null}
                     url={imgLyr.url}/>;
@@ -1082,6 +1086,8 @@
             lyrXML = <layer label={label}
                     type="tiled"
                     visible={tiledLyr.visible}
+                    minscale={tiledLyr.minScale}
+                    maxscale={tiledLyr.maxScale}
                     showinlegend={tiledLyr.showInLegend}
                     alpha={tiledLyr.alpha}
                     useproxy={tiledLyr.proxyURL != null}
@@ -1105,6 +1111,8 @@
             lyrXML = <layer label={label}
                     type="csv"
                     visible={csvLyr.visible}
+                    minscale={csvLyr.minScale}
+                    maxscale={csvLyr.maxScale}
                     showinlegend={csvLyr.showInLegend}
                     alpha={csvLyr.alpha}
                     url={csvLyr.url}
@@ -1133,6 +1141,8 @@
                         type="feature"
                         showinlegend={feaLyr.showInLegend}
                         visible={feaLyr.visible}
+                        minscale={feaLyr.minScale}
+                        maxscale={feaLyr.maxScale}
                         alpha={feaLyr.alpha}
                         iseditable={feaLyr.isEditable}/>
             }
@@ -1142,6 +1152,8 @@
                         type="feature"
                         showinlegend={feaLyr.showInLegend}
                         visible={feaLyr.visible}
+                        minscale={feaLyr.minScale}
+                        maxscale={feaLyr.maxScale}
                         alpha={feaLyr.alpha}
                         mode={feaLyr.mode}
                         useproxy={feaLyr.proxyURL != null}
@@ -1156,6 +1168,8 @@
                     type="georss"
                     showinlegend={geoRSSLayer.showInLegend}
                     visible={geoRSSLayer.visible}
+                    minscale={geoRSSLayer.minScale}
+                    maxscale={geoRSSLayer.maxScale}
                     alpha={geoRSSLayer.alpha}
                     url={geoRSSLayer.url}/>;
         }
@@ -1166,6 +1180,8 @@
                     type="kml"
                     showinlegend={kmlLayer.showInLegend}
                     visible={kmlLayer.visible}
+                    minscale={kmlLayer.minScale}
+                    maxscale={kmlLayer.maxScale}
                     alpha={kmlLayer.alpha}
                     url={kmlLayer.url}/>;
         }
@@ -1175,6 +1191,8 @@
             lyrXML = <layer label={label}
                     type="osm"
                     visible={osmLyr.visible}
+                    minscale={osmLyr.minScale}
+                    maxscale={osmLyr.maxScale}
                     showinlegend={osmLyr.showInLegend}
                     alpha={osmLyr.alpha}/>;
         }
@@ -1185,6 +1203,8 @@
                     type="bing"
                     showinlegend={veLyr.showInLegend}
                     visible={veLyr.visible}
+                    minscale={veLyr.minScale}
+                    maxscale={veLyr.maxScale}
                     alpha={veLyr.alpha}
                     style={veLyr.mapStyle}/>;
         }
@@ -1195,6 +1215,8 @@
                     type="webtiled"
                     showinlegend={webTiledLayer.showInLegend}
                     visible={webTiledLayer.visible}
+                    minscale={webTiledLayer.minScale}
+                    maxscale={webTiledLayer.maxScale}
                     alpha={webTiledLayer.alpha}
                     url={webTiledLayer.urlTemplate}/>;
             if (webTiledLayer.copyright)
@@ -1213,6 +1235,8 @@
                     type="wms"
                     showinlegend={wmsLayer.showInLegend}
                     visible={wmsLayer.visible}
+                    minscale={wmsLayer.minScale}
+                    maxscale={wmsLayer.maxScale}
                     alpha={wmsLayer.alpha}
                     version={wmsLayer.version}
                     skipgetcapabilities={wmsLayer.skipGetCapabilities}