Repository: flex-sdk Updated Branches: refs/heads/develop 418690242 -> aa13d500f
fix issues found by Falcon's resolver. Unlike MXMLC, Falcon will always choose the local variable even if it masks a static or instance method. MXMLC seems to resolve to the static or instance method Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/aa13d500 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/aa13d500 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/aa13d500 Branch: refs/heads/develop Commit: aa13d500f61681abbcec77ed507c09330272bf2c Parents: 4186902 Author: Alex Harui <[email protected]> Authored: Tue Aug 23 21:46:02 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Aug 23 21:46:25 2016 -0700 ---------------------------------------------------------------------- .../apache/src/org/apache/flex/formatters/PostCodeFormatter.as | 4 ++-- .../automation_agent/src/mx/automation/AutomationClass.as | 4 ++-- frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as | 2 +- .../src/mx/managers/systemClasses/MarshallingSupport.as | 4 ++-- frameworks/projects/framework/src/mx/utils/TransformUtil.as | 2 +- .../mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as | 2 +- .../projects/mx/src/mx/containers/utilityClasses/BoxLayout.as | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/apache/src/org/apache/flex/formatters/PostCodeFormatter.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/apache/src/org/apache/flex/formatters/PostCodeFormatter.as b/frameworks/projects/apache/src/org/apache/flex/formatters/PostCodeFormatter.as index 9543d89..22bd8c6 100644 --- a/frameworks/projects/apache/src/org/apache/flex/formatters/PostCodeFormatter.as +++ b/frameworks/projects/apache/src/org/apache/flex/formatters/PostCodeFormatter.as @@ -234,8 +234,8 @@ public class PostCodeFormatter extends Formatter // Check and add missing (or convert) padding characters for each (var format:String in formats) { - var condensedPostcode:String = condensedFormat(postCode); - var condensedFormat:String = condensedFormat(format); + var condensedPostcode:String = this.condensedFormat(postCode); + var condensedFormat:String = this.condensedFormat(format); var char:String; var length:int = format.length; var condensedErrors:Array; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/automation_agent/src/mx/automation/AutomationClass.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/automation_agent/src/mx/automation/AutomationClass.as b/frameworks/projects/automation_agent/src/mx/automation/AutomationClass.as index c70002f..03496aa 100644 --- a/frameworks/projects/automation_agent/src/mx/automation/AutomationClass.as +++ b/frameworks/projects/automation_agent/src/mx/automation/AutomationClass.as @@ -303,7 +303,7 @@ public class AutomationClass implements IAutomationClass2 */ public function addEvent(m:IAutomationEventDescriptor):void { - var hash:String = hash(m.eventClassName, m.eventType); + var hash:String = AutomationClass.hash(m.eventClassName, m.eventType); _event2descriptor[hash] = m; } @@ -328,7 +328,7 @@ public class AutomationClass implements IAutomationClass2 if (event is KeyboardEvent) eventType = "keyPress"; var eventClassName:String = getClassName(event); - var hash:String = hash(eventClassName, eventType); + var hash:String = AutomationClass.hash(eventClassName, eventType); return hash in _event2descriptor ? _event2descriptor[hash] : null; } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as b/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as index fb8086c..a0b69b8 100644 --- a/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as +++ b/frameworks/projects/framework/src/mx/core/CrossDomainRSLItem.as @@ -318,7 +318,7 @@ public class CrossDomainRSLItem extends RSLItem // no failover to load, all the rsls have failed to load // report an error. // B Feature: externalize error message - var hasFailover:Boolean = hasFailover(); + var hasFailover:Boolean = this.hasFailover(); var rslError:ErrorEvent = new ErrorEvent(RSLEvent.RSL_ERROR); rslError.text = "Flex Error #1001: Digest mismatch with RSL " + urlRequest.url + http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallingSupport.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallingSupport.as b/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallingSupport.as index 3edd95b..f3b9b80 100644 --- a/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallingSupport.as +++ b/frameworks/projects/framework/src/mx/managers/systemClasses/MarshallingSupport.as @@ -869,7 +869,7 @@ public class MarshallingSupport implements IMarshalSystemManager, ISWFBridgeProv { for (var i:int = 0; i < n; i++) { - var form_i:Object = isRemotePopUp(awm.forms[i]) ? awm.forms[i].window : awm.forms[i]; + var form_i:Object = MarshallingSupport.isRemotePopUp(awm.forms[i]) ? awm.forms[i].window : awm.forms[i]; if (form_i == p) { var j:int = 0; @@ -904,7 +904,7 @@ public class MarshallingSupport implements IMarshalSystemManager, ISWFBridgeProv for (j = 0; j < n; j++) { var f:DisplayObject; - var isRemotePopUp:Boolean = isRemotePopUp(awm.forms[j]); + var isRemotePopUp:Boolean = MarshallingSupport.isRemotePopUp(awm.forms[j]); if (isRemotePopUp) { if (awm.forms[j].window is String) http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/framework/src/mx/utils/TransformUtil.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/utils/TransformUtil.as b/frameworks/projects/framework/src/mx/utils/TransformUtil.as index 0274ed2..23fdd64 100644 --- a/frameworks/projects/framework/src/mx/utils/TransformUtil.as +++ b/frameworks/projects/framework/src/mx/utils/TransformUtil.as @@ -100,7 +100,7 @@ public final class TransformUtil initLayoutFeatures:Function = null):void { var needAdvancedLayout:Boolean = (layoutFeatures || - needAdvancedLayout(transformCenter, + TransformUtil.needAdvancedLayout(transformCenter, scale, rotation, translation, http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as index 040bf53..f50e327 100644 --- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as +++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BusyIndicatorSkin.as @@ -260,7 +260,7 @@ package spark.skins.mobile */ private function updateSpinner(diameter:Number):void { - var isRotating:Boolean = isRotating(); + var isRotating:Boolean = this.isRotating(); if (isRotating) stopRotation(); http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/aa13d500/frameworks/projects/mx/src/mx/containers/utilityClasses/BoxLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/containers/utilityClasses/BoxLayout.as b/frameworks/projects/mx/src/mx/containers/utilityClasses/BoxLayout.as index db31dcd..3fbf0ac 100644 --- a/frameworks/projects/mx/src/mx/containers/utilityClasses/BoxLayout.as +++ b/frameworks/projects/mx/src/mx/containers/utilityClasses/BoxLayout.as @@ -88,7 +88,7 @@ public class BoxLayout extends Layout { var target:Container = super.target; - var isVertical:Boolean = isVertical(); + var isVertical:Boolean = this.isVertical(); var minWidth:Number = 0; var minHeight:Number = 0;
