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/11/15 11:16:16 UTC
[royale-asjs] branch develop updated: jewel-virtualdatagrid: remove
createColumn from IDataGridColumn since was never used,
also add bead configuration for VirtualDataGridColumnList
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 2472d8a jewel-virtualdatagrid: remove createColumn from IDataGridColumn since was never used, also add bead configuration for VirtualDataGridColumnList
2472d8a is described below
commit 2472d8a5b2137b41f1a9416fd9adeaf86c48ddb0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Nov 15 12:16:03 2020 +0100
jewel-virtualdatagrid: remove createColumn from IDataGridColumn since was never used, also add bead configuration for VirtualDataGridColumnList
---
.../src/main/royale/VirtualListsPlayGround.mxml | 4 +-
.../projects/Jewel/src/main/resources/defaults.css | 8 +++
.../Jewel/src/main/resources/jewel-manifest.xml | 3 +-
.../royale/jewel/beads/views/DataGridView.as | 1 -
.../supportClasses/datagrid/DataGridColumn.as | 14 +----
.../supportClasses/datagrid/IDataGridColumn.as | 11 +---
.../datagrid/VirtualDataGridColumn.as | 63 ----------------------
.../Jewel/src/main/sass/components/_datagrid.sass | 6 ++-
8 files changed, 18 insertions(+), 92 deletions(-)
diff --git a/examples/jewel/TourDeJewel/src/main/royale/VirtualListsPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/VirtualListsPlayGround.mxml
index 397189e..05a3bc2 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/VirtualListsPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/VirtualListsPlayGround.mxml
@@ -172,8 +172,8 @@ limitations under the License.
<j:VirtualDataGrid localId="virtualDataGrid"
dataProvider="{productModel.productList}">
<j:columns>
- <j:VirtualDataGridColumn label="Title" dataField="title"/>
- <j:VirtualDataGridColumn label="Sales" dataField="sales"/>
+ <j:DataGridColumn label="Title" dataField="title"/>
+ <j:DataGridColumn label="Sales" dataField="sales"/>
</j:columns>
</j:VirtualDataGrid>
</j:Card>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 05ba274..a87cf91 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -557,6 +557,14 @@ j|VirtualDataGrid {
columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.VirtualDataGridColumnList");
}
+j|VirtualDataGridColumnList {
+ IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory");
+ IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.DataGridItemRenderer");
+ IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataGridColumnListItemRendererInitializer");
+ ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead");
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport");
+}
+
.jewel.datechooser .jewel.table {
min-width: 324px;
min-height: 364px;
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 5370713..6b30ee3 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -55,8 +55,7 @@
<component id="VirtualDataGrid" class="org.apache.royale.jewel.VirtualDataGrid"/>
<component id="VirtualDataGridColumnList" class="org.apache.royale.jewel.supportClasses.datagrid.VirtualDataGridColumnList"/>
- <component id="VirtualDataGridColumn" class="org.apache.royale.jewel.supportClasses.datagrid.VirtualDataGridColumn"/>
-
+
<component id="DataGridColumnLabelsChange" class="org.apache.royale.jewel.beads.controls.datagrid.DataGridColumnLabelsChange"/>
<component id="DataGridSort" class="org.apache.royale.jewel.beads.controls.datagrid.DataGridSort"/>
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 18d5e95..fe1fbd1 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
@@ -200,7 +200,6 @@ package org.apache.royale.jewel.beads.views
var len:uint = sharedModel.columns.length;
for (var i:int=0; i < len; i++)
{
-
ignoreSizeChange = i != len-1;
var dataGridColumn:IDataGridColumn = sharedModel.columns[i] as IDataGridColumn;
IEventDispatcher(dataGridColumn).addEventListener("labelChanged", labelChangedHandler);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumn.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumn.as
index 2996fb0..39ca575 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumn.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/DataGridColumn.as
@@ -47,19 +47,7 @@ public class DataGridColumn extends TableColumn implements IDataGridColumn
{
}
- /**
- * Returns a new instance of a UIBase component to be used as the actual
- * column in the grid.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- public function createColumn():IStyledUIBase
- {
- return new DataGridColumnList();
- }
+
private var _visible:Boolean = true;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumn.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumn.as
index aa78664..ad38054 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumn.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumn.as
@@ -30,15 +30,6 @@ package org.apache.royale.jewel.supportClasses.datagrid
*/
public interface IDataGridColumn extends ITableColumn
{
- /**
- * Returns a new instance of a UIBase component to be used as the actual
- * column in the grid.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- function createColumn():IStyledUIBase;
+
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/VirtualDataGridColumn.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/VirtualDataGridColumn.as
deleted file mode 100644
index 8db1ab6..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/VirtualDataGridColumn.as
+++ /dev/null
@@ -1,63 +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.royale.jewel.supportClasses.datagrid
-{
- import org.apache.royale.core.IStyledUIBase;
-
- /**
- * The VirtualDataGridColumn class is the collection of properties that describe
- * a column of the org.apache.royale.jewel.VirtualDataGrid: which renderer
- * to use for each cell in the column, the width of the column, the label for the
- * column, and the name of the field in the data containing the value to display
- * in the column.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.8
- */
- public class VirtualDataGridColumn extends DataGridColumn
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.8
- */
- public function VirtualDataGridColumn()
- {
- }
-
- /**
- * Returns a new instance of a UIBase component to be used as the actual
- * column in the grid.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.8
- */
- override public function createColumn():IStyledUIBase
- {
- return new VirtualDataGridColumnList();
- }
- }
-}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
index 131358c..74baf38 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datagrid.sass
@@ -85,8 +85,12 @@ j|DataGridButtonBar
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.DatagridHeaderRenderer")
-
j|VirtualDataGrid
columnClass: ClassReference("org.apache.royale.jewel.supportClasses.datagrid.VirtualDataGridColumnList")
j|VirtualDataGridColumnList
+ IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory")
+ IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.DataGridItemRenderer")
+ IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataGridColumnListItemRendererInitializer")
+ ISelectableItemRenderer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.ClassSelectorListSelectableItemRendererBead")
+ IViewport: ClassReference("org.apache.royale.jewel.supportClasses.Viewport")
\ No newline at end of file