You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by mi...@apache.org on 2015/05/20 16:36:29 UTC
git commit: [flex-sdk] [refs/heads/develop] - FLEX-32249 Now
AdvancedDataGrid.makeListData() uses the HierarchicalCollectionViewCursor
through its IHierarchicalCollectionViewCursor interface,
so that other cursors can be used which don't extend Hierarchi
Repository: flex-sdk
Updated Branches:
refs/heads/develop fee761ffc -> 357e2168e
FLEX-32249
Now AdvancedDataGrid.makeListData() uses the HierarchicalCollectionViewCursor through its IHierarchicalCollectionViewCursor interface, so that other cursors can be used which don't extend HierarchicalCollectionViewCursor.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/357e2168
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/357e2168
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/357e2168
Branch: refs/heads/develop
Commit: 357e2168eb249ab5b521b6e950813ade267787ac
Parents: fee761f
Author: Mihai Chira <mi...@apache.org>
Authored: Wed May 20 16:34:44 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed May 20 16:34:44 2015 +0200
----------------------------------------------------------------------
.../src/mx/controls/AdvancedDataGrid.as | 168 +++++++++----------
1 file changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/357e2168/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
index 5e1995f..fe4b981 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGrid.as
@@ -20,89 +20,89 @@
package mx.controls
{
-import flash.display.DisplayObject;
-import flash.display.Graphics;
-import flash.display.Shape;
-import flash.display.Sprite;
-import flash.events.Event;
-import flash.events.KeyboardEvent;
-import flash.events.MouseEvent;
-import flash.geom.Point;
-import flash.geom.Rectangle;
-import flash.ui.Keyboard;
-import flash.utils.Dictionary;
-import flash.utils.describeType;
-import flash.utils.getDefinitionByName;
-import flash.utils.getQualifiedClassName;
-
-import mx.collections.ArrayCollection;
-import mx.collections.CursorBookmark;
-import mx.collections.HierarchicalCollectionView;
-import mx.collections.HierarchicalCollectionViewCursor;
-import mx.collections.HierarchicalData;
-import mx.collections.ICollectionView;
-import mx.collections.IGroupingCollection;
-import mx.collections.IGroupingCollection2;
-import mx.collections.IHierarchicalCollectionView;
-import mx.collections.IHierarchicalData;
-import mx.collections.IViewCursor;
-import mx.collections.ItemResponder;
-import mx.collections.Sort;
-import mx.collections.SortField;
-import mx.collections.SummaryObject;
-import mx.collections.errors.ItemPendingError;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridBaseSelectionData;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridBaseSelectionPending;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridColumn;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnGroup;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridGroupItemRenderer;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridHeaderInfo;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridListData;
-import mx.controls.advancedDataGridClasses.AdvancedDataGridRendererDescription;
-import mx.controls.advancedDataGridClasses.IAdvancedDataGridRendererProvider;
-import mx.controls.advancedDataGridClasses.SortInfo;
-import mx.controls.listClasses.BaseListData;
-import mx.controls.listClasses.IDropInListItemRenderer;
-import mx.controls.listClasses.IListItemRenderer;
-import mx.controls.listClasses.ListBaseSeekPending;
-import mx.controls.listClasses.ListRowInfo;
-import mx.core.ClassFactory;
-import mx.core.EdgeMetrics;
-import mx.core.EventPriority;
-import mx.core.FlexShape;
-import mx.core.FlexSprite;
-import mx.core.IDataRenderer;
-import mx.core.IFactory;
-import mx.core.IFlexDisplayObject;
-import mx.core.IInvalidating;
-import mx.core.IUITextField;
-import mx.core.ScrollPolicy;
-import mx.core.SpriteAsset;
-import mx.core.UIComponent;
-import mx.core.UIComponentGlobals;
-import mx.core.mx_internal;
-import mx.effects.Tween;
-import mx.events.AdvancedDataGridEvent;
-import mx.events.AdvancedDataGridEventReason;
-import mx.events.CollectionEvent;
-import mx.events.CollectionEventKind;
-import mx.events.DragEvent;
-import mx.events.FlexEvent;
-import mx.events.IndexChangedEvent;
-import mx.events.ListEvent;
-import mx.events.ListEventReason;
-import mx.events.ScrollEvent;
-import mx.events.ScrollEventDetail;
-import mx.events.ScrollEventDirection;
-import mx.events.TweenEvent;
-import mx.managers.DragManager;
-import mx.resources.IResourceManager;
-import mx.resources.ResourceManager;
-import mx.styles.ISimpleStyleClient;
-import mx.styles.IStyleClient;
-import mx.utils.UIDUtil;
-
-use namespace mx_internal;
+ import flash.display.DisplayObject;
+ import flash.display.Graphics;
+ import flash.display.Shape;
+ import flash.display.Sprite;
+ import flash.events.Event;
+ import flash.events.KeyboardEvent;
+ import flash.events.MouseEvent;
+ import flash.geom.Point;
+ import flash.geom.Rectangle;
+ import flash.ui.Keyboard;
+ import flash.utils.Dictionary;
+ import flash.utils.describeType;
+ import flash.utils.getDefinitionByName;
+ import flash.utils.getQualifiedClassName;
+
+ import mx.collections.ArrayCollection;
+ import mx.collections.CursorBookmark;
+ import mx.collections.HierarchicalCollectionView;
+ import mx.collections.HierarchicalData;
+ import mx.collections.ICollectionView;
+ import mx.collections.IGroupingCollection;
+ import mx.collections.IGroupingCollection2;
+ import mx.collections.IHierarchicalCollectionView;
+ import mx.collections.IHierarchicalCollectionViewCursor;
+ import mx.collections.IHierarchicalData;
+ import mx.collections.IViewCursor;
+ import mx.collections.ItemResponder;
+ import mx.collections.Sort;
+ import mx.collections.SortField;
+ import mx.collections.SummaryObject;
+ import mx.collections.errors.ItemPendingError;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridBaseSelectionData;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridBaseSelectionPending;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridColumn;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridColumnGroup;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridGroupItemRenderer;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridHeaderInfo;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridListData;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridRendererDescription;
+ import mx.controls.advancedDataGridClasses.IAdvancedDataGridRendererProvider;
+ import mx.controls.advancedDataGridClasses.SortInfo;
+ import mx.controls.listClasses.BaseListData;
+ import mx.controls.listClasses.IDropInListItemRenderer;
+ import mx.controls.listClasses.IListItemRenderer;
+ import mx.controls.listClasses.ListBaseSeekPending;
+ import mx.controls.listClasses.ListRowInfo;
+ import mx.core.ClassFactory;
+ import mx.core.EdgeMetrics;
+ import mx.core.EventPriority;
+ import mx.core.FlexShape;
+ import mx.core.FlexSprite;
+ import mx.core.IDataRenderer;
+ import mx.core.IFactory;
+ import mx.core.IFlexDisplayObject;
+ import mx.core.IInvalidating;
+ import mx.core.IUITextField;
+ import mx.core.ScrollPolicy;
+ import mx.core.SpriteAsset;
+ import mx.core.UIComponent;
+ import mx.core.UIComponentGlobals;
+ import mx.core.mx_internal;
+ import mx.effects.Tween;
+ import mx.events.AdvancedDataGridEvent;
+ import mx.events.AdvancedDataGridEventReason;
+ import mx.events.CollectionEvent;
+ import mx.events.CollectionEventKind;
+ import mx.events.DragEvent;
+ import mx.events.FlexEvent;
+ import mx.events.IndexChangedEvent;
+ import mx.events.ListEvent;
+ import mx.events.ListEventReason;
+ import mx.events.ScrollEvent;
+ import mx.events.ScrollEventDetail;
+ import mx.events.ScrollEventDirection;
+ import mx.events.TweenEvent;
+ import mx.managers.DragManager;
+ import mx.resources.IResourceManager;
+ import mx.resources.ResourceManager;
+ import mx.styles.ISimpleStyleClient;
+ import mx.styles.IStyleClient;
+ import mx.utils.UIDUtil;
+
+ use namespace mx_internal;
//--------------------------------------
// Events
@@ -3583,7 +3583,7 @@ public class AdvancedDataGrid extends AdvancedDataGridBaseEx
advancedDataGridListData =
super.makeListData(data, uid, rowNum,columnNum,column) as AdvancedDataGridListData;
- if (iterator && iterator is HierarchicalCollectionViewCursor && columnNum == treeColumnIndex
+ if (iterator && iterator is IHierarchicalCollectionViewCursor && columnNum == treeColumnIndex
&& !(data is AdvancedDataGridColumn))
initListData(data, advancedDataGridListData);
else