This is an automated email from the ASF dual-hosted git repository. pent pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit fac04fd4a063dc6d2c7c941b17460ded68f86a14 Author: Peter Ent <[email protected]> AuthorDate: Fri Jan 5 15:12:19 2018 -0500 Reset DataGrid work prior to ICollectionView work. Will integrate DataGrid with ICollectionView later. --- .../projects/Basic/src/main/resources/defaults.css | 2 +- .../royale/org/apache/royale/html/beads/DataGridView.as | 8 ++------ .../org/apache/royale/html/beads/models/DataGridModel.as | 2 +- .../apache/royale/html/supportClasses/DataGridColumn.as | 16 ---------------- .../apache/royale/html/supportClasses/TreeGridColumn.as | 8 ++++---- 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index bf15027..1bd2af6 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -194,7 +194,7 @@ DataGridColumnList { IBeadView: ClassReference("org.apache.royale.html.beads.ListView"); IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController"); IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout"); - IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView"); + IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayList"); IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer"); IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport"); diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as index f3f2b82..c600ade 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as @@ -18,22 +18,19 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.html.beads { - import org.apache.royale.core.ClassFactory; import org.apache.royale.core.IBeadModel; import org.apache.royale.core.IBeadView; import org.apache.royale.core.IDataGridModel; import org.apache.royale.core.IDataGridPresentationModel; - import org.apache.royale.core.IFactory; import org.apache.royale.core.ISelectionModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.IUIBase; import org.apache.royale.core.ValuesManager; import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; - import org.apache.royale.html.Container; import org.apache.royale.html.DataGrid; import org.apache.royale.html.DataGridButtonBar; - import org.apache.royale.html.List; + import org.apache.royale.html.Container; import org.apache.royale.html.beads.IDataGridView; import org.apache.royale.html.beads.layouts.ButtonBarLayout; import org.apache.royale.html.beads.models.ButtonBarModel; @@ -274,8 +271,7 @@ package org.apache.royale.html.beads for (var i:int=0; i < sharedModel.columns.length; i++) { var dataGridColumn:DataGridColumn = sharedModel.columns[i] as DataGridColumn; - //var list:DataGridColumnList = new DataGridColumnList(); - var list:List = dataGridColumn.createList() as List; + var list:DataGridColumnList = new DataGridColumnList(); list.id = "dataGridColumn"+String(i); list.dataProvider = sharedModel.dataProvider; list.itemRenderer = dataGridColumn.itemRenderer; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as index 65c8e16..419f124 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as @@ -31,7 +31,7 @@ package org.apache.royale.html.beads.models * @playerversion AIR 2.6 * @productversion Royale 0.0 */ - public class DataGridModel extends SingleSelectionCollectionViewModel implements IDataGridModel + public class DataGridModel extends ArrayListSelectionModel implements IDataGridModel { /** * constructor. diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as index db15042..c1eccdd 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as @@ -19,7 +19,6 @@ package org.apache.royale.html.supportClasses { import org.apache.royale.core.IFactory; - import org.apache.royale.core.UIBase; /** * The DataGridColumn class is the collection of properties that describe @@ -67,16 +66,6 @@ package org.apache.royale.html.supportClasses _itemRenderer = value; } - private var _columnClass:IFactory; - public function get columnClass():IFactory - { - return _columnClass; - } - public function set columnClass(value:IFactory):void - { - _columnClass = value; - } - private var _columnWidth:Number = Number.NaN; /** @@ -134,10 +123,5 @@ package org.apache.royale.html.supportClasses { _dataField = value; } - - public function createList():UIBase - { - return new DataGridColumnList(); - } } } diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridColumn.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridColumn.as index 957a63e..574168a 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridColumn.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridColumn.as @@ -44,9 +44,9 @@ package org.apache.royale.html.supportClasses super(); } - override public function createList():UIBase - { - return new Tree(); - } +// override public function createList():UIBase +// { +// return new Tree(); +// } } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
