This is an automated email from the ASF dual-hosted git repository.
harbs 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 5599381f91 Added IHasDataProvider
5599381f91 is described below
commit 5599381f9154d00a3a749de07d0beed2352ba8fa
Author: Harbs <[email protected]>
AuthorDate: Tue May 2 17:59:42 2023 +0300
Added IHasDataProvider
---
.../main/royale/org/apache/royale/core/IMenu.as | 7 ++---
.../html/supportClasses/IDataGridColumnList.as | 1 -
.../org/apache/royale/core/IComboBoxModel.as | 24 ++-------------
.../org/apache/royale/core/IDataGridHeader.as | 21 +------------
.../org/apache/royale/core/IDataProviderModel.as | 21 +------------
.../org/apache/royale/core/IHasDataProvider.as} | 36 +++++++++++-----------
.../main/royale/org/apache/royale/core/IList.as | 2 +-
7 files changed, 25 insertions(+), 87 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
index e4beb5f458..f8d5d2e927 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
@@ -20,17 +20,14 @@ package org.apache.royale.core
{
import org.apache.royale.events.IEventDispatcher;
- public interface IMenu extends IEventDispatcher
+ public interface IMenu extends IEventDispatcher, IHasDataProvider
{
function get labelField():String;
function set labelField(value:String):void;
function get submenuField():String;
function set submenuField(value:String):void;
-
- function get dataProvider():Object;
- function set dataProvider(value:Object):void;
-
+
function get selectedItem():Object;
function set selectedItem(value:Object):void;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
index 51bbf2a700..5be69e5e61 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
@@ -46,7 +46,6 @@ package org.apache.royale.html.supportClasses
function get labelField():String;
function set labelField(value:String):void;
- function set dataProvider(value:Object):void;
function get selectedIndex():int;
function set selectedIndex(value:int):void;
function set id(value:String):void;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IComboBoxModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IComboBoxModel.as
index 1170ec30c6..23322e3945 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IComboBoxModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IComboBoxModel.as
@@ -30,7 +30,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface IComboBoxModel extends IEventDispatcher, IBeadModel
+ public interface IComboBoxModel extends IEventDispatcher, IBeadModel,
IHasDataProvider
{
// TODO: should extend ITextModel
/**
@@ -54,27 +54,7 @@ package org.apache.royale.core
*/
function get html():String;
function set html(value:String):void;
-
- /**
- * The set of choices displayed in the ComboBox's
- * dropdown. The dataProvider can be a simple
- * array or vector if the set of choices is not
- * going to be modified (except by wholesale
- * replacement of the dataProvider). To use
- * different kinds of data sets, you may need to
- * provide an alternate "mapping" bead that
- * iterates the dataProvider, generates item
- * renderers and assigns a data item to the
- * item renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get dataProvider():Object;
- function set dataProvider(value:Object):void;
-
+
/**
* The index of the selected item in the
* dataProvider. Values less than 0 can
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataGridHeader.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataGridHeader.as
index dce0f5c5fe..7316d57809 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataGridHeader.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataGridHeader.as
@@ -27,27 +27,8 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public interface IDataGridHeader extends IUIBase, IStrandWithModel
+ public interface IDataGridHeader extends IUIBase, IStrandWithModel,
IHasDataProvider
{
- /**
- * The set of choices displayed in the ComboBox's
- * dropdown. The dataProvider can be a simple
- * array or vector if the set of choices is not
- * going to be modified (except by wholesale
- * replacement of the dataProvider). To use
- * different kinds of data sets, you may need to
- * provide an alternate "mapping" bead that
- * iterates the dataProvider, generates item
- * renderers and assigns a data item to the
- * item renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get dataProvider():Object;
- function set dataProvider(value:Object):void;
/**
* The property on the data item that the item renderer
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataProviderModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataProviderModel.as
index a577db4a4e..e70421138d 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataProviderModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDataProviderModel.as
@@ -30,27 +30,8 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface IDataProviderModel extends IEventDispatcher, IBeadModel
+ public interface IDataProviderModel extends IEventDispatcher,
IBeadModel, IHasDataProvider
{
- /**
- * The set of choices displayed in the ComboBox's
- * dropdown. The dataProvider can be a simple
- * array or vector if the set of choices is not
- * going to be modified (except by wholesale
- * replacement of the dataProvider). To use
- * different kinds of data sets, you may need to
- * provide an alternate "mapping" bead that
- * iterates the dataProvider, generates item
- * renderers and assigns a data item to the
- * item renderers.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get dataProvider():Object;
- function set dataProvider(value:Object):void;
// TODO: this is probably not needed in a selection model
// and should be in a scheme mapper model.
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataProvider.as
similarity index 64%
copy from
frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
copy to
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataProvider.as
index e4beb5f458..7e14391caf 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IMenu.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataProvider.as
@@ -18,26 +18,26 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import org.apache.royale.events.IEventDispatcher;
-
- public interface IMenu extends IEventDispatcher
+ public interface IHasDataProvider
{
- function get labelField():String;
- function set labelField(value:String):void;
-
- function get submenuField():String;
- function set submenuField(value:String):void;
-
+ /**
+ * The set of data used for displaying in the component.
+ * The dataProvider can be a simple
+ * array or vector if the set of choices is not
+ * going to be modified (except by wholesale
+ * replacement of the dataProvider). To use
+ * different kinds of data sets, you may need to
+ * provide an alternate "mapping" bead that
+ * iterates the dataProvider, generates item
+ * renderers and assigns a data item to the
+ * item renderers.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
function get dataProvider():Object;
function set dataProvider(value:Object):void;
-
- function get selectedItem():Object;
- function set selectedItem(value:Object):void;
-
- function show(component:IUIBase, xoffset:Number=0,
yoffset:Number=0):void;
- function hide():void;
-
- function get parentMenuBar():IEventDispatcher;
- function set parentMenuBar(value:IEventDispatcher):void;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
index 63a4721139..977a01b7b7 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
@@ -31,7 +31,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface IList extends IItemRendererProvider
+ public interface IList extends IItemRendererProvider, IHasDataProvider
{
}
