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
commit 02f3eba6d4556c3df133c7ec9bc2bd3050975f24 Author: Harbs <[email protected]> AuthorDate: Sun Jan 2 19:40:17 2022 +0200 drag drop models --- .../royale/org/apache/royale/html/beads/ButtonBarReorderBead.as | 3 ++- .../org/apache/royale/html/beads/DataGridColumnReorderView.as | 7 +++++-- .../royale/html/beads/SensitiveMultiSelectionDropTargetBead.as | 3 ++- .../royale/html/beads/SensitiveSingleSelectionDropTargetBead.as | 3 ++- .../org/apache/royale/html/beads/SingleSelectionDragSourceBead.as | 3 ++- .../org/apache/royale/html/beads/SingleSelectionDropTargetBead.as | 3 ++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as index f8ee3cb..193ef45 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as @@ -45,6 +45,7 @@ package org.apache.royale.html.beads import org.apache.royale.html.supportClasses.DataItemRenderer; import org.apache.royale.utils.PointUtils; import org.apache.royale.utils.UIUtils; + import org.apache.royale.html.util.getModelByType; /** @@ -279,7 +280,7 @@ package org.apache.royale.html.beads trace("-- dropping after the last item"); } - var dataProviderModel:IDataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; + var dataProviderModel:IDataProviderModel = getModelByType(_strand,IDataProviderModel) as IDataProviderModel; var dragSource:Object; diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DataGridColumnReorderView.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DataGridColumnReorderView.as index 3baa57e..0545c04 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DataGridColumnReorderView.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DataGridColumnReorderView.as @@ -24,6 +24,7 @@ package org.apache.royale.html.beads import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; import org.apache.royale.html.DataGrid; + import org.apache.royale.core.IStrandWithModel; /** * The DataGridColumnReorderView bead extends DataGridView and @@ -72,13 +73,14 @@ package org.apache.royale.html.beads /** * @private * @royaleignorecoercion org.apache.royale.core.IDataGridModel + * @royaleignorecoercion org.apache.royale.core.IStrandWithModel * @royaleignorecoercion org.apache.royale.events.IEventDispatcher */ override protected function handleInitComplete(event:Event):void { super.handleInitComplete(event); - var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel; + var sharedModel:IDataGridModel = (_strand as IStrandWithModel).model as IDataGridModel; (sharedModel as IEventDispatcher).addEventListener("headerModelChanged", handleHeaderModelChanged); } @@ -86,13 +88,14 @@ package org.apache.royale.html.beads * @private * @royaleignorecoercion org.apache.royale.html.DataGrid * @royaleignorecoercion org.apache.royale.core.IDataGridModel + * @royaleignorecoercion org.apache.royale.core.IStrandWithModel * @royaleignorecoercion org.apache.royale.events.IEventDispatcher */ private function handleHeaderModelChanged(event:Event):void { trace("** Detected that the DataGrid's header has changed in some way"); var host:DataGrid = _strand as DataGrid; - var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel; + var sharedModel:IDataGridModel = (_strand as IStrandWithModel).model as IDataGridModel; host.removeElement(header); host.removeElement(listArea); diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as index c45a7e5..12ab796 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as @@ -36,6 +36,7 @@ package org.apache.royale.html.beads import org.apache.royale.html.beads.controllers.DropMouseController; import org.apache.royale.utils.PointUtils; import org.apache.royale.utils.sendStrandEvent; + import org.apache.royale.html.util.getModelByType; /** @@ -344,7 +345,7 @@ package org.apache.royale.html.beads DragEvent.dragInitiator.acceptingDrop(_strand, "object"); } - var dataProviderModel:IMultiSelectionModel = _strand.getBeadByType(IMultiSelectionModel) as IMultiSelectionModel; + var dataProviderModel:IMultiSelectionModel = getModelByType(_strand,IMultiSelectionModel) as IMultiSelectionModel; var myTargetIndex:int = calculatedTargetIndex > -1 ? calculatedTargetIndex : 0; if (dataProviderModel.dataProvider is Array) { var dataArray:Array = dataProviderModel.dataProvider as Array; diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as index daa21b8..7df2e33 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveSingleSelectionDropTargetBead.as @@ -39,6 +39,7 @@ package org.apache.royale.html.beads import org.apache.royale.utils.PointUtils; import org.apache.royale.utils.sendEvent; import org.apache.royale.utils.sendStrandEvent; + import org.apache.royale.html.util.getModelByType; /** @@ -346,7 +347,7 @@ package org.apache.royale.html.beads DragEvent.dragInitiator.acceptingDrop(_strand, "object"); } - var dataProviderModel:IDataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; + var dataProviderModel:IDataProviderModel = getModelByType(_strand,IDataProviderModel) as IDataProviderModel; if (dataProviderModel.dataProvider is Array) { var dataArray:Array = dataProviderModel.dataProvider as Array; dataArray.splice(calculatedTargetIndex, 0, dragSource); diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDragSourceBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDragSourceBead.as index 32cc175..7df7a77 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDragSourceBead.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDragSourceBead.as @@ -33,6 +33,7 @@ package org.apache.royale.html.beads import org.apache.royale.events.IEventDispatcher; import org.apache.royale.html.beads.controllers.DragMouseController; import org.apache.royale.utils.getParentOrSelfByType; + import org.apache.royale.html.util.getModelByType; /** * The start event is dispatched when a DragStart event happens. The DragEvent.dragSource @@ -285,7 +286,7 @@ package org.apache.royale.html.beads dispatchEvent(newEvent); if (newEvent.defaultPrevented) return; - var dataProviderModel:IDataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; + var dataProviderModel:IDataProviderModel = getModelByType(_strand,IDataProviderModel) as IDataProviderModel; if (dataProviderModel is ISelectionModel) { (dataProviderModel as ISelectionModel).selectedIndex = -1; } diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as index 1ddf400..f2b8494 100644 --- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as +++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as @@ -45,6 +45,7 @@ package org.apache.royale.html.beads import org.apache.royale.core.IIndexedItemRenderer; import org.apache.royale.utils.sendStrandEvent; import org.apache.royale.utils.sendEvent; + import org.apache.royale.html.util.getModelByType; /** @@ -354,7 +355,7 @@ package org.apache.royale.html.beads var dragSource:Object = DragEvent.dragSource; var sourceIndex:int = 0; - var dataProviderModel:IDataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel; + var dataProviderModel:IDataProviderModel = getModelByType(_strand,IDataProviderModel) as IDataProviderModel; if (dataProviderModel.dataProvider is Array) { var dataArray:Array = dataProviderModel.dataProvider as Array;
