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 2014/09/25 18:03:59 UTC
[17/50] git commit: [flex-asjs] [refs/heads/develop] - get rid of
DisplayObject and DisplayObjectContainer dependencies in ILayoutParent
get rid of DisplayObject and DisplayObjectContainer dependencies in ILayoutParent
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/af8213da
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/af8213da
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/af8213da
Branch: refs/heads/develop
Commit: af8213da154653b8130d7e71c513b869251612b0
Parents: 727195d
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 18 11:17:18 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 23 15:01:13 2014 -0700
----------------------------------------------------------------------
.../apache/flex/html/beads/TitleBarView.mxml | 2 +-
.../src/org/apache/flex/core/Application.as | 13 +++++
.../src/org/apache/flex/core/ILayoutParent.as | 10 +---
.../src/org/apache/flex/core/IParent.as | 15 ++++-
.../src/org/apache/flex/core/IParentIUIBase.as | 33 +++++++++++
.../org/apache/flex/core/MXMLBeadViewBase.as | 11 ++--
.../FlexJSUI/src/org/apache/flex/core/UIBase.as | 15 ++++-
.../org/apache/flex/createjs/core/ViewBase.as | 5 ++
.../org/apache/flex/html/beads/ContainerView.as | 17 +++---
.../src/org/apache/flex/html/beads/ListView.as | 12 ++--
.../flex/html/beads/NumericStepperView.as | 15 +++--
.../flex/html/beads/ScrollingContainerView.as | 14 ++---
.../flex/html/beads/layouts/ButtonBarLayout.as | 23 +++-----
.../FlexibleFirstChildHorizontalLayout.as | 15 +++--
.../beads/layouts/NonVirtualHorizontalLayout.as | 14 ++---
.../NonVirtualHorizontalScrollingLayout.as | 13 ++---
.../beads/layouts/NonVirtualVerticalLayout.as | 12 ++--
.../NonVirtualVerticalScrollingLayout.as | 61 +++++++++-----------
18 files changed, 175 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
index 6ed8ccf..47e72c2 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
@@ -20,7 +20,7 @@ limitations under the License.
<basic:MXMLBeadViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:basic="library://ns.apache.org/flexjs/basic"
xmlns:mx="library://ns.adobe.com/flex/mx"
- implements="org.apache.flex.core.ILayoutParent">
+ >
<fx:Script>
<![CDATA[
import org.apache.flex.html.TitleBar;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/Application.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/Application.as
index 54f4f8b..397fa5b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/Application.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/Application.as
@@ -356,6 +356,19 @@ package org.apache.flex.core
}
/**
+ * @copy org.apache.flex.core.IParent#getElementAt()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function getElementAt(index:int):Object
+ {
+ return getChildAt(index);
+ }
+
+ /**
* @copy org.apache.flex.core.IParent#getElementIndex()
*
* @langversion 3.0
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
index bbf818e..a9e199a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as
@@ -18,12 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
- import org.apache.flex.html.supportClasses.Border;
- import org.apache.flex.html.supportClasses.ScrollBar;
-
/**
* The ILayoutParent interface is the basic interface for the
* container that have an IBeadLayout. The layout implementation
@@ -45,7 +39,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- function get contentView():DisplayObjectContainer;
+ function get contentView():IParentIUIBase;
/**
* The container whose size changes
@@ -57,6 +51,6 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- function get resizableView():DisplayObject;
+ function get resizableView():IUIBase;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParent.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParent.as
index 864382a..e9c46d3 100755
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParent.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParent.as
@@ -89,5 +89,18 @@ package org.apache.flex.core
* @productversion FlexJS 0.0
*/
function get numElements():int;
- }
+
+ /**
+ * Get a component from the parent.
+ *
+ * @param c The index of the subcomponent.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function getElementAt(index:int):Object;
+
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParentIUIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParentIUIBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParentIUIBase.as
new file mode 100755
index 0000000..f36d006
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/IParentIUIBase.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 org.apache.flex.core
+{
+ /**
+ * The IParentIUIBase interface is a convenience interface
+ * for IUIBase components that contains subcomponents.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IParentIUIBase extends IParent, IUIBase
+ {
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/MXMLBeadViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/MXMLBeadViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/MXMLBeadViewBase.as
index 7d45d57..49172ae 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/MXMLBeadViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/MXMLBeadViewBase.as
@@ -24,6 +24,7 @@ package org.apache.flex.core
import mx.states.State;
import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
@@ -42,7 +43,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class MXMLBeadViewBase extends BeadViewBase implements IStrand
+ public class MXMLBeadViewBase extends BeadViewBase implements IStrand, ILayoutParent
{
/**
* Constructor.
@@ -321,9 +322,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get contentView():DisplayObjectContainer
+ public function get contentView():IParentIUIBase
{
- return _strand as DisplayObjectContainer;
+ return _strand as IParentIUIBase;
}
/**
@@ -334,9 +335,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get resizableView():DisplayObject
+ public function get resizableView():IUIBase
{
- return _strand as DisplayObject;
+ return _strand as IUIBase;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
index 37ab732..8965db8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/UIBase.as
@@ -49,7 +49,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class UIBase extends Sprite implements IStrand, IEventDispatcher, IUIBase, IParent, IStyleableObject, IChild
+ public class UIBase extends Sprite implements IStrand, IEventDispatcher, IParentIUIBase, IStyleableObject, IChild
{
/**
* Constructor.
@@ -622,6 +622,19 @@ package org.apache.flex.core
}
/**
+ * @copy org.apache.flex.core.IParent#getElementAt()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function getElementAt(index:int):Object
+ {
+ return getChildAt(index);
+ }
+
+ /**
* @copy org.apache.flex.core.IParent#getElementIndex()
*
* @langversion 3.0
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
index 120d22e..9d7fe95 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/core/ViewBase.as
@@ -71,6 +71,11 @@ package org.apache.flex.createjs.core
addChildAt(c as DisplayObject, index);
}
+ public function getElementAt(index:int):Object
+ {
+ return getChildAt(index);
+ }
+
public function getElementIndex(c:Object):int
{
return getChildIndex(c as DisplayObject);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
index 755dd63..1e12776 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ContainerView.as
@@ -18,15 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.html.Container;
import org.apache.flex.html.supportClasses.Border;
@@ -66,7 +65,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected var actualParent:DisplayObjectContainer;
+ protected var actualParent:UIBase;
/**
* @copy org.apache.flex.core.IBead#strand
@@ -85,7 +84,7 @@ package org.apache.flex.html.beads
if (contentAreaNeeded())
{
actualParent = new ContainerContentArea();
- DisplayObjectContainer(value).addChild(actualParent);
+ UIBase(value).addElement(actualParent);
Container(value).setActualParent(actualParent);
actualParent.x = padding.paddingLeft;
actualParent.y = padding.paddingTop;
@@ -191,7 +190,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get contentView():DisplayObjectContainer
+ public function get contentView():IParentIUIBase
{
return actualParent;
}
@@ -204,9 +203,9 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get resizableView():DisplayObject
+ public function get resizableView():IUIBase
{
- return _strand as DisplayObject;
+ return _strand as IUIBase;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
index 0b98577..3173acb 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ListView.as
@@ -18,9 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadLayout;
@@ -30,6 +27,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IRollOverModel;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
@@ -136,17 +134,17 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get contentView():DisplayObjectContainer
+ public function get contentView():IParentIUIBase
{
- return _dataGroup as DisplayObjectContainer;
+ return _dataGroup as IParentIUIBase;
}
/**
* @private
*/
- public function get resizableView():DisplayObject
+ public function get resizableView():IUIBase
{
- return _strand as DisplayObject;
+ return _strand as IUIBase;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
index d8b3104..33e14de 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -18,15 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.ILayoutParent;
- import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IRangeModel;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.createjs.Label;
import org.apache.flex.events.Event;
@@ -175,9 +174,9 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get contentView():DisplayObjectContainer
+ public function get contentView():IParentIUIBase
{
- return _strand as DisplayObjectContainer;
+ return _strand as IParentIUIBase;
}
/**
@@ -207,9 +206,9 @@ package org.apache.flex.html.beads
/**
* @private
*/
- public function get resizableView():DisplayObject
+ public function get resizableView():IUIBase
{
- return _strand as DisplayObject;
+ return _strand as IUIBase;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollingContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollingContainerView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollingContainerView.as
index 4feb591..af1ee3a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollingContainerView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/ScrollingContainerView.as
@@ -18,15 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IScrollingLayoutParent;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.html.Container;
@@ -68,7 +68,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected var actualParent:DisplayObjectContainer;
+ protected var actualParent:UIBase;
/**
* @copy org.apache.flex.core.IBead#strand
@@ -87,7 +87,7 @@ package org.apache.flex.html.beads
if (contentAreaNeeded())
{
actualParent = new ContainerContentArea();
- DisplayObjectContainer(value).addChild(actualParent);
+ IParent(value).addElement(actualParent);
Container(value).setActualParent(actualParent);
actualParent.x = padding.paddingLeft;
actualParent.y = padding.paddingTop;
@@ -193,7 +193,7 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get contentView():DisplayObjectContainer
+ public function get contentView():IParentIUIBase
{
return actualParent;
}
@@ -219,9 +219,9 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get resizableView():DisplayObject
+ public function get resizableView():IUIBase
{
- return _strand as DisplayObject;
+ return _strand as IUIBase;
}
private var _vScrollBar:ScrollBar;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
index 55148ca..69fd35b 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
@@ -17,10 +17,7 @@
//
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.layouts
-{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
+{
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.IItemRendererClassFactory;
@@ -28,7 +25,8 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -105,19 +103,12 @@ package org.apache.flex.html.beads.layouts
private function changeHandler(event:Event):void
{
var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
-
- var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- var dp:Array = selectionModel.dataProvider as Array;
- if (!dp)
- return;
-
- var itemRendererFactory:IItemRendererClassFactory = _strand.getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
+ var contentView:IParent = layoutParent.contentView;
- var n:int = dp.length;
+ var n:int = contentView.numElements;
var xpos:Number = 0;
- var useWidth:Number = DisplayObject(_strand).width / n;
- var useHeight:Number = DisplayObject(_strand).height;
+ var useWidth:Number = IUIBase(_strand).width / n;
+ var useHeight:Number = IUIBase(_strand).height;
for (var i:int = 0; i < n; i++)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index dd47b2e..2e315b1 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -18,12 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.layouts
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
@@ -78,9 +77,9 @@ package org.apache.flex.html.beads.layouts
private function changeHandler(event:Event):void
{
var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
+ var contentView:IParent = layoutParent.contentView;
- var n:int = contentView.numChildren;
+ var n:int = contentView.numElements;
var marginLeft:Object;
var marginRight:Object;
var marginTop:Object;
@@ -91,7 +90,7 @@ package org.apache.flex.html.beads.layouts
for (var i:int = n - 1; i >= 0; i--)
{
- var child:DisplayObject = contentView.getChildAt(i);
+ var child:IUIBase = contentView.getElementAt(i) as IUIBase;
margin = ValuesManager.valuesImpl.getValue(child, "margin");
if (margin is Array)
{
@@ -150,7 +149,7 @@ package org.apache.flex.html.beads.layouts
}
child.y = mt;
maxHeight = Math.max(maxHeight, ml + child.height + mr);
- var xx:Number = contentView.width;
+ var xx:Number = layoutParent.resizableView.width;
if (i == 0)
{
child.x = ml;
@@ -166,7 +165,7 @@ package org.apache.flex.html.beads.layouts
for (i = 0; i < n; i++)
{
var obj:Object = verticalMargins[0]
- child = contentView.getChildAt(i);
+ child = contentView.getElementAt(i) as IUIBase;
if (obj.valign == "middle")
child.y = maxHeight - child.height / 2;
else if (valign == "bottom")
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
index 37b3dbf..3d133de 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
@@ -18,13 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.layouts
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.ILayoutParent;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -76,9 +74,9 @@ package org.apache.flex.html.beads.layouts
private function changeHandler(event:Event):void
{
var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
+ var contentView:IParentIUIBase = layoutParent.contentView;
- var n:int = contentView.numChildren;
+ var n:int = contentView.numElements;
var marginLeft:Object;
var marginRight:Object;
var marginTop:Object;
@@ -89,7 +87,7 @@ package org.apache.flex.html.beads.layouts
for (var i:int = 0; i < n; i++)
{
- var child:DisplayObject = contentView.getChildAt(i);
+ var child:IUIBase = contentView.getElementAt(i) as IUIBase;
margin = ValuesManager.valuesImpl.getValue(child, "margin");
if (margin is Array)
{
@@ -161,7 +159,7 @@ package org.apache.flex.html.beads.layouts
for (i = 0; i < n; i++)
{
var obj:Object = verticalMargins[0]
- child = contentView.getChildAt(i);
+ child = contentView.getElementAt(i) as IUIBase;
if (obj.valign == "middle")
child.y = maxHeight - child.height / 2;
else if (valign == "bottom")
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
index cf62129..4cc9657 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalScrollingLayout.as
@@ -18,13 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.layouts
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBorderModel;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IScrollingLayoutParent;
- import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.html.supportClasses.Border;
@@ -81,7 +80,7 @@ package org.apache.flex.html.beads.layouts
{
var layoutParent:IScrollingLayoutParent =
_strand.getBeadByType(IScrollingLayoutParent) as IScrollingLayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
+ var contentView:IParentIUIBase = layoutParent.contentView;
var border:Border = layoutParent.border;
var borderModel:IBorderModel = border.model as IBorderModel;
@@ -95,11 +94,11 @@ package org.apache.flex.html.beads.layouts
contentView.x = borderModel.offsets.left;
contentView.y = borderModel.offsets.top;
- var n:int = contentView.numChildren;
+ var n:int = contentView.numElements;
var xx:Number = 0;
for (var i:int = 0; i < n; i++)
{
- var ir:DisplayObject = contentView.getChildAt(i);
+ var ir:IUIBase = contentView.getElementAt(i) as IUIBase;
ir.x = xx;
ir.height = contentView.height;
xx += ir.width;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
index cf1d3ce..1d0bb2a 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.as
@@ -18,12 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads.layouts
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
import org.apache.flex.core.IBead;
import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -75,9 +75,9 @@ package org.apache.flex.html.beads.layouts
private function changeHandler(event:Event):void
{
var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
+ var contentView:IParentIUIBase = layoutParent.contentView;
- var n:int = contentView.numChildren;
+ var n:int = contentView.numElements;
var hasHorizontalFlex:Boolean;
var flexibleHorizontalMargins:Array = [];
var marginLeft:Object;
@@ -88,7 +88,7 @@ package org.apache.flex.html.beads.layouts
var maxWidth:Number = 0;
for (var i:int = 0; i < n; i++)
{
- var child:DisplayObject = contentView.getChildAt(i);
+ var child:IUIBase = contentView.getElementAt(i) as IUIBase;
margin = ValuesManager.valuesImpl.getValue(child, "margin");
if (margin is Array)
{
@@ -178,7 +178,7 @@ package org.apache.flex.html.beads.layouts
{
for (i = 0; i < n; i++)
{
- child = contentView.getChildAt(i);
+ child = contentView.getElementAt(i) as IUIBase;
var obj:Object = flexibleHorizontalMargins[i];
if (obj.marginLeft == "auto" && obj.marginRight == "auto")
child.x = maxWidth - child.width / 2;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af8213da/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
index 4d3e1c3..21ccbf2 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as
@@ -19,8 +19,7 @@
package org.apache.flex.html.beads.layouts
{
import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
- import flash.geom.Rectangle;
+ import flash.geom.Rectangle;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IBorderModel;
@@ -35,11 +34,21 @@ package org.apache.flex.html.beads.layouts
=======
import org.apache.flex.core.IScrollingLayoutParent;
import org.apache.flex.core.ILayoutParent;
+<<<<<<< HEAD
>>>>>>> refactor ILayoutParent into IScrollingLayoutParent
+||||||| merged common ancestors
+=======
+ import org.apache.flex.core.IParentIUIBase;
+>>>>>>> get rid of DisplayObject and DisplayObjectContainer dependencies in ILayoutParent
import org.apache.flex.core.IScrollBarModel;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
+<<<<<<< HEAD
import org.apache.flex.core.UIBase;
+||||||| merged common ancestors
+=======
+ import org.apache.flex.core.IUIBase;
+>>>>>>> get rid of DisplayObject and DisplayObjectContainer dependencies in ILayoutParent
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.html.List;
@@ -96,46 +105,32 @@ package org.apache.flex.html.beads.layouts
private function changeHandler(event:Event):void
{
+<<<<<<< HEAD
var layoutParent:IScrollingLayoutParent =
_strand.getBeadByType(IScrollingLayoutParent) as IScrollingLayoutParent;
var contentView:IContentView = layoutParent.contentView as IContentView;
var border:Border = layoutParent.border;
var borderModel:IBorderModel = border.model as IBorderModel;
- var ww:Number = DisplayObject(layoutParent.resizableView).width;
- var hh:Number = DisplayObject(layoutParent.resizableView).height;
- border.width = ww;
- border.height = hh;
-
+ var ww:Number = layoutParent.resizableView.width;
+ var hh:Number = layoutParent.resizableView.height;
+ border.width = ww;
+ border.height = hh;
+
contentView.width = ww - borderModel.offsets.left - borderModel.offsets.right;
contentView.height = hh - borderModel.offsets.top - borderModel.offsets.bottom;
contentView.x = borderModel.offsets.left;
contentView.y = borderModel.offsets.top;
- var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- var dp:Array = selectionModel.dataProvider as Array;
- if (!dp)
- return;
-
- var itemRendererFactory:IItemRendererClassFactory = _strand.getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
-
- var n:int = dp.length;
+ var n:int = contentView.numElements;
var yy:Number = 0;
for (var i:int = 0; i < n; i++)
{
- var needsAdd:Boolean = false;
- var ir:IItemRenderer = IItemRendererParent(contentView).getItemRendererForIndex(i);
- if (ir == null) {
- ir = itemRendererFactory.createItemRenderer(contentView as IItemRendererParent) as IItemRenderer;
- }
- ir.index = i;
- ir.labelField = (_strand as List).labelField;
- ir.data = dp[i];
- UIBase(ir).y = yy;
- UIBase(ir).x = 0;
- UIBase(ir).width = contentView.width;
- yy += UIBase(ir).height;
+ var ir:IUIBase = contentView.getElementAt(i) as IUIBase;
+ ir.y = yy;
+ ir.width = contentView.width;
+ yy += ir.height;
}
if (yy > contentView.height)
{
@@ -148,13 +143,13 @@ package org.apache.flex.html.beads.layouts
vScrollBar.height = contentView.height;
vScrollBar.y = contentView.y;
vScrollBar.x = contentView.width;
- var vpos:Number = IScrollBarModel(vScrollBar.model).value;
- DisplayObjectContainer(contentView).scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
- vScrollBar.addEventListener("scroll", scrollHandler);
+ var vpos:Number = IScrollBarModel(vScrollBar.model).value;
+ DisplayObject(contentView).scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
+ vScrollBar.addEventListener("scroll", scrollHandler);
}
else if (vScrollBar)
{
- DisplayObjectContainer(contentView).scrollRect = null;
+ DisplayObject(contentView).scrollRect = null;
vScrollBar.visible = false;
}
}
@@ -162,10 +157,10 @@ package org.apache.flex.html.beads.layouts
private function scrollHandler(event:Event):void
{
var layoutParent:ILayoutParent = _strand.getBeadByType(ILayoutParent) as ILayoutParent;
- var contentView:DisplayObjectContainer = layoutParent.contentView;
+ var contentView:IParentIUIBase = layoutParent.contentView;
var vpos:Number = IScrollBarModel(vScrollBar.model).value;
- contentView.scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
+ DisplayObject(contentView).scrollRect = new Rectangle(0, vpos, contentView.width, vpos + contentView.height);
}
}
}