Various small fixes and changes

frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as

@@ -99,7 +99,7 @@ package org.apache.royale.html.beads
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion Royale 0.8
-		 *  @royaleignorecoercion org.apache.royale.core.ILayoutView
+		 *  @royaleemitcoercion org.apache.royale.core.ILayoutView
 		 */
 		override public function get contentView():ILayoutView
 		{
@@ -178,7 +178,6 @@ package org.apache.royale.html.beads
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion Royale 0.8
-		 *  @royaleignorecoercion org.apache.royale.core.IBorderPaddingMarginValuesImpl
 		 */
 		COMPILE::SWF
 		override public function beforeLayout():Boolean

frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as

@@ -102,7 +102,8 @@ package org.apache.royale.html.beads
 		{
 			dataModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
 			host.addEventListener("itemsCreated", itemsCreatedHandler);
-			dataModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
+			// may be called before IDataProviderModel bead is added
+			if (dataModel) dataModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
 		}
 
 

frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as

@@ -60,7 +60,7 @@ package org.apache.royale.html.beads
 		 *  @productversion Royale 0.9.7
 		 *  @royaleignorecoercion HTMLInputElement
 		 *  @royaleignorecoercion org.apache.royale.core.IStrandWithPresentationModel
-		 *  @royaleignorecoercion org.apache.royale.core.IListPresentationModel
+		 *  @royaleignorecoercion org.apache.royale.html.IListPresentationModel
 		 */
 		override public function set strand(value:IStrand):void
 		{	

frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/VirtualListVerticalLayout.as

@@ -228,7 +228,7 @@ package org.apache.royale.html.beads.layouts
                 }
                 for (var i:int = startIndex; i < endIndex; i++)
                 {
-                    if (i >= dp.length) continue; // no more renderers needed
+                    if (i >= dp.length) break; // no more renderers needed
 
                     var ir:IIndexedItemRenderer;
                     if (i < firstIndex)
@@ -361,7 +361,7 @@ package org.apache.royale.html.beads.layouts
                 }
                 for (var i:int = startIndex; i < endIndex; i++)
                 {
-                    if (i >= dp.length) continue; // no more renderers needed
+                    if (i >= dp.length) break; // no more renderers needed
 
                     var ir:IIndexedItemRenderer;
                     if (i < firstIndex)

frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VirtualListVerticalLayout.as

@@ -244,7 +244,7 @@ package org.apache.royale.jewel.beads.layouts
                 }
                 for (var i:int = startIndex; i < endIndex; i++)
                 {
-                    if (i >= dp.length) continue; // no more renderers needed
+                    if (i >= dp.length) break; // no more renderers needed
 
                     var ir:IIndexedItemRenderer;
                     if (i < firstIndex)
@@ -377,7 +377,7 @@ package org.apache.royale.jewel.beads.layouts
                 }
                 for (var i:int = startIndex; i < endIndex; i++)
                 {
-                    if (i >= dp.length) continue; // no more renderers needed
+                    if (i >= dp.length) break; // no more renderers needed
 
                     var ir:IIndexedItemRenderer;
                     if (i < firstIndex)

frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as

@@ -213,7 +213,6 @@ internal class MXRoyaleClasses
     import mx.controls.beads.layouts.DataGridLayout; DataGridLayout;
     import mx.controls.beads.layouts.AdvancedDataGridVirtualListVerticalLayout; AdvancedDataGridVirtualListVerticalLayout;
 	import mx.controls.beads.layouts.DataGridHeaderLayout; DataGridHeaderLayout;
-	import mx.controls.listClasses.VirtualListVerticalLayout; VirtualListVerticalLayout;
     import mx.controls.listClasses.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
     import mx.controls.treeClasses.TreeSingleSelectionMouseController; TreeSingleSelectionMouseController;
     import mx.controls.beads.TreeItemRendererMouseController; TreeItemRendererMouseController;

frameworks/projects/MXRoyale/src/main/royale/mx/collections/SortField.as

@@ -686,6 +686,25 @@ public class SortField extends EventDispatcher implements ISortField
         try
         {
             result = obj[_name];
+            COMPILE::JS
+            {
+                // support XML data in JS (in libraries without access to XML class)
+                if (result == null)
+                {
+                    if (_name.charAt(0) == '@')
+                    {
+                        var fa:* = obj["attribute"];
+                        if (fa && typeof(fa) === "function")
+                            result = fa.call(obj, _name);
+                    }
+                    else
+                    {
+                        var fc:* = obj["child"];
+                        if (fc && typeof(fc) === "function")
+                            result = fc.call(obj, _name).toString();
+                    }
+                }
+            }
         }
         catch(error:Error)
         {

frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridItemRendererInitializer.as

@@ -86,7 +86,10 @@ import mx.controls.AdvancedDataGrid;
 			var dataField:String = adg.columns[adgColumnListModel.columnIndex].dataField;
 			var text:String = "";
 			try {
-				text = data[dataField];
+				if (data is XML)
+					text = (data as XML)[dataField];
+				else
+					text = data[dataField];
 			} catch (e:Error)
 			{
 			}

frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSelectableItemRendererClassFactory.as

@@ -50,7 +50,7 @@ package mx.controls.beads
         override public function createItemRenderer():IItemRenderer
         {
             var ir:IItemRenderer = super.createItemRenderer();
-			ir["outerDocument"] = (_strand as AdvancedDataGridColumnList).grid.mxmlDocument;
+			ir["outerDocument"] = (_strand as AdvancedDataGridColumnList).grid.parentMxmlDocument;
 			if (ir.getBeadByType(IBeadController) == null) {
 				//add a default mouse controller for DropInRenderers that may not have a mousecontroller
 				ir.addBead(new ItemRendererMouseController());

frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridSelectableItemRendererClassFactory.as

@@ -52,7 +52,7 @@ package mx.controls.beads
             var ir:IItemRenderer = super.createItemRenderer();
 			COMPILE::JS 
 			{
-			ir["outerDocument"] = (_strand as DataGridColumnList).grid.mxmlDocument;
+			ir["outerDocument"] = (_strand as DataGridColumnList).grid.parentMxmlDocument;
 			}
 			if (ir.getBeadByType(IBeadController) == null) {
 				//add a default mouse controller for DropInRenderers that may not have a mousecontroller

frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/AdvancedDataGridVirtualListVerticalLayout.as

@@ -209,7 +209,7 @@ package mx.controls.beads.layouts
                     }
                     for (var i:int = startIndex; i < endIndex; i++)
                     {
-                        if (i >= dp.length) continue; // no more renderers needed
+                        if (i >= dp.length) break; // no more renderers needed
 
                         var ir:IIndexedItemRenderer;
                         if (i < firstIndex)
@@ -330,7 +330,7 @@ package mx.controls.beads.layouts
                     }
                     for (var i:int = startIndex; i < endIndex; i++)
                     {
-                        if (i >= dp.length) continue; // no more renderers needed
+                        if (i >= dp.length) break; // no more renderers needed
 
                         var ir:IIndexedItemRenderer;
                         if (i < firstIndex)

frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/DataItemRendererFactoryForIListData.as

@@ -73,51 +73,29 @@ package mx.controls.listClasses
 			super();
 		}
 
-        private var dp:IList;
-
         /**
          * @private
-         * @royaleignorecoercion org.apache.royale.core.IListPresentationModel
-         * @royaleignorecoercion org.apache.royale.core.ISelectableItemRenderer
-         * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
          */
         override protected function dataProviderChangeHandler(event:Event):void
         {
             if (!dataProviderModel)
                 return;
-            dp = dataProviderModel.dataProvider as IList;
-            if (!dp)
+            var dpTest:IList = dataProviderModel.dataProvider as IList;
+            if (!dpTest)
             {
                 // temporary until descriptor is used in MenuBarModel
                 var obj:Object = dataProviderModel.dataProvider;
                 if (obj is Array)
                 {
-                    dp = new ArrayList(obj as Array);
+                    dataProviderModel.dataProvider = new ArrayList(obj as Array);
                 }
                 else
                     return;
             }
-
-            // listen for individual items being added in the future.
-            var dped:IEventDispatcher = dp as IEventDispatcher;
-            dped.addEventListener(CollectionEvent.ITEM_ADDED, itemAddedHandler);
-            dped.addEventListener(CollectionEvent.ITEM_REMOVED, itemRemovedHandler);
-            dped.addEventListener(CollectionEvent.ITEM_UPDATED, itemUpdatedHandler);
-
+
             super.dataProviderChangeHandler(event);
-
-        }
-
-        override protected function get dataProviderLength():int
-        {
-            return dp.length;
         }
 
-        override protected function getItemAt(index:int):Object
-        {
-            return dp.getItemAt(index);
-        }
-
 	override protected function createAllItemRenderers(dataGroup:IItemRendererOwnerView):void
 	{
 		var functionBead:ItemRendererFunctionBead = _strand.getBeadByType(ItemRendererFunctionBead) as ItemRendererFunctionBead;
@@ -134,7 +112,6 @@ package mx.controls.listClasses
 			ir.data = data;				
 		}
 	}
-
 
 	}
 }