This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a commit to branch feature/Merge_MXRoyale_To_Develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to
refs/heads/feature/Merge_MXRoyale_To_Develop by this push:
new 8b7c76c Adjust signature interface after merge
8b7c76c is described below
commit 8b7c76ca743d7ba5c7d0ba1e3fb508abbd60eb51
Author: Piotr Zarzycki <[email protected]>
AuthorDate: Thu Aug 30 14:43:16 2018 +0200
Adjust signature interface after merge
---
.../main/royale/org/apache/royale/html/DataGrid.as | 9 +-
.../royale/core/IStrandWithPresentationModel.as | 2 +-
.../src/main/royale/mx/controls/DataGrid.as | 101 +++------------------
3 files changed, 21 insertions(+), 91 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
index 6075eaa..d5b6bac 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
@@ -29,7 +29,8 @@ package org.apache.royale.html
import org.apache.royale.events.Event;
import org.apache.royale.html.beads.models.DataGridPresentationModel;
import org.apache.royale.utils.loadBeadFromValuesManager;
-
+ import org.apache.royale.core.IListPresentationModel;
+
[Event(name="change", type="org.apache.royale.events.Event")]
/**
@@ -147,7 +148,7 @@ package org.apache.royale.html
* @royaleignorecoercion
org.apache.royale.core.IDataGridPresentationModel
* @royaleignorecoercion org.apache.royale.core.IBead
*/
- public function get presentationModel():IBead
+ public function get presentationModel():IListPresentationModel
{
if (_presentationModel == null) {
var c:Class =
ValuesManager.valuesImpl.getValue(this, "iDataGridPresentationModel");
@@ -157,12 +158,12 @@ package org.apache.royale.html
}
}
- return _presentationModel;
+ return _presentationModel as IListPresentationModel;
}
/**
* @royaleignorecoercion
org.apache.royale.core.IDataGridPresentationModel
*/
- public function set presentationModel(value:IBead):void
+ public function set
presentationModel(value:IListPresentationModel):void
{
_presentationModel = value as
IDataGridPresentationModel;
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
index 2d9be95..f67960d 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
@@ -42,7 +42,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- function get presentationModel():IBead;
+ function get presentationModel():IListPresentationModel;
}
}
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
index 2666643..d36a201 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
@@ -19,89 +19,18 @@
package mx.controls
{
-COMPILE::JS
-{
- import goog.DEBUG;
-}
-/*
-import flash.display.DisplayObject;
-import flash.display.DisplayObjectContainer;
-import flash.display.InteractiveObject;
-import flash.display.Graphics;
-import flash.display.Shape;
-import flash.display.Sprite;
-import flash.events.Event;
-import flash.events.FocusEvent;
-import flash.events.KeyboardEvent;
-import flash.events.MouseEvent;
-import flash.geom.Point;
-import flash.ui.Keyboard;
-import flash.utils.Dictionary;
-import flash.utils.describeType;
-
-import mx.collections.CursorBookmark;
-import mx.collections.ICollectionView;
-import mx.collections.ISort;
-import mx.collections.ISortField;
-import mx.collections.ItemResponder;
-import mx.collections.Sort;
-import mx.collections.SortField;
-import mx.collections.errors.ItemPendingError;
-import mx.controls.dataGridClasses.DataGridBase;
-import mx.controls.dataGridClasses.DataGridColumn;
-import mx.controls.dataGridClasses.DataGridDragProxy;
-import mx.controls.dataGridClasses.DataGridHeader;
-import mx.controls.dataGridClasses.DataGridItemRenderer;
-import mx.controls.dataGridClasses.DataGridListData;
-import mx.controls.listClasses.IDropInListItemRenderer;
-import mx.controls.listClasses.IListItemRenderer;
-import mx.controls.listClasses.ListBaseContentHolder;
-import mx.controls.listClasses.ListBaseSeekPending;
-import mx.controls.listClasses.ListRowInfo;
-import mx.controls.scrollClasses.ScrollBar;
-import mx.core.ContextualClassFactory;
-import mx.core.EdgeMetrics;
-import mx.core.EventPriority;
-import mx.core.FlexShape;
-import mx.core.FlexSprite;
-import mx.core.IFactory;
-import mx.core.IFlexDisplayObject;
-import mx.core.IFlexModuleFactory;
-import mx.core.IIMESupport;
-import mx.core.IInvalidating;
-import mx.core.IPropertyChangeNotifier;
-import mx.core.IRectangularBorder;
-import mx.core.IUIComponent;
-import mx.core.ScrollPolicy;
-import mx.core.UIComponent;
-import mx.core.UIComponentGlobals;
-import mx.core.mx_internal;
-import mx.events.CollectionEvent;
-import mx.events.CollectionEventKind;
-import mx.events.DataGridEvent;
-import mx.events.DataGridEventReason;
-import mx.events.DragEvent;
-import mx.events.IndexChangedEvent;
-import mx.events.ListEvent;
-import mx.events.SandboxMouseEvent;
-import mx.events.ScrollEvent;
-import mx.events.ScrollEventDetail;
-import mx.managers.IFocusManager;
-import mx.managers.IFocusManagerComponent;
-import mx.skins.halo.ListDropIndicator;
-import mx.styles.ISimpleStyleClient;
-import mx.utils.ObjectUtil;
-import mx.utils.StringUtil;
-
-use namespace mx_internal;
-*/
-
-import mx.controls.listClasses.ListBase;
-import org.apache.royale.core.IBead;
-import org.apache.royale.core.IDataGrid;
-import org.apache.royale.core.IDataGridPresentationModel;
-import org.apache.royale.core.IDataGridModel;
-import org.apache.royale.core.ValuesManager;
+ COMPILE::JS
+ {
+ import goog.DEBUG;
+ }
+
+ import mx.controls.listClasses.ListBase;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IDataGrid;
+ import org.apache.royale.core.IDataGridPresentationModel;
+ import org.apache.royale.core.IDataGridModel;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.core.IListPresentationModel;
//--------------------------------------
// Events
@@ -806,7 +735,7 @@ public class DataGrid extends ListBase implements
IDataGrid// implements IIMESup
* @royaleignorecoercion org.apache.royale.core.IDataGridPresentationModel
* @royaleignorecoercion org.apache.royale.core.IBead
*/
- public function get presentationModel():IBead
+ public function get presentationModel():IListPresentationModel
{
if (_presentationModel == null) {
var c:Class = ValuesManager.valuesImpl.getValue(this,
"iDataGridPresentationModel");
@@ -816,13 +745,13 @@ public class DataGrid extends ListBase implements
IDataGrid// implements IIMESup
}
}
- return _presentationModel;
+ return _presentationModel as IListPresentationModel;
}
/**
* @royaleignorecoercion org.apache.royale.core.IDataGridPresentationModel
* @royaleignorecoercion org.apache.royale.core.IBead
*/
- public function set presentationModel(value:IBead):void
+ public function set presentationModel(value:IListPresentationModel):void
{
_presentationModel = value as IDataGridPresentationModel;
}
