You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2021/12/19 09:26:45 UTC
[royale-asjs] branch develop updated: label interface for mx
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 29cd6ee label interface for mx
29cd6ee is described below
commit 29cd6ee042dc195a008ec2886959ac936a950f3d
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 19 11:26:36 2021 +0200
label interface for mx
---
.../apache/royale/html/beads/ITextItemRenderer.as | 3 +--
.../apache/royale/core/ILabelFieldItemRenderer.as | 3 +--
.../src/main/royale/mx/charts/series/BarSeries.as | 3 ++-
.../main/royale/mx/charts/series/ColumnSeries.as | 3 ++-
.../src/main/royale/mx/charts/series/PieSeries.as | 3 ++-
.../MXRoyale/src/main/royale/mx/controls/Menu.as | 3 ++-
.../src/main/royale/mx/controls/MenuBar.as | 3 ++-
.../MXRoyale/src/main/royale/mx/controls/NavBar.as | 3 ++-
.../src/main/royale/mx/controls/PopUpMenuButton.as | 3 ++-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 3 ++-
...actoryForICollectionViewAdvancedDataGridData.as | 31 ++--------------------
.../beads/DataGridItemRendererInitializer.as | 20 ++++----------
.../beads/models/ArrayMultiSelectionModel.as | 3 ++-
.../models/SingleSelectionICollectionViewModel.as | 3 ++-
.../beads/models/SingleSelectionIListModel.as | 3 ++-
.../mx/controls/colorPickerClasses/SwatchPanel.as | 4 +--
.../mx/controls/dataGridClasses/DataGridColumn.as | 3 ++-
.../royale/mx/controls/listClasses/ListBase.as | 4 ++-
.../royale/mx/supportClasses/ButtonItemRenderer.as | 8 ++----
19 files changed, 40 insertions(+), 69 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
index 792cf7d..126b0e4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.ILabelFieldItemRenderer;
/**
@@ -30,7 +29,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface ITextItemRenderer extends IItemRenderer, ILabelFieldItemRenderer
+ public interface ITextItemRenderer extends ILabelFieldItemRenderer
{
/**
* The text to be displayed in the item renderer.
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
index 2d63ff9..9ffc7af 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
@@ -27,7 +27,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public interface ILabelFieldItemRenderer extends IIndexedItemRenderer
+ public interface ILabelFieldItemRenderer extends IIndexedItemRenderer, IHasLabelField
{
/**
* The property on the data item that the item renderer
@@ -38,7 +38,6 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- function get labelField():String;
function set labelField(value:String):void;
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
index 0d47f22..b89ee1d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
@@ -64,6 +64,7 @@ import mx.graphics.IStroke;
import mx.graphics.SolidColor;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -227,7 +228,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class BarSeries extends Series implements IStackable2, IBar
+public class BarSeries extends Series implements IStackable2, IBar, IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
index 5560acd..7dbbe2a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
@@ -60,6 +60,7 @@ import mx.graphics.IFill;
import mx.graphics.SolidColor;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -227,7 +228,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class ColumnSeries extends Series implements IColumn,IStackable2
+public class ColumnSeries extends Series implements IColumn,IStackable2, IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
index fff5473..36f9160 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
@@ -66,6 +66,7 @@ import mx.graphics.SolidColorStroke;
import mx.graphics.Stroke;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -297,7 +298,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class PieSeries extends Series
+public class PieSeries extends Series implements IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
index 6a5b78c..7d22b9c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
@@ -97,6 +97,7 @@ package mx.controls
import org.apache.royale.core.ILayoutParent;
import org.apache.royale.core.ILayoutView;
+ import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -591,7 +592,7 @@ package mx.controls
* @playerversion AIR 1.1
* @productversion Flex 3
*/
- public class Menu extends UIComponent implements IFocusManagerContainer, IMenu, IItemRendererProvider, ILayoutParent, ILayoutView
+ public class Menu extends UIComponent implements IFocusManagerContainer, IMenu, IItemRendererProvider, ILayoutParent, ILayoutView, IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
index 1f781c6..72382a2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
@@ -61,6 +61,7 @@ import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.loadBeadFromValuesManager;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -401,7 +402,7 @@ include "../styles/metadata/TextStyles.as"
* @productversion Royale 0.9.3
* @royalesuppresspublicvarwarning
*/
-public class MenuBar extends UIComponent implements IFocusManagerComponent, IContainer, ILayoutParent
+public class MenuBar extends UIComponent implements IFocusManagerComponent, IContainer, ILayoutParent, IHasLabelField
{
//include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
index 19df4c7..7c39b0b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
@@ -46,6 +46,7 @@ import mx.managers.SystemManager;
//import mx.styles.StyleProtoChain;
import mx.utils.RoyaleUtil;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -134,7 +135,7 @@ use namespace mx_internal;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class NavBar extends Box
+public class NavBar extends Box implements IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
index 16cf76e..8ba48a4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
@@ -35,6 +35,7 @@ import mx.managers.PopUpManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -129,7 +130,7 @@ use namespace mx_internal;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class PopUpMenuButton extends PopUpButton
+public class PopUpMenuButton extends PopUpButton implements IHasLabelField
{
//include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
index 77dc8c4..893959d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
@@ -44,6 +44,7 @@ import org.apache.royale.events.Event;
import org.apache.royale.html.beads.models.ButtonBarModel;
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.core.ILayoutHost;
+import org.apache.royale.core.IHasLabelField;
//--------------------------------------
@@ -202,7 +203,7 @@ import org.apache.royale.core.ILayoutHost;
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
-public class ToggleButtonBar extends UIComponent implements ILayoutParent, ILayoutView
+public class ToggleButtonBar extends UIComponent implements ILayoutParent, ILayoutView, IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
index 602093c..80c8739 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
@@ -18,43 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package mx.controls.advancedDataGridClasses
{
+ import mx.collections.CursorBookmark;
import mx.collections.ICollectionView;
import mx.collections.IViewCursor;
- import mx.collections.CursorBookmark;
- import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnList;
- import mx.controls.beads.models.DataGridColumnICollectionViewModel;
- import mx.core.IUIComponent;
-
- import org.apache.royale.collections.FlattenedList;
- import org.apache.royale.collections.HierarchicalData;
- import org.apache.royale.collections.ITreeData;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadModel;
- import org.apache.royale.core.IDataProviderItemRendererMapper;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IItemRendererClassFactory;
+
import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.IListPresentationModel;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.ILabelFieldItemRenderer;
- import org.apache.royale.core.IListDataItemRenderer;
- import org.apache.royale.core.IIndexedItemRendererInitializer;
- import org.apache.royale.core.IStrand;
import org.apache.royale.core.IStrandWithModelView;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.SimpleCSSStyles;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.CollectionEvent;
import org.apache.royale.events.Event;
- import org.apache.royale.events.EventDispatcher;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.ItemRendererEvent;
- import org.apache.royale.html.List;
import org.apache.royale.html.beads.IListView;
import org.apache.royale.html.beads.VirtualDataItemRendererFactoryBase;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
- import org.apache.royale.html.supportClasses.TreeListData;
/**
* The DataItemRendererFactoryForHierarchicalData class reads a
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
index 40f8d4b..cd9dd47 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
@@ -21,23 +21,13 @@ package mx.controls.beads
import mx.controls.DataGrid;
- import mx.controls.dataGridClasses.DataGridListArea;
-
- import org.apache.royale.core.Bead;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.IIndexedItemRendererInitializer;
- import org.apache.royale.core.IItemRenderer;
- import org.apache.royale.core.IListDataItemRenderer;
- import org.apache.royale.core.ILabelFieldItemRenderer;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.SimpleCSSStyles;
- import org.apache.royale.core.UIBase;
- import mx.controls.dataGridClasses.DataGridListData;
+ import mx.controls.beads.models.DataGridColumnICollectionViewModel;
import mx.controls.dataGridClasses.DataGridColumnList;
- import mx.controls.beads.models.DataGridColumnICollectionViewModel;
+ import mx.controls.dataGridClasses.DataGridListData;
import mx.core.UIComponent;
+
+ import org.apache.royale.core.IIndexedItemRenderer;
+ import org.apache.royale.core.IListDataItemRenderer;
/**
* The DataGridItemRendererInitializer class initializes item renderers
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
index 339204d..65b2498 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
@@ -23,6 +23,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The ArrayMultiSelectionModel class is a selection model for
* a dataProvider that is an array. It assumes that items
@@ -36,7 +37,7 @@ package mx.controls.beads.models
* @productversion 0.9.7
*/
- public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel
+ public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
index e7966cb..2a7e0fa 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
@@ -29,6 +29,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The SingleSelectionICollectionViewModel class is a selection model for
@@ -39,7 +40,7 @@ package mx.controls.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class SingleSelectionICollectionViewModel extends EventDispatcher implements ISelectionModel, IRollOverModel
+ public class SingleSelectionICollectionViewModel extends EventDispatcher implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
index 1f6544b..90085aa 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
@@ -24,6 +24,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The SingleSelectionIListViewModel class is a selection model for
@@ -35,7 +36,7 @@ package mx.controls.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class SingleSelectionIListModel extends EventDispatcher implements ISelectionModel, IRollOverModel
+ public class SingleSelectionIListModel extends EventDispatcher implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
index c76fb29..117e073 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
@@ -27,7 +27,7 @@ package mx.controls.colorPickerClasses
import org.apache.royale.geom.Rectangle;
import mx.collections.IList;
import mx.collections.ArrayList;
- import mx.controls.ColorPicker;
+ import org.apache.royale.core.IHasLabelField;
/*
import flash.display.DisplayObject;
import flash.events.Event;
@@ -378,7 +378,7 @@ use namespace mx_internal;
/**
* @private
*/
-public class SwatchPanel extends UIComponent implements IFocusManagerContainer
+public class SwatchPanel extends UIComponent implements IFocusManagerContainer, IHasLabelField
{
//include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
index cff0838..c2fa17d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
@@ -47,6 +47,7 @@ use namespace mx_internal;
import org.apache.royale.events.Event;
import org.apache.royale.core.UIBase;
import org.apache.royale.html.supportClasses.DataGridColumn;
+import org.apache.royale.core.IHasLabelField;
//--------------------------------------
// Styles
@@ -206,7 +207,7 @@ import org.apache.royale.html.supportClasses.DataGridColumn;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGridColumn // implements IIMESupport
+public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGridColumn implements IHasLabelField // IIMESupport
{
//--------------------------------------------------------------------------
//
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index e49d36a..26ec297 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -59,6 +59,7 @@ import org.apache.royale.events.ValueEvent;
import org.apache.royale.utils.loadBeadFromValuesManager;
import mx.controls.dataGridClasses.DataGridListData;
import mx.events.FlexEvent;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -168,7 +169,8 @@ use namespace mx_internal;
*/
public class ListBase extends ScrollControlBase
implements IContainerBaseStrandChildrenHost, IContainer, ILayoutParent,
- ILayoutView, IItemRendererProvider, IStrandWithPresentationModel
+ ILayoutView, IItemRendererProvider, IStrandWithPresentationModel,
+ IHasLabelField
{ //extends UIComponent
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
index 70e2405..2596ce3 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
@@ -18,11 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package mx.supportClasses
{
- import org.apache.royale.core.IItemRenderer;
- import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.SimpleCSSStylesWithFlex;
- import org.apache.royale.events.Event;
+ import org.apache.royale.core.IHasLabelField;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.events.ItemClickedEvent;
@@ -43,7 +39,7 @@ package mx.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public class ButtonItemRenderer extends Button implements ITextItemRenderer
+ public class ButtonItemRenderer extends Button implements ITextItemRenderer, IHasLabelField
{
public function ButtonItemRenderer()
{
RE: [royale-asjs] branch develop updated: label interface for mx
Posted by Yishay Weiss <yi...@hotmail.com>.
Looks like you missed TreeItemRenderer. I haven’t checked to see if others were omitted.
From: harbs@apache.org<ma...@apache.org>
Sent: Sunday, December 19, 2021 11:26 AM
To: commits@royale.apache.org<ma...@royale.apache.org>
Subject: [royale-asjs] branch develop updated: label interface for mx
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 29cd6ee label interface for mx
29cd6ee is described below
commit 29cd6ee042dc195a008ec2886959ac936a950f3d
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 19 11:26:36 2021 +0200
label interface for mx
---
.../apache/royale/html/beads/ITextItemRenderer.as | 3 +--
.../apache/royale/core/ILabelFieldItemRenderer.as | 3 +--
.../src/main/royale/mx/charts/series/BarSeries.as | 3 ++-
.../main/royale/mx/charts/series/ColumnSeries.as | 3 ++-
.../src/main/royale/mx/charts/series/PieSeries.as | 3 ++-
.../MXRoyale/src/main/royale/mx/controls/Menu.as | 3 ++-
.../src/main/royale/mx/controls/MenuBar.as | 3 ++-
.../MXRoyale/src/main/royale/mx/controls/NavBar.as | 3 ++-
.../src/main/royale/mx/controls/PopUpMenuButton.as | 3 ++-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 3 ++-
...actoryForICollectionViewAdvancedDataGridData.as | 31 ++--------------------
.../beads/DataGridItemRendererInitializer.as | 20 ++++----------
.../beads/models/ArrayMultiSelectionModel.as | 3 ++-
.../models/SingleSelectionICollectionViewModel.as | 3 ++-
.../beads/models/SingleSelectionIListModel.as | 3 ++-
.../mx/controls/colorPickerClasses/SwatchPanel.as | 4 +--
.../mx/controls/dataGridClasses/DataGridColumn.as | 3 ++-
.../royale/mx/controls/listClasses/ListBase.as | 4 ++-
.../royale/mx/supportClasses/ButtonItemRenderer.as | 8 ++----
19 files changed, 40 insertions(+), 69 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
index 792cf7d..126b0e4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ITextItemRenderer.as
@@ -18,7 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.ILabelFieldItemRenderer;
/**
@@ -30,7 +29,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface ITextItemRenderer extends IItemRenderer, ILabelFieldItemRenderer
+ public interface ITextItemRenderer extends ILabelFieldItemRenderer
{
/**
* The text to be displayed in the item renderer.
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
index 2d63ff9..9ffc7af 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ILabelFieldItemRenderer.as
@@ -27,7 +27,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public interface ILabelFieldItemRenderer extends IIndexedItemRenderer
+ public interface ILabelFieldItemRenderer extends IIndexedItemRenderer, IHasLabelField
{
/**
* The property on the data item that the item renderer
@@ -38,7 +38,6 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- function get labelField():String;
function set labelField(value:String):void;
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
index 0d47f22..b89ee1d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
@@ -64,6 +64,7 @@ import mx.graphics.IStroke;
import mx.graphics.SolidColor;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -227,7 +228,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class BarSeries extends Series implements IStackable2, IBar
+public class BarSeries extends Series implements IStackable2, IBar, IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
index 5560acd..7dbbe2a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
@@ -60,6 +60,7 @@ import mx.graphics.IFill;
import mx.graphics.SolidColor;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -227,7 +228,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class ColumnSeries extends Series implements IColumn,IStackable2
+public class ColumnSeries extends Series implements IColumn,IStackable2, IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
index fff5473..36f9160 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
@@ -66,6 +66,7 @@ import mx.graphics.SolidColorStroke;
import mx.graphics.Stroke;
import mx.styles.CSSStyleDeclaration;
import mx.styles.ISimpleStyleClient;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -297,7 +298,7 @@ include "../styles/metadata/TextStyles.as"
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class PieSeries extends Series
+public class PieSeries extends Series implements IHasLabelField
{
// include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
index 6a5b78c..7d22b9c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Menu.as
@@ -97,6 +97,7 @@ package mx.controls
import org.apache.royale.core.ILayoutParent;
import org.apache.royale.core.ILayoutView;
+ import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -591,7 +592,7 @@ package mx.controls
* @playerversion AIR 1.1
* @productversion Flex 3
*/
- public class Menu extends UIComponent implements IFocusManagerContainer, IMenu, IItemRendererProvider, ILayoutParent, ILayoutView
+ public class Menu extends UIComponent implements IFocusManagerContainer, IMenu, IItemRendererProvider, ILayoutParent, ILayoutView, IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
index 1f781c6..72382a2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
@@ -61,6 +61,7 @@ import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.loadBeadFromValuesManager;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -401,7 +402,7 @@ include "../styles/metadata/TextStyles.as"
* @productversion Royale 0.9.3
* @royalesuppresspublicvarwarning
*/
-public class MenuBar extends UIComponent implements IFocusManagerComponent, IContainer, ILayoutParent
+public class MenuBar extends UIComponent implements IFocusManagerComponent, IContainer, ILayoutParent, IHasLabelField
{
//include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
index 19df4c7..7c39b0b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/NavBar.as
@@ -46,6 +46,7 @@ import mx.managers.SystemManager;
//import mx.styles.StyleProtoChain;
import mx.utils.RoyaleUtil;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -134,7 +135,7 @@ use namespace mx_internal;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class NavBar extends Box
+public class NavBar extends Box implements IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
index 16cf76e..8ba48a4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/PopUpMenuButton.as
@@ -35,6 +35,7 @@ import mx.managers.PopUpManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -129,7 +130,7 @@ use namespace mx_internal;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class PopUpMenuButton extends PopUpButton
+public class PopUpMenuButton extends PopUpButton implements IHasLabelField
{
//include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
index 77dc8c4..893959d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/ToggleButtonBar.as
@@ -44,6 +44,7 @@ import org.apache.royale.events.Event;
import org.apache.royale.html.beads.models.ButtonBarModel;
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.core.ILayoutHost;
+import org.apache.royale.core.IHasLabelField;
//--------------------------------------
@@ -202,7 +203,7 @@ import org.apache.royale.core.ILayoutHost;
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
-public class ToggleButtonBar extends UIComponent implements ILayoutParent, ILayoutView
+public class ToggleButtonBar extends UIComponent implements ILayoutParent, ILayoutView, IHasLabelField
{
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
index 602093c..80c8739 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/DataItemRendererFactoryForICollectionViewAdvancedDataGridData.as
@@ -18,43 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package mx.controls.advancedDataGridClasses
{
+ import mx.collections.CursorBookmark;
import mx.collections.ICollectionView;
import mx.collections.IViewCursor;
- import mx.collections.CursorBookmark;
- import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnList;
- import mx.controls.beads.models.DataGridColumnICollectionViewModel;
- import mx.core.IUIComponent;
-
- import org.apache.royale.collections.FlattenedList;
- import org.apache.royale.collections.HierarchicalData;
- import org.apache.royale.collections.ITreeData;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadModel;
- import org.apache.royale.core.IDataProviderItemRendererMapper;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IItemRendererClassFactory;
+
import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.IListPresentationModel;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.ILabelFieldItemRenderer;
- import org.apache.royale.core.IListDataItemRenderer;
- import org.apache.royale.core.IIndexedItemRendererInitializer;
- import org.apache.royale.core.IStrand;
import org.apache.royale.core.IStrandWithModelView;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.SimpleCSSStyles;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.CollectionEvent;
import org.apache.royale.events.Event;
- import org.apache.royale.events.EventDispatcher;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.ItemRendererEvent;
- import org.apache.royale.html.List;
import org.apache.royale.html.beads.IListView;
import org.apache.royale.html.beads.VirtualDataItemRendererFactoryBase;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
- import org.apache.royale.html.supportClasses.TreeListData;
/**
* The DataItemRendererFactoryForHierarchicalData class reads a
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
index 40f8d4b..cd9dd47 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridItemRendererInitializer.as
@@ -21,23 +21,13 @@ package mx.controls.beads
import mx.controls.DataGrid;
- import mx.controls.dataGridClasses.DataGridListArea;
-
- import org.apache.royale.core.Bead;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.IIndexedItemRendererInitializer;
- import org.apache.royale.core.IItemRenderer;
- import org.apache.royale.core.IListDataItemRenderer;
- import org.apache.royale.core.ILabelFieldItemRenderer;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.SimpleCSSStyles;
- import org.apache.royale.core.UIBase;
- import mx.controls.dataGridClasses.DataGridListData;
+ import mx.controls.beads.models.DataGridColumnICollectionViewModel;
import mx.controls.dataGridClasses.DataGridColumnList;
- import mx.controls.beads.models.DataGridColumnICollectionViewModel;
+ import mx.controls.dataGridClasses.DataGridListData;
import mx.core.UIComponent;
+
+ import org.apache.royale.core.IIndexedItemRenderer;
+ import org.apache.royale.core.IListDataItemRenderer;
/**
* The DataGridItemRendererInitializer class initializes item renderers
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
index 339204d..65b2498 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/ArrayMultiSelectionModel.as
@@ -23,6 +23,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The ArrayMultiSelectionModel class is a selection model for
* a dataProvider that is an array. It assumes that items
@@ -36,7 +37,7 @@ package mx.controls.beads.models
* @productversion 0.9.7
*/
- public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel
+ public class ArrayMultiSelectionModel extends EventDispatcher implements IMultiSelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
index e7966cb..2a7e0fa 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionICollectionViewModel.as
@@ -29,6 +29,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The SingleSelectionICollectionViewModel class is a selection model for
@@ -39,7 +40,7 @@ package mx.controls.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class SingleSelectionICollectionViewModel extends EventDispatcher implements ISelectionModel, IRollOverModel
+ public class SingleSelectionICollectionViewModel extends EventDispatcher implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
index 1f6544b..90085aa 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/models/SingleSelectionIListModel.as
@@ -24,6 +24,7 @@ package mx.controls.beads.models
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.IHasLabelField;
/**
* The SingleSelectionIListViewModel class is a selection model for
@@ -35,7 +36,7 @@ package mx.controls.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public class SingleSelectionIListModel extends EventDispatcher implements ISelectionModel, IRollOverModel
+ public class SingleSelectionIListModel extends EventDispatcher implements ISelectionModel, IRollOverModel, IHasLabelField
{
/**
* Constructor.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
index c76fb29..117e073 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/colorPickerClasses/SwatchPanel.as
@@ -27,7 +27,7 @@ package mx.controls.colorPickerClasses
import org.apache.royale.geom.Rectangle;
import mx.collections.IList;
import mx.collections.ArrayList;
- import mx.controls.ColorPicker;
+ import org.apache.royale.core.IHasLabelField;
/*
import flash.display.DisplayObject;
import flash.events.Event;
@@ -378,7 +378,7 @@ use namespace mx_internal;
/**
* @private
*/
-public class SwatchPanel extends UIComponent implements IFocusManagerContainer
+public class SwatchPanel extends UIComponent implements IFocusManagerContainer, IHasLabelField
{
//include "../../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
index cff0838..c2fa17d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
@@ -47,6 +47,7 @@ use namespace mx_internal;
import org.apache.royale.events.Event;
import org.apache.royale.core.UIBase;
import org.apache.royale.html.supportClasses.DataGridColumn;
+import org.apache.royale.core.IHasLabelField;
//--------------------------------------
// Styles
@@ -206,7 +207,7 @@ import org.apache.royale.html.supportClasses.DataGridColumn;
* @playerversion AIR 1.1
* @productversion Flex 3
*/
-public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGridColumn // implements IIMESupport
+public class DataGridColumn extends org.apache.royale.html.supportClasses.DataGridColumn implements IHasLabelField // IIMESupport
{
//--------------------------------------------------------------------------
//
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index e49d36a..26ec297 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -59,6 +59,7 @@ import org.apache.royale.events.ValueEvent;
import org.apache.royale.utils.loadBeadFromValuesManager;
import mx.controls.dataGridClasses.DataGridListData;
import mx.events.FlexEvent;
+import org.apache.royale.core.IHasLabelField;
use namespace mx_internal;
@@ -168,7 +169,8 @@ use namespace mx_internal;
*/
public class ListBase extends ScrollControlBase
implements IContainerBaseStrandChildrenHost, IContainer, ILayoutParent,
- ILayoutView, IItemRendererProvider, IStrandWithPresentationModel
+ ILayoutView, IItemRendererProvider, IStrandWithPresentationModel,
+ IHasLabelField
{ //extends UIComponent
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
index 70e2405..2596ce3 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/supportClasses/ButtonItemRenderer.as
@@ -18,11 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package mx.supportClasses
{
- import org.apache.royale.core.IItemRenderer;
- import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.core.SimpleCSSStylesWithFlex;
- import org.apache.royale.events.Event;
+ import org.apache.royale.core.IHasLabelField;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.html.beads.ITextItemRenderer;
import org.apache.royale.events.ItemClickedEvent;
@@ -43,7 +39,7 @@ package mx.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public class ButtonItemRenderer extends Button implements ITextItemRenderer
+ public class ButtonItemRenderer extends Button implements ITextItemRenderer, IHasLabelField
{
public function ButtonItemRenderer()
{