This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit edb9bd10cb31fa0cca8323f68146833578447466 Author: Alex Harui <[email protected]> AuthorDate: Tue Feb 18 01:35:20 2020 -0800 refactor IListPresentationModel to resolve some issues found in the 'has' branch merge --- .../main/royale/org/apache/royale/html/DataContainer.as | 1 - .../src/main/royale/org/apache/royale/html/List.as | 1 - .../royale/org/apache/royale/html/MultiSelectionList.as | 1 - .../royale/org/apache/royale/html/MultiSelectionTree.as | 1 - .../royale/html/beads/ListItemRendererInitializer.as | 2 +- .../royale/html/beads/models/ListPresentationModel.as | 2 +- frameworks/projects/Core/src/main/royale/CoreClasses.as | 3 ++- .../org/apache/royale/core/IListPresentationModel.as | 10 ---------- .../royale/{core => html}/IListPresentationModel.as | 17 ++++------------- .../src/main/royale/org/apache/royale/jewel/List.as | 12 +++++++----- .../jewel/supportClasses/list/IListPresentationModel.as | 13 +------------ .../mx/controls/beads/layouts/AdvancedDataGridLayout.as | 2 +- .../AdvancedDataGridVirtualListVerticalLayout.as | 2 +- .../mdl/beads/TabsItemRendererFactoryForArrayData.as | 2 +- .../royale/mdl/beads/TabsItemRendererInitializer.as | 2 +- 15 files changed, 20 insertions(+), 51 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as index d31d6c9..d3dae3d 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as @@ -31,7 +31,6 @@ package org.apache.royale.html import org.apache.royale.core.IItemRendererOwnerView; import org.apache.royale.core.ILayoutView; import org.apache.royale.core.IStrandWithPresentationModel; - import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.IDataProviderModel; import org.apache.royale.core.UIBase; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as index 8124a28..71f7b6f 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as @@ -18,7 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.html { - import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.ISelectionModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionList.as index 7a2801d..ba93bb3 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionList.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionList.as @@ -18,7 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.html { - import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.IMultiSelectionModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionTree.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionTree.as index eca7e50..a68e0d8 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionTree.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MultiSelectionTree.as @@ -18,7 +18,6 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.html { - import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.IMultiSelectionModel; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as index 3cea766..22a81ac 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as @@ -26,7 +26,7 @@ package org.apache.royale.html.beads import org.apache.royale.core.IIndexedItemRendererInitializer; import org.apache.royale.core.IItemRenderer; import org.apache.royale.core.ILabelFieldItemRenderer; - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.IStrandWithPresentationModel; import org.apache.royale.core.IUIBase; diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ListPresentationModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ListPresentationModel.as index c5e86e8..010a793 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ListPresentationModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ListPresentationModel.as @@ -18,7 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.html.beads.models { - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IStrand; import org.apache.royale.events.Event; import org.apache.royale.events.EventDispatcher; diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as index 786a010..d7858ee 100644 --- a/frameworks/projects/Core/src/main/royale/CoreClasses.as +++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as @@ -49,6 +49,7 @@ internal class CoreClasses import org.apache.royale.html.beads.IBackgroundBead; IBackgroundBead; import org.apache.royale.html.beads.IBorderBead; IBorderBead; import org.apache.royale.html.beads.SelectableItemRendererBeadBase; SelectableItemRendererBeadBase; + import org.apache.royale.html.IListPresentationModel; org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.BeadViewBase; BeadViewBase; import org.apache.royale.core.ImageViewBase; ImageViewBase; @@ -120,7 +121,7 @@ internal class CoreClasses import org.apache.royale.core.ILayoutHost; ILayoutHost; import org.apache.royale.core.ILayoutView; ILayoutView; import org.apache.royale.core.ILayoutParent; ILayoutParent; - import org.apache.royale.core.IListPresentationModel; IListPresentationModel; + import org.apache.royale.core.IListPresentationModel; org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IMeasurementBead; IMeasurementBead; import org.apache.royale.core.IModule; IModule; import org.apache.royale.core.IPanelModel; IPanelModel; diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as index 0e3313a..c49d7eb 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as @@ -40,15 +40,5 @@ package org.apache.royale.core function get rowHeight():Number; function set rowHeight(value:Number):void; - /** - * The distance each row should be separated from the row above. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.0 - */ - function get separatorThickness():Number; - function set separatorThickness(value:Number):void; } } diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/IListPresentationModel.as similarity index 81% copy from frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as copy to frameworks/projects/Core/src/main/royale/org/apache/royale/html/IListPresentationModel.as index 0e3313a..9803bfe 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListPresentationModel.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/IListPresentationModel.as @@ -16,8 +16,10 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package org.apache.royale.core +package org.apache.royale.html { +import org.apache.royale.core.IListPresentationModel; + /** * The IListPresentationModel interface holds key values for the display * of lists. @@ -27,20 +29,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.0 */ - public interface IListPresentationModel extends IBead + public interface IListPresentationModel extends org.apache.royale.core.IListPresentationModel { /** - * The height of every row in the list. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.0 - */ - function get rowHeight():Number; - function set rowHeight(value:Number):void; - - /** * The distance each row should be separated from the row above. * * @langversion 3.0 diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as index 6821e60..315d4db 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as @@ -18,12 +18,14 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel { + import org.apache.royale.core.IBead; import org.apache.royale.core.IDataProviderModel; + import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.ISelectionModel; + import org.apache.royale.core.IStrandWithPresentationModel; import org.apache.royale.jewel.beads.models.ListPresentationModel; import org.apache.royale.jewel.supportClasses.container.DataContainerBase; - import org.apache.royale.jewel.supportClasses.list.IListPresentationModel; /** * Indicates that the initialization of the list is complete. @@ -63,7 +65,7 @@ package org.apache.royale.jewel * @playerversion AIR 2.6 * @productversion Royale 0.9.4 */ - public class List extends DataContainerBase + public class List extends DataContainerBase implements IStrandWithPresentationModel { /** * constructor. @@ -176,7 +178,7 @@ package org.apache.royale.jewel * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 - * @royaleignorecoercion org.apache.royale.jewel.supportClasses.list.IListPresentationModel + * @royaleignorecoercion org.apache.royale.core.IListPresentationModel */ public function get rowHeight():Number { @@ -217,9 +219,9 @@ package org.apache.royale.jewel * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 - * @royaleignorecoercion org.apache.royale.jewel.supportClasses.list.IListPresentationModel + * @royaleignorecoercion org.apache.royale.core.IListPresentationModel */ - public function get presentationModel():IListPresentationModel + public function get presentationModel():IBead { var presModel:IListPresentationModel = getBeadByType(IListPresentationModel) as IListPresentationModel; if (presModel == null) { diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/IListPresentationModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/IListPresentationModel.as index a103b4d..5ca1849 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/IListPresentationModel.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/list/IListPresentationModel.as @@ -29,19 +29,8 @@ package org.apache.royale.jewel.supportClasses.list * @playerversion AIR 2.6 * @productversion Royale 0.9.7 */ - public interface IListPresentationModel extends IBead + public interface IListPresentationModel extends org.apache.royale.core.IListPresentationModel { - /** - * The height of every row in the list. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9.7 - */ - function get rowHeight():Number; - function set rowHeight(value:Number):void; - /** * How text aligns in the itemRenderer instance. * diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as index df9fc82..231830b 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridLayout.as @@ -24,7 +24,7 @@ package mx.controls.beads.layouts import org.apache.royale.core.IBorderPaddingMarginValuesImpl; import org.apache.royale.core.IDataGridModel; import org.apache.royale.core.IDataProviderModel; - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.IStrandWithPresentationModel; import org.apache.royale.core.IUIBase; diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as index 6a8f5e3..5cf4c5d 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as +++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as @@ -22,7 +22,7 @@ package mx.controls.beads.layouts import org.apache.royale.core.IDataProviderModel; import org.apache.royale.core.IDataProviderVirtualItemRendererMapper; import org.apache.royale.core.ILayoutView; - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IScrollingViewport; import org.apache.royale.core.IIndexedItemRenderer; import org.apache.royale.core.IStrand; diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as index 834cecf..22babf4 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as +++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as @@ -22,7 +22,7 @@ package org.apache.royale.mdl.beads import org.apache.royale.core.IDataProviderItemRendererMapper; import org.apache.royale.core.IItemRendererClassFactory; import org.apache.royale.core.IItemRendererOwnerView; - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.SimpleCSSStyles; import org.apache.royale.core.UIBase; diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererInitializer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererInitializer.as index f01af3c..5eb66e5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererInitializer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererInitializer.as @@ -25,7 +25,7 @@ package org.apache.royale.mdl.beads import org.apache.royale.core.IItemRenderer; import org.apache.royale.core.IItemRendererOwnerView; import org.apache.royale.core.ILabelFieldItemRenderer; - import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.html.IListPresentationModel; import org.apache.royale.core.IStrand; import org.apache.royale.core.IUIBase; import org.apache.royale.core.SimpleCSSStyles;
