You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/10/25 18:48:39 UTC
[royale-asjs] branch develop updated: jewel-datagrid: remove
DataGrid dependencies from DataGridView and IDataGridColumnList
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 45af593 jewel-datagrid: remove DataGrid dependencies from DataGridView and IDataGridColumnList
45af593 is described below
commit 45af593cd69db5a5f0674f80a4fe04e013e886ba
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Oct 25 19:47:57 2020 +0100
jewel-datagrid: remove DataGrid dependencies from DataGridView and IDataGridColumnList
---
.../royale/org/apache/royale/jewel/beads/views/DataGridView.as | 10 +++++-----
.../jewel/supportClasses/datagrid/IDataGridColumnList.as | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
index 7dc9141..18d5e95 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
@@ -28,8 +28,10 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.IDataGridHeader;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataProviderModel;
+ import org.apache.royale.core.IItemRendererProvider;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IStrandWithModel;
import org.apache.royale.core.IUIBase;
import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.ValuesManager;
@@ -39,7 +41,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.html.beads.GroupView;
import org.apache.royale.html.beads.IDataGridView;
import org.apache.royale.html.beads.LabelFunction;
- import org.apache.royale.jewel.DataGrid;
import org.apache.royale.jewel.beads.models.DataGridColumnListPresentationModel;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
@@ -47,7 +48,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.utils.IEmphasis;
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.utils.observeElementSize;
- import org.apache.royale.core.IStrandWithModel;
/**
* The DataGridView class is the visual bead for the org.apache.royale.jewel.DataGrid.
@@ -208,7 +208,7 @@ package org.apache.royale.jewel.beads.views
var list:IDataGridColumnList = new columnClass();
list.columnInfo = dataGridColumn;
- list.datagrid = _dg as DataGrid;
+ list.datagrid = _dg;
list.emphasis = (_dg as IEmphasis).emphasis;
if (i == 0) {
@@ -225,8 +225,8 @@ package org.apache.royale.jewel.beads.views
// (list as ILayoutChild).percentWidth = 100 / len;
// need to add itemRenderer interface to DataGrid
- if((_dg as DataGrid).itemRenderer)
- list.itemRenderer = (_dg as DataGrid).itemRenderer;
+ if((_dg as IItemRendererProvider).itemRenderer)
+ list.itemRenderer = (_dg as IItemRendererProvider).itemRenderer;
else
list.itemRenderer = dataGridColumn.itemRenderer;
list.labelField = dataGridColumn.dataField;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
index a5fe2fd..823feba 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
@@ -18,9 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.supportClasses.datagrid
{
+ import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IListWithPresentationModel;
import org.apache.royale.html.supportClasses.IDataGridColumnList;
- import org.apache.royale.jewel.DataGrid;
import org.apache.royale.utils.IEmphasis;
/**
@@ -44,8 +44,8 @@ package org.apache.royale.jewel.supportClasses.datagrid
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- function get datagrid():DataGrid;
- function set datagrid(value:DataGrid):void;
+ function get datagrid():IDataGrid;
+ function set datagrid(value:IDataGrid):void;
/**
* The DataGridColumn for this list