You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/06/03 17:55:24 UTC
[5/6] git commit: [flex-asjs] [refs/heads/spark] - clean compile of
MX for swf
clean compile of MX for swf
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4f3802ef
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4f3802ef
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4f3802ef
Branch: refs/heads/spark
Commit: 4f3802ef8a89bb02ba75e475d1cfc19ae35a1f3c
Parents: dca9797
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 1 22:31:22 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 1 22:31:22 2016 -0700
----------------------------------------------------------------------
.../mx/containers/utilityClasses/BoxLayout.as | 7 +-
.../containers/utilityClasses/CanvasLayout.as | 3 +
.../MX/src/main/flex/mx/controls/Label.png | Bin 0 -> 401 bytes
.../MX/src/main/flex/mx/core/Container.as | 38 +-
.../flex/mx/core/ContainerRawChildrenList.as | 1 +
.../MX/src/main/flex/mx/core/IToggleButton.as | 39 +
.../flex/mx/core/IVisualElementContainer.as | 17 +-
.../MX/src/main/flex/mx/core/LayoutContainer.as | 3 +
.../MX/src/main/flex/mx/core/UIComponent.as | 2 +-
.../src/main/flex/mx/effects/EffectManager.as | 2 +-
.../src/main/flex/mx/managers/FocusManager.as | 2359 ++++++++++++++++++
.../managers/IFocusManagerComplexComponent.as | 82 +
.../main/flex/mx/managers/IFocusManagerGroup.as | 85 +
.../src/main/flex/mx/managers/ISystemManager.as | 18 +
.../MX/src/main/flex/mx/states/AddItems.as | 2 +-
.../main/flex/mx/styles/metadata/AlignStyles.as | 49 +
.../MX/src/main/flex/mx/utils/LoaderUtil.as | 5 +-
17 files changed, 2681 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/BoxLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/BoxLayout.as b/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/BoxLayout.as
index 60eefd6..691af3c 100644
--- a/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/BoxLayout.as
+++ b/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/BoxLayout.as
@@ -20,13 +20,16 @@
package mx.containers.utilityClasses
{
+COMPILE::LATER
+{
+ import mx.controls.scrollClasses.ScrollBar;
+ import mx.core.ScrollPolicy;
+}
import mx.containers.BoxDirection;
-import mx.controls.scrollClasses.ScrollBar;
import mx.core.Container;
import mx.core.EdgeMetrics;
import mx.core.IUIComponent;
import mx.core.mx_internal;
-import mx.core.ScrollPolicy;
use namespace mx_internal;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/CanvasLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/CanvasLayout.as b/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/CanvasLayout.as
index 79831a5..6ef6dd2 100644
--- a/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/CanvasLayout.as
+++ b/frameworks/projects/MX/src/main/flex/mx/containers/utilityClasses/CanvasLayout.as
@@ -22,7 +22,10 @@ package mx.containers.utilityClasses
import flash.display.DisplayObject;
import flash.geom.Rectangle;
+COMPILE::LATER
+{
import mx.containers.Canvas;
+}
import mx.containers.errors.ConstraintError;
import mx.core.Container;
import mx.core.EdgeMetrics;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/controls/Label.png
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/controls/Label.png b/frameworks/projects/MX/src/main/flex/mx/controls/Label.png
new file mode 100644
index 0000000..9269ae3
Binary files /dev/null and b/frameworks/projects/MX/src/main/flex/mx/controls/Label.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/Container.as b/frameworks/projects/MX/src/main/flex/mx/core/Container.as
index 86dab78..1ca04ea 100644
--- a/frameworks/projects/MX/src/main/flex/mx/core/Container.as
+++ b/frameworks/projects/MX/src/main/flex/mx/core/Container.as
@@ -56,20 +56,24 @@ import mx.events.KeyboardEvent;
import flex.system.DefinitionManager;
import org.apache.flex.reflection.getDefinitionByName;
+import org.apache.flex.core.IVisualElement;
import mx.binding.BindingManager;
+COMPILE::LATER
+{
import mx.containers.utilityClasses.PostScaleAdapter;
import mx.controls.HScrollBar;
import mx.controls.VScrollBar;
-import mx.controls.listClasses.IListItemRenderer;
import mx.controls.scrollClasses.ScrollBar;
+import mx.events.ScrollEvent;
+import mx.events.ScrollEventDetail;
+import mx.events.ScrollEventDirection;
+}
+import mx.controls.listClasses.IListItemRenderer;
import mx.core.IUITextField;
import mx.events.ChildExistenceChangedEvent;
import mx.events.FlexEvent;
import mx.events.IndexChangedEvent;
-import mx.events.ScrollEvent;
-import mx.events.ScrollEventDetail;
-import mx.events.ScrollEventDirection;
import mx.geom.RoundedRectangle;
import mx.managers.IFocusManager;
import mx.managers.IFocusManagerContainer;
@@ -2994,9 +2998,9 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- override public function getElementAt(index:int):IVisualElement
+ override public function getElementAt(index:int):org.apache.flex.core.IVisualElement
{
- return super.getElementAt(index) as IVisualElement;
+ return super.getElementAt(index) as org.apache.flex.core.IVisualElement;
}
/**
@@ -3007,7 +3011,7 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- override public function getElementIndex(element:IVisualElement):int
+ override public function getElementIndex(element:org.apache.flex.core.IVisualElement):int
{
return super.getElementIndex(element);
}
@@ -3020,12 +3024,12 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function addElement(element:IVisualElement):IVisualElement
+ override public function addElement(element:org.apache.flex.core.IVisualElement):org.apache.flex.core.IVisualElement
{
if (! (element is DisplayObject) )
throw ArgumentError(element + " is not supported in this Container");
- return addChild(element as DisplayObject) as IVisualElement;
+ return addChild(element as DisplayObject) as org.apache.flex.core.IVisualElement;
}
/**
@@ -3036,12 +3040,12 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function addElementAt(element:IVisualElement, index:int):IVisualElement
+ override public function addElementAt(element:org.apache.flex.core.IVisualElement, index:int):org.apache.flex.core.IVisualElement
{
if (! (element is DisplayObject) )
throw ArgumentError(element + " is not supported in this Container");
- return addChildAt(element as DisplayObject, index) as IVisualElement;
+ return addChildAt(element as DisplayObject, index) as org.apache.flex.core.IVisualElement;
}
/**
@@ -3052,12 +3056,12 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function removeElement(element:IVisualElement):IVisualElement
+ override public function removeElement(element:org.apache.flex.core.IVisualElement):org.apache.flex.core.IVisualElement
{
if (! (element is DisplayObject) )
throw ArgumentError(element + " is not found in this Container");
- return removeChild(element as DisplayObject) as IVisualElement;
+ return removeChild(element as DisplayObject) as org.apache.flex.core.IVisualElement;
}
/**
@@ -3068,9 +3072,9 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function removeElementAt(index:int):IVisualElement
+ public function removeElementAt(index:int):org.apache.flex.core.IVisualElement
{
- return removeChildAt(index) as IVisualElement;
+ return removeChildAt(index) as org.apache.flex.core.IVisualElement;
}
/**
@@ -3097,7 +3101,7 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function setElementIndex(element:IVisualElement, index:int):void
+ public function setElementIndex(element:org.apache.flex.core.IVisualElement, index:int):void
{
if (! (element is DisplayObject) )
throw ArgumentError(element + " is not found in this Container");
@@ -3113,7 +3117,7 @@ public class Container extends UIComponent
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- public function swapElements(element1:IVisualElement, element2:IVisualElement):void
+ public function swapElements(element1:org.apache.flex.core.IVisualElement, element2:org.apache.flex.core.IVisualElement):void
{
if (! (element1 is DisplayObject) )
throw ArgumentError(element1 + " is not found in this Container");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/ContainerRawChildrenList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/ContainerRawChildrenList.as b/frameworks/projects/MX/src/main/flex/mx/core/ContainerRawChildrenList.as
index d668440..2639f74 100644
--- a/frameworks/projects/MX/src/main/flex/mx/core/ContainerRawChildrenList.as
+++ b/frameworks/projects/MX/src/main/flex/mx/core/ContainerRawChildrenList.as
@@ -210,6 +210,7 @@ public class ContainerRawChildrenList implements IChildList
/**
* @private
*/
+ COMPILE::LATER
public function getObjectsUnderPoint(point:Point):Array
{
return owner.rawChildren_getObjectsUnderPoint(point);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/IToggleButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/IToggleButton.as b/frameworks/projects/MX/src/main/flex/mx/core/IToggleButton.as
new file mode 100644
index 0000000..9541aa1
--- /dev/null
+++ b/frameworks/projects/MX/src/main/flex/mx/core/IToggleButton.as
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.core
+{
+
+/**
+ * The IToggleButton interface is a marker interface that indicates that a
+ * component acts as a toggleable button. It is used primarily as a filter
+ * by the framework's default button logic. This interface is <strong>only</strong> used
+ * by legacy MX components.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+public interface IToggleButton
+{
+
+}
+
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/IVisualElementContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/IVisualElementContainer.as b/frameworks/projects/MX/src/main/flex/mx/core/IVisualElementContainer.as
index ddfccf1..a185ef4 100644
--- a/frameworks/projects/MX/src/main/flex/mx/core/IVisualElementContainer.as
+++ b/frameworks/projects/MX/src/main/flex/mx/core/IVisualElementContainer.as
@@ -20,6 +20,7 @@
package mx.core
{
+import org.apache.flex.core.IVisualElement;
/**
* The IVisualElementContainer interface defines the minimum properties and methods
@@ -70,7 +71,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function getElementAt(index:int):IVisualElement
+ function getElementAt(index:int):org.apache.flex.core.IVisualElement
//----------------------------------
// Visual Element addition
@@ -101,7 +102,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function addElement(element:IVisualElement):IVisualElement;
+ function addElement(element:org.apache.flex.core.IVisualElement):org.apache.flex.core.IVisualElement;
/**
* Adds a visual element to this container.
@@ -133,7 +134,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function addElementAt(element:IVisualElement, index:int):IVisualElement;
+ function addElementAt(element:org.apache.flex.core.IVisualElement, index:int):org.apache.flex.core.IVisualElement;
//----------------------------------
// Visual Element removal
@@ -157,7 +158,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function removeElement(element:IVisualElement):IVisualElement;
+ function removeElement(element:org.apache.flex.core.IVisualElement):org.apache.flex.core.IVisualElement;
/**
* Removes a visual element from the specified index position
@@ -176,7 +177,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function removeElementAt(index:int):IVisualElement;
+ function removeElementAt(index:int):org.apache.flex.core.IVisualElement;
/**
* Removes all visual elements from the container.
@@ -206,7 +207,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function getElementIndex(element:IVisualElement):int;
+ function getElementIndex(element:org.apache.flex.core.IVisualElement):int;
/**
* Changes the position of an existing visual element in the visual container.
@@ -236,7 +237,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function setElementIndex(element:IVisualElement, index:int):void;
+ function setElementIndex(element:org.apache.flex.core.IVisualElement, index:int):void;
//----------------------------------
// Visual Element swapping
@@ -255,7 +256,7 @@ public interface IVisualElementContainer
* @playerversion AIR 1.5
* @productversion Flex 4
*/
- function swapElements(element1:IVisualElement, element2:IVisualElement):void;
+ function swapElements(element1:org.apache.flex.core.IVisualElement, element2:org.apache.flex.core.IVisualElement):void;
/**
* Swaps the visual elements at the two specified index
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/LayoutContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/LayoutContainer.as b/frameworks/projects/MX/src/main/flex/mx/core/LayoutContainer.as
index 850899b..82466a2 100644
--- a/frameworks/projects/MX/src/main/flex/mx/core/LayoutContainer.as
+++ b/frameworks/projects/MX/src/main/flex/mx/core/LayoutContainer.as
@@ -31,7 +31,10 @@ import mx.containers.utilityClasses.Layout;
import mx.effects.EffectManager;
import mx.events.FlexEvent;
import mx.managers.ISystemManager;
+COMPILE::LATER
+{
import mx.managers.LayoutManager;
+}
import mx.managers.SystemManager;
import mx.styles.CSSStyleDeclaration;
import mx.styles.IStyleClient;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as b/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as
index 5bb3559..f455a5c 100644
--- a/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as
+++ b/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as
@@ -8674,7 +8674,7 @@ public class UIComponent extends Sprite
for (i = 0; i < thisContainerNumElements; i++)
{
- var elt:IVisualElement = thisContainer.getElementAt(i);
+ var elt:IVisualElement = thisContainer.getElementAt(i) as IVisualElement;
// Can be null if IUITextField or IUIFTETextField.
if (elt && !(elt is IStyleClient))
elt.invalidateLayoutDirection();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3802ef/frameworks/projects/MX/src/main/flex/mx/effects/EffectManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/flex/mx/effects/EffectManager.as b/frameworks/projects/MX/src/main/flex/mx/effects/EffectManager.as
index 8add486..e322d82 100644
--- a/frameworks/projects/MX/src/main/flex/mx/effects/EffectManager.as
+++ b/frameworks/projects/MX/src/main/flex/mx/effects/EffectManager.as
@@ -56,7 +56,7 @@ import mx.events.ResizeEvent;
import mx.resources.IResourceManager;
import mx.resources.ResourceManager;
import mx.core.IVisualElementContainer;
-import mx.core.IVisualElement;
+import org.apache.flex.core.IVisualElement;
use namespace mx_internal;