restore old way of making renderers for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/133214fa Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/133214fa Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/133214fa Branch: refs/heads/develop Commit: 133214fa3b97d752a1f02d1c617acbda4d460e33 Parents: d875567 Author: Alex Harui <aha...@apache.org> Authored: Thu Sep 25 08:01:16 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu Sep 25 08:01:16 2014 -0700 ---------------------------------------------------------------------- .../FlexJSUI/src/org/apache/flex/html/List.as | 10 +++++----- .../NonVirtualVerticalScrollingLayout.as | 21 +------------------- 2 files changed, 6 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/133214fa/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as index a690b9b..029747e 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/List.as @@ -177,11 +177,11 @@ package org.apache.flex.html { super.addedToParent(); -// if (getBeadByType(IDataProviderItemRendererMapper) == null) -// { -// var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper; -// addBead(mapper); -// } + if (getBeadByType(IDataProviderItemRendererMapper) == null) + { + var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper; + addBead(mapper); + } var itemRendererFactory:IItemRendererClassFactory = getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory; if (!itemRendererFactory) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/133214fa/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as index 21ccbf2..a6bca76 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalScrollingLayout.as @@ -23,32 +23,14 @@ package org.apache.flex.html.beads.layouts import org.apache.flex.core.IBeadLayout; import org.apache.flex.core.IBorderModel; -<<<<<<< HEAD import org.apache.flex.core.IContentView; - import org.apache.flex.core.IItemRenderer; - import org.apache.flex.core.IItemRendererClassFactory; - import org.apache.flex.core.IItemRendererParent; - import org.apache.flex.core.ILayoutParent; -||||||| merged common ancestors - import org.apache.flex.core.ILayoutParent; -======= import org.apache.flex.core.IScrollingLayoutParent; import org.apache.flex.core.ILayoutParent; -<<<<<<< HEAD ->>>>>>> refactor ILayoutParent into IScrollingLayoutParent -||||||| merged common ancestors -======= import org.apache.flex.core.IParentIUIBase; ->>>>>>> get rid of DisplayObject and DisplayObjectContainer dependencies in ILayoutParent import org.apache.flex.core.IScrollBarModel; import org.apache.flex.core.ISelectionModel; import org.apache.flex.core.IStrand; -<<<<<<< HEAD - import org.apache.flex.core.UIBase; -||||||| merged common ancestors -======= import org.apache.flex.core.IUIBase; ->>>>>>> get rid of DisplayObject and DisplayObjectContainer dependencies in ILayoutParent import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.html.List; @@ -105,10 +87,9 @@ package org.apache.flex.html.beads.layouts private function changeHandler(event:Event):void { -<<<<<<< HEAD var layoutParent:IScrollingLayoutParent = _strand.getBeadByType(IScrollingLayoutParent) as IScrollingLayoutParent; - var contentView:IContentView = layoutParent.contentView as IContentView; + var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase; var border:Border = layoutParent.border; var borderModel:IBorderModel = border.model as IBorderModel;
