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 2017/02/09 05:44:55 UTC
[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/dual] - replicate
096f56271ff472fa1859b1e79326a03cd82dd0a4 to Basic
replicate 096f56271ff472fa1859b1e79326a03cd82dd0a4 to Basic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/79388f8c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/79388f8c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/79388f8c
Branch: refs/heads/dual
Commit: 79388f8cf1e37d9484798dc785daed848827f2c5
Parents: e8d55a0
Author: Alex Harui <ah...@apache.org>
Authored: Sat Feb 4 23:36:19 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Feb 4 23:36:19 2017 -0800
----------------------------------------------------------------------
.../Basic/src/main/flex/BasicClasses.as | 2 +
.../flex/org/apache/flex/html/DataContainer.as | 255 +++++++++++++++++++
.../apache/flex/html/beads/DataContainerView.as | 170 +++++++++++++
.../DataItemRendererFactoryForArrayData.as | 12 +-
.../DataItemRendererFactoryForArrayList.as | 12 +-
...ataItemRendererFactoryForHierarchicalData.as | 4 +-
.../flex/html/beads/models/DataProviderModel.as | 117 +++++++++
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../Basic/src/main/resources/defaults.css | 16 ++
.../flex/org/apache/flex/html/DataContainer.as | 255 -------------------
.../apache/flex/html/beads/DataContainerView.as | 170 -------------
.../flex/html/beads/models/DataProviderModel.as | 117 ---------
12 files changed, 575 insertions(+), 556 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index 4d71c4e..d181899 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -199,6 +199,8 @@ internal class BasicClasses
import org.apache.flex.svg.Text; Text;
import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
+ import org.apache.flex.html.beads.models.DataProviderModel; DataProviderModel;
+ import org.apache.flex.html.beads.DataContainerView; DataContainerView;
COMPILE::SWF
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DataContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DataContainer.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DataContainer.as
new file mode 100644
index 0000000..5d33d55
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DataContainer.as
@@ -0,0 +1,255 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.html
+{
+ import org.apache.flex.core.ContainerBaseStrandChildren;
+ import org.apache.flex.core.IContentViewHost;
+ import org.apache.flex.core.IDataProviderItemRendererMapper;
+ import org.apache.flex.core.IFactory;
+ import org.apache.flex.core.IItemRendererClassFactory;
+ import org.apache.flex.core.IItemRendererProvider;
+ import org.apache.flex.core.IListPresentationModel;
+ import org.apache.flex.core.IRollOverModel;
+ import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.ListBase;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ import org.apache.flex.html.beads.ListView;
+ import org.apache.flex.html.supportClasses.DataGroup;
+ }
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.beads.models.ListPresentationModel;
+
+ /**
+ * Indicates that the initialization of the list is complete.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="initComplete", type="org.apache.flex.events.Event")]
+
+ /**
+ * The List class is a component that displays multiple data items. The List uses
+ * the following bead types:
+ *
+ * org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider.
+ * org.apache.flex.core.IBeadView: the bead that constructs the visual parts of the list.
+ * org.apache.flex.core.IBeadController: the bead that handles input and output.
+ * org.apache.flex.core.IBeadLayout: the bead responsible for the size and position of the itemRenderers.
+ * org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
+ * org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the list.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class DataContainer extends ListBase implements IItemRendererProvider
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function DataContainer()
+ {
+ super();
+ addEventListener("beadsAdded", beadsAddedHandler);
+ }
+
+ /**
+ * The name of field within the data used for display. Each item of the
+ * data should have a property with this name.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get labelField():String
+ {
+ return IDataProviderModel(model).labelField;
+ }
+ public function set labelField(value:String):void
+ {
+ IDataProviderModel(model).labelField = value;
+ }
+
+ /**
+ * The data being display by the List.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get dataProvider():Object
+ {
+ return IDataProviderModel(model).dataProvider;
+ }
+ public function set dataProvider(value:Object):void
+ {
+ IDataProviderModel(model).dataProvider = value;
+ }
+
+
+ /**
+ * The presentation model for the list.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get presentationModel():IListPresentationModel
+ {
+ var presModel:IListPresentationModel = getBeadByType(IListPresentationModel) as IListPresentationModel;
+ if (presModel == null) {
+ presModel = new ListPresentationModel();
+ addBead(presModel);
+ }
+ return presModel;
+ }
+
+ /**
+ * The default height of each cell in every column
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get rowHeight():Number
+ {
+ return presentationModel.rowHeight;
+ }
+ public function set rowHeight(value:Number):void
+ {
+ presentationModel.rowHeight = value;
+ }
+
+ private var _itemRenderer:IFactory;
+
+ /**
+ * The class or factory used to display each item.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get itemRenderer():IFactory
+ {
+ return _itemRenderer;
+ }
+ public function set itemRenderer(value:IFactory):void
+ {
+ _itemRenderer = value;
+ }
+
+ /**
+ * Returns whether or not the itemRenderer property has been set.
+ *
+ * @see org.apache.flex.core.IItemRendererProvider
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get hasItemRenderer():Boolean
+ {
+ var result:Boolean = false;
+
+ COMPILE::SWF {
+ result = _itemRenderer != null;
+ }
+
+ COMPILE::JS {
+ var test:* = _itemRenderer;
+ result = _itemRenderer !== null && test !== undefined;
+ }
+
+ return result;
+ }
+
+
+ /**
+ * @private
+ */
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ dispatchEvent(new Event("initComplete"));
+ }
+
+ /**
+ * @private
+ */
+ private function beadsAddedHandler(e:Event):void
+ {
+ if (getBeadByType(IDataProviderItemRendererMapper) == null)
+ {
+ var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
+ addBead(mapper);
+ }
+ var itemRendererFactory:IItemRendererClassFactory = getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
+ if (!itemRendererFactory)
+ {
+ itemRendererFactory = new (ValuesManager.valuesImpl.getValue(this, "iItemRendererClassFactory")) as IItemRendererClassFactory;
+ addBead(itemRendererFactory);
+ }
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ super.createElement();
+ className = 'List';
+
+ return element;
+ }
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.html.beads.ListView
+ * @flexjsignorecoercion org.apache.flex.html.supportClasses.DataGroup
+ */
+ COMPILE::JS
+ override public function internalChildren():Array
+ {
+ var listView:ListView = getBeadByType(ListView) as ListView;
+ var dg:DataGroup = listView.dataGroup as DataGroup;
+ var renderers:Array = dg.internalChildren();
+ return renderers;
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataContainerView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
new file mode 100644
index 0000000..b32df59
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
@@ -0,0 +1,170 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.html.beads
+{
+ import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.ContainerBase;
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IBeadLayout;
+ import org.apache.flex.core.IBeadModel;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.ISelectableItemRenderer;
+ import org.apache.flex.core.IItemRenderer;
+ import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.Strand;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.beads.models.ScrollBarModel;
+ import org.apache.flex.html.beads.models.SingleLineBorderModel;
+ import org.apache.flex.html.supportClasses.Border;
+ import org.apache.flex.html.supportClasses.DataGroup;
+ import org.apache.flex.html.supportClasses.ScrollBar;
+
+ /**
+ * The List class creates the visual elements of the org.apache.flex.html.List
+ * component. A List consists of the area to display the data (in the dataGroup), any
+ * scrollbars, and so forth.
+ *
+ * @viewbead
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class DataContainerView extends ContainerView implements IListView
+ {
+ public function DataContainerView()
+ {
+ }
+
+ protected var listModel:IDataProviderModel;
+
+ private var _border:Border;
+
+ /**
+ * The border surrounding the org.apache.flex.html.List.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get border():Border
+ {
+ return _border;
+ }
+
+ /**
+ * The area holding the itemRenderers.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get dataGroup():IItemRendererParent
+ {
+ (contentView as UIBase).className = "ListDataGroup";
+ return contentView as IItemRendererParent;
+ }
+
+ /**
+ * @private
+ */
+ override public function get resizableView():IUIBase
+ {
+ return _strand as IUIBase;
+ }
+
+ /**
+ * @private
+ */
+ override public function get host():IUIBase
+ {
+ return _strand as IUIBase;
+ }
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ super.strand = value;
+ }
+
+ override protected function completeSetup():void
+ {
+ super.completeSetup();
+
+ // list is not interested in UI children, it wants to know when new items
+ // have been added or the dataProvider has changed.
+
+ host.removeEventListener("childrenAdded", childrenChangedHandler);
+ host.removeEventListener("childrenAdded", performLayout);
+ host.addEventListener("itemsCreated", itemsCreatedHandler);
+
+ listModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
+ listModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+ }
+
+ protected var lastSelectedIndex:int = -1;
+
+ /**
+ * @private
+ */
+ protected function itemsCreatedHandler(event:Event):void
+ {
+ performLayout(event);
+ }
+
+ /**
+ * @private
+ */
+ protected function dataProviderChangeHandler(event:Event):void
+ {
+ performLayout(event);
+ }
+
+ /**
+ * respond to a change in size or request to re-layout everything
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override protected function resizeHandler(event:Event):void
+ {
+ super.resizeHandler(event);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
index 073e533..b4250b6 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
@@ -24,7 +24,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.SimpleCSSStyles;
@@ -65,7 +65,7 @@ package org.apache.flex.html.beads
super(target);
}
- private var selectionModel:ISelectionModel;
+ private var dataProviderModel:IDataProviderModel;
private var labelField:String;
@@ -88,12 +88,12 @@ package org.apache.flex.html.beads
private function finishSetup(event:Event):void
{
- selectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+ dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
var listView:IListView = _strand.getBeadByType(IListView) as IListView;
dataGroup = listView.dataGroup;
- selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+ dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
- labelField = (listView.host as List).labelField;
+ labelField = dataProviderModel.labelField;
if (!itemRendererFactory)
{
@@ -141,7 +141,7 @@ package org.apache.flex.html.beads
private function dataProviderChangeHandler(event:Event):void
{
- var dp:Array = selectionModel.dataProvider as Array;
+ var dp:Array = dataProviderModel.dataProvider as Array;
if (!dp)
return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
index 42b159c..ff50b18 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
@@ -25,7 +25,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.SimpleCSSStyles;
@@ -66,7 +66,7 @@ package org.apache.flex.html.beads
super(target);
}
- protected var selectionModel:ISelectionModel;
+ private var dataProviderModel:IDataProviderModel;
protected var labelField:String;
@@ -89,12 +89,12 @@ package org.apache.flex.html.beads
private function finishSetup(event:Event):void
{
- selectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+ dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
var listView:IListView = _strand.getBeadByType(IListView) as IListView;
dataGroup = listView.dataGroup;
- selectionModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+ dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
- labelField = (listView.host as List).labelField;
+ labelField = dataProviderModel.labelField;
if (!itemRendererFactory)
{
@@ -158,7 +158,7 @@ package org.apache.flex.html.beads
*/
protected function dataProviderChangeHandler(event:Event):void
{
- var dp:IArrayList = selectionModel.dataProvider as IArrayList;
+ var dp:IArrayList = dataProviderModel.dataProvider as IArrayList;
if (!dp)
return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForHierarchicalData.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForHierarchicalData.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForHierarchicalData.as
index 5c9c59c..1cf4f57 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForHierarchicalData.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForHierarchicalData.as
@@ -24,7 +24,7 @@ package org.apache.flex.html.beads
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.SimpleCSSStyles;
@@ -95,7 +95,7 @@ package org.apache.flex.html.beads
override protected function setData(ir:ISelectableItemRenderer, data:Object, index:int):void
{
// Set the listData with the depth of this item
- var flatList:FlattenedList = selectionModel.dataProvider as FlattenedList;
+ var flatList:FlattenedList = dataProviderModel.dataProvider as FlattenedList;
var depth:int = flatList.getDepth(data);
var isOpen:Boolean = flatList.isOpen(data);
var hasChildren:Boolean = flatList.hasChildren(data);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
new file mode 100644
index 0000000..8217922
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
@@ -0,0 +1,117 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.html.beads.models
+{
+ import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ /**
+ * The DataProviderModel class is a model for
+ * a dataProvider and an optional labelField.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class DataProviderModel extends EventDispatcher implements IDataProviderModel
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function DataProviderModel()
+ {
+ }
+
+ private var _strand:IStrand;
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
+ private var _dataProvider:Object;
+
+ /**
+ * @copy org.apache.flex.core.ISelectionModel#dataProvider
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get dataProvider():Object
+ {
+ return _dataProvider;
+ }
+
+ /**
+ * @private
+ */
+ public function set dataProvider(value:Object):void
+ {
+ if (value === _dataProvider) return;
+
+ _dataProvider = value;
+ dispatchEvent(new Event("dataProviderChanged"));
+ }
+
+ private var _labelField:String = null;
+
+ /**
+ * @copy org.apache.flex.core.ISelectionModel#labelField
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get labelField():String
+ {
+ return _labelField;
+ }
+
+ /**
+ * @private
+ */
+ public function set labelField(value:String):void
+ {
+ if (value != _labelField) {
+ _labelField = value;
+ dispatchEvent(new Event("labelFieldChanged"));
+ }
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index cec4f60..7ccb7d5 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -37,6 +37,7 @@
<component id="ToggleTextButton" class="org.apache.flex.html.ToggleTextButton"/>
<component id="TextInput" class="org.apache.flex.html.TextInput"/>
<component id="TextArea" class="org.apache.flex.html.TextArea"/>
+ <component id="DataContainer" class="org.apache.flex.html.DataContainer"/>
<component id="List" class="org.apache.flex.html.List"/>
<component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
<component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 1c23519..a7783a7 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -512,6 +512,22 @@ ControlBar
iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
}
+DataContainer
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataProviderModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DataContainerView");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
+ IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
+ IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
+ IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
+ border-style: solid;
+ border-color: #222222;
+}
+
+
DropDownList
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DataContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DataContainer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DataContainer.as
deleted file mode 100644
index 5d33d55..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DataContainer.as
+++ /dev/null
@@ -1,255 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.html
-{
- import org.apache.flex.core.ContainerBaseStrandChildren;
- import org.apache.flex.core.IContentViewHost;
- import org.apache.flex.core.IDataProviderItemRendererMapper;
- import org.apache.flex.core.IFactory;
- import org.apache.flex.core.IItemRendererClassFactory;
- import org.apache.flex.core.IItemRendererProvider;
- import org.apache.flex.core.IListPresentationModel;
- import org.apache.flex.core.IRollOverModel;
- import org.apache.flex.core.IDataProviderModel;
- import org.apache.flex.core.ListBase;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.ValuesManager;
- COMPILE::JS
- {
- import org.apache.flex.core.WrappedHTMLElement;
- import org.apache.flex.html.beads.ListView;
- import org.apache.flex.html.supportClasses.DataGroup;
- }
- import org.apache.flex.events.Event;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.beads.models.ListPresentationModel;
-
- /**
- * Indicates that the initialization of the list is complete.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="initComplete", type="org.apache.flex.events.Event")]
-
- /**
- * The List class is a component that displays multiple data items. The List uses
- * the following bead types:
- *
- * org.apache.flex.core.IBeadModel: the data model, which includes the dataProvider.
- * org.apache.flex.core.IBeadView: the bead that constructs the visual parts of the list.
- * org.apache.flex.core.IBeadController: the bead that handles input and output.
- * org.apache.flex.core.IBeadLayout: the bead responsible for the size and position of the itemRenderers.
- * org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating the itemRenders.
- * org.apache.flex.core.IItemRenderer: the class or factory used to display an item in the list.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class DataContainer extends ListBase implements IItemRendererProvider
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function DataContainer()
- {
- super();
- addEventListener("beadsAdded", beadsAddedHandler);
- }
-
- /**
- * The name of field within the data used for display. Each item of the
- * data should have a property with this name.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get labelField():String
- {
- return IDataProviderModel(model).labelField;
- }
- public function set labelField(value:String):void
- {
- IDataProviderModel(model).labelField = value;
- }
-
- /**
- * The data being display by the List.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get dataProvider():Object
- {
- return IDataProviderModel(model).dataProvider;
- }
- public function set dataProvider(value:Object):void
- {
- IDataProviderModel(model).dataProvider = value;
- }
-
-
- /**
- * The presentation model for the list.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get presentationModel():IListPresentationModel
- {
- var presModel:IListPresentationModel = getBeadByType(IListPresentationModel) as IListPresentationModel;
- if (presModel == null) {
- presModel = new ListPresentationModel();
- addBead(presModel);
- }
- return presModel;
- }
-
- /**
- * The default height of each cell in every column
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get rowHeight():Number
- {
- return presentationModel.rowHeight;
- }
- public function set rowHeight(value:Number):void
- {
- presentationModel.rowHeight = value;
- }
-
- private var _itemRenderer:IFactory;
-
- /**
- * The class or factory used to display each item.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get itemRenderer():IFactory
- {
- return _itemRenderer;
- }
- public function set itemRenderer(value:IFactory):void
- {
- _itemRenderer = value;
- }
-
- /**
- * Returns whether or not the itemRenderer property has been set.
- *
- * @see org.apache.flex.core.IItemRendererProvider
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get hasItemRenderer():Boolean
- {
- var result:Boolean = false;
-
- COMPILE::SWF {
- result = _itemRenderer != null;
- }
-
- COMPILE::JS {
- var test:* = _itemRenderer;
- result = _itemRenderer !== null && test !== undefined;
- }
-
- return result;
- }
-
-
- /**
- * @private
- */
- override public function addedToParent():void
- {
- super.addedToParent();
-
- dispatchEvent(new Event("initComplete"));
- }
-
- /**
- * @private
- */
- private function beadsAddedHandler(e:Event):void
- {
- if (getBeadByType(IDataProviderItemRendererMapper) == null)
- {
- var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
- addBead(mapper);
- }
- var itemRendererFactory:IItemRendererClassFactory = getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
- if (!itemRendererFactory)
- {
- itemRendererFactory = new (ValuesManager.valuesImpl.getValue(this, "iItemRendererClassFactory")) as IItemRendererClassFactory;
- addBead(itemRendererFactory);
- }
- }
-
- /**
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- super.createElement();
- className = 'List';
-
- return element;
- }
-
- /**
- * @flexjsignorecoercion org.apache.flex.html.beads.ListView
- * @flexjsignorecoercion org.apache.flex.html.supportClasses.DataGroup
- */
- COMPILE::JS
- override public function internalChildren():Array
- {
- var listView:ListView = getBeadByType(ListView) as ListView;
- var dg:DataGroup = listView.dataGroup as DataGroup;
- var renderers:Array = dg.internalChildren();
- return renderers;
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
deleted file mode 100644
index b32df59..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataContainerView.as
+++ /dev/null
@@ -1,170 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.html.beads
-{
- import org.apache.flex.core.BeadViewBase;
- import org.apache.flex.core.ContainerBase;
- import org.apache.flex.core.IBead;
- import org.apache.flex.core.IBeadLayout;
- import org.apache.flex.core.IBeadModel;
- import org.apache.flex.core.IBeadView;
- import org.apache.flex.core.ISelectableItemRenderer;
- import org.apache.flex.core.IItemRenderer;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IParent;
- import org.apache.flex.core.IParentIUIBase;
- import org.apache.flex.core.IDataProviderModel;
- import org.apache.flex.core.IStrand;
- import org.apache.flex.core.IUIBase;
- import org.apache.flex.core.Strand;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.ValuesManager;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.beads.models.ScrollBarModel;
- import org.apache.flex.html.beads.models.SingleLineBorderModel;
- import org.apache.flex.html.supportClasses.Border;
- import org.apache.flex.html.supportClasses.DataGroup;
- import org.apache.flex.html.supportClasses.ScrollBar;
-
- /**
- * The List class creates the visual elements of the org.apache.flex.html.List
- * component. A List consists of the area to display the data (in the dataGroup), any
- * scrollbars, and so forth.
- *
- * @viewbead
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class DataContainerView extends ContainerView implements IListView
- {
- public function DataContainerView()
- {
- }
-
- protected var listModel:IDataProviderModel;
-
- private var _border:Border;
-
- /**
- * The border surrounding the org.apache.flex.html.List.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get border():Border
- {
- return _border;
- }
-
- /**
- * The area holding the itemRenderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get dataGroup():IItemRendererParent
- {
- (contentView as UIBase).className = "ListDataGroup";
- return contentView as IItemRendererParent;
- }
-
- /**
- * @private
- */
- override public function get resizableView():IUIBase
- {
- return _strand as IUIBase;
- }
-
- /**
- * @private
- */
- override public function get host():IUIBase
- {
- return _strand as IUIBase;
- }
-
- /**
- * @copy org.apache.flex.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function set strand(value:IStrand):void
- {
- _strand = value;
- super.strand = value;
- }
-
- override protected function completeSetup():void
- {
- super.completeSetup();
-
- // list is not interested in UI children, it wants to know when new items
- // have been added or the dataProvider has changed.
-
- host.removeEventListener("childrenAdded", childrenChangedHandler);
- host.removeEventListener("childrenAdded", performLayout);
- host.addEventListener("itemsCreated", itemsCreatedHandler);
-
- listModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
- listModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
- }
-
- protected var lastSelectedIndex:int = -1;
-
- /**
- * @private
- */
- protected function itemsCreatedHandler(event:Event):void
- {
- performLayout(event);
- }
-
- /**
- * @private
- */
- protected function dataProviderChangeHandler(event:Event):void
- {
- performLayout(event);
- }
-
- /**
- * respond to a change in size or request to re-layout everything
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override protected function resizeHandler(event:Event):void
- {
- super.resizeHandler(event);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/79388f8c/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
deleted file mode 100644
index 8217922..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/DataProviderModel.as
+++ /dev/null
@@ -1,117 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.html.beads.models
-{
- import org.apache.flex.core.IDataProviderModel;
- import org.apache.flex.core.IStrand;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.EventDispatcher;
-
- /**
- * The DataProviderModel class is a model for
- * a dataProvider and an optional labelField.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class DataProviderModel extends EventDispatcher implements IDataProviderModel
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function DataProviderModel()
- {
- }
-
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.flex.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
- }
-
- private var _dataProvider:Object;
-
- /**
- * @copy org.apache.flex.core.ISelectionModel#dataProvider
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get dataProvider():Object
- {
- return _dataProvider;
- }
-
- /**
- * @private
- */
- public function set dataProvider(value:Object):void
- {
- if (value === _dataProvider) return;
-
- _dataProvider = value;
- dispatchEvent(new Event("dataProviderChanged"));
- }
-
- private var _labelField:String = null;
-
- /**
- * @copy org.apache.flex.core.ISelectionModel#labelField
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get labelField():String
- {
- return _labelField;
- }
-
- /**
- * @private
- */
- public function set labelField(value:String):void
- {
- if (value != _labelField) {
- _labelField = value;
- dispatchEvent(new Event("labelFieldChanged"));
- }
- }
-
- }
-}