royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pio...@apache.org
Subject [royale-asjs] branch feature/Merge_MXRoyale_To_Develop updated: Fix related to build after merge
Date Fri, 31 Aug 2018 10:57:19 GMT
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 9e094e8  Fix related to build after merge
9e094e8 is described below

commit 9e094e8044249baa0d24323c4300fe2b25d5ec5b
Author: Piotr Zarzycki <piotrzarzycki21@gmail.com>
AuthorDate: Fri Aug 31 12:57:08 2018 +0200

    Fix related to build after merge
---
 .../Basic/src/main/resources/basic-manifest.xml    |   1 -
 .../projects/Basic/src/main/resources/defaults.css |  11 ---
 .../royale/core/IListWithPresentationModel.as}     |  15 ++-
 .../royale/org/apache/royale/html/DataContainer.as |   3 +-
 .../org/apache/royale/html/beads/DataGridView.as   |   5 +-
 .../royale/core/IStrandWithPresentationModel.as    |   2 -
 .../apache/royale/html/supportClasses/DataGroup.as |   5 +
 .../AddTableItemRendererForArrayListData.as        |   4 +-
 .../RemoveTableItemRendererForArrayListData.as     |   8 +-
 .../UpdateTableItemRendererForArrayListData.as     |   2 +-
 .../jewel/supportClasses/table/TBodyContentArea.as |   7 +-
 .../src/main/royale/mx/controls/DataGrid.as        | 101 +++------------------
 12 files changed, 45 insertions(+), 119 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index ff6ea7e..33bf43e 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -193,7 +193,6 @@
     <component id="DateChooserList" class="org.apache.royale.html.supportClasses.DateChooserList"
/>
     <component id="DateChooserHeader" class="org.apache.royale.html.supportClasses.DateChooserHeader"
/>
     <component id="DateField" class="org.apache.royale.html.DateField"/>
-    <component id="DateFieldDateChooser" class="org.apache.royale.html.supportClasses.DateFieldDateChooser"/>
     <component id="VerticalColumnLayout" class="org.apache.royale.html.beads.layouts.VerticalColumnLayout"
/>
 
     <component id="ToolTipBead" class="org.apache.royale.html.accessories.ToolTipBead"
/>
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index cad411f..5ff6e0d 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -208,16 +208,6 @@ DateChooser {
 	height: 240px;
 }
 
-DateFieldDateChooser {
-	IBeadView:   ClassReference("org.apache.royale.html.beads.DateChooserView");
-	IBeadModel:  ClassReference("org.apache.royale.html.beads.models.DateChooserModel");			
-	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalFlexLayout");

-	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.DateChooserMouseController");
-	width:  210px;
-	height: 230px;
-}
-
-
 DateChooserList {
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
@@ -269,7 +259,6 @@ DateField {
 	IBeadModel:  ClassReference("org.apache.royale.html.beads.models.DateChooserModel");
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.DateFieldMouseController");
 	IFormatBead: ClassReference("org.apache.royale.html.accessories.DateFormatYYYYMMDD");
-	IPopUp: ClassReference("org.apache.royale.html.supportClasses.DateFieldDateChooser");
 }
 
 /** DividedContainer */
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
similarity index 71%
copy from frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
copy to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
index f67960d..360a940 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
@@ -18,24 +18,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-	import org.apache.royale.core.IBead;
+    import org.apache.royale.core.IList
+	import org.apache.royale.core.IListPresentationModel;
 
     /**
-     *  The IStrandWithPresentationModel interface is implemented by any IStrand
-	 *  that supports a separate bead that is a presentationModel.  A presentationModel
-     *  is a set of properties that act as parameters to the View as opposed to the
-     *  regular model that is the data to be displayed by the view.  A simple example
-     *  is the rowHeight of a vertical list.
+     *  The IListWithPresentationModel interface is implemented by any IList
+	 *  that supports a separate IListPresentationModel
      * 
      *  @langversion 3.0
      *  @playerversion Flash 10.2
      *  @playerversion AIR 2.6
      *  @productversion Royale 0.0
      */
-	public interface IStrandWithPresentationModel
+	public interface IListWithPresentationModel extends IList
 	{
         /**
-         *  Returns the bead that holds the properties for the presentationModel.
+         *  Returns the component within the list (maybe even the list shell itself)
+		 *  which will be the parent of each itemRenderer.
          * 
          *  @langversion 3.0
          *  @playerversion Flash 10.2
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index dbb390e..c258884 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -46,6 +46,7 @@ package org.apache.royale.html
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.beads.models.ListPresentationModel;
 	import org.apache.royale.html.beads.IListView;
+	import org.apache.royale.core.IListPresentationModel;
 
 	/**
 	 *  Indicates that the initialization of the list is complete.
@@ -142,7 +143,7 @@ package org.apache.royale.html
 		 *  @productversion Royale 0.9
 		 *  @royaleignorecoercion org.apache.royale.core.IListPresentationModel
 		 */
-		public function get presentationModel():IBead
+		public function get presentationModel():IListPresentationModel
 		{
 			var presModel:IListPresentationModel = getBeadByType(IListPresentationModel) as IListPresentationModel;
 			if (presModel == null) {
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
index 89689f0..90df578 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
@@ -34,7 +34,8 @@ package org.apache.royale.html.beads
 	import org.apache.royale.html.Container;
 	import org.apache.royale.html.DataGridButtonBar;
 	import org.apache.royale.html.beads.layouts.ButtonBarLayout;
-	import org.apache.royale.html.supportClasses.IDataGridColumnList;
+    import org.apache.royale.html.supportClasses.DataGridColumnList;
+    import org.apache.royale.html.supportClasses.IDataGridColumnList;
 	import org.apache.royale.html.supportClasses.IDataGridColumn;
 	import org.apache.royale.html.supportClasses.Viewport;
 
@@ -227,7 +228,7 @@ package org.apache.royale.html.beads
 				{
 					var dataGridColumn:IDataGridColumn = sharedModel.columns[i] as IDataGridColumn;
 
-					var list:IDataGridColumnList = new columnClass();
+					var list:DataGridColumnList = new columnClass();
 					
 					if (i == 0)
 					{
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 f67960d..81e7d03 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
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-	import org.apache.royale.core.IBead;
-
     /**
      *  The IStrandWithPresentationModel interface is implemented by any IStrand
 	 *  that supports a separate bead that is a presentationModel.  A presentationModel
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
index 958576e..df99f8c 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
@@ -55,6 +55,11 @@ package org.apache.royale.html.supportClasses
         * IItemRendererParent
         */
 
+        public function get numItemRenderers():int
+        {
+            return this.numElements;
+        }
+
         /**
          * @copy org.apache.royale.core.IItemRendererParent#addItemRenderer()
          * @private
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
index 23422f7..c5417fb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as
@@ -163,10 +163,10 @@ package org.apache.royale.jewel.beads.itemRenderers
 			// adjust the itemRenderers' index to adjust for the shift
 			var cell:TableCell;
 			var processedRow:TableRow;
-			var len:int = itemRendererParent.numElements;
+			var len:int = itemRendererParent.numItemRenderers;
 			for (var i:int = event.index; i < len; i++)
 			{
-				processedRow = itemRendererParent.getElementAt(i) as TableRow;
+				processedRow = itemRendererParent.getItemRendererForIndex(i) as TableRow;
 				var n:int = processedRow.numElements;
 				for (j = 0; j < n; j++)
 				{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
index 348618e..528b8f6 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as
@@ -124,7 +124,7 @@ package org.apache.royale.jewel.beads.itemRenderers
 		{
 			var ir:DataItemRenderer;
 			var cell:TableCell;
-			var processedRow:TableRow = itemRendererParent.getElementAt(event.index) as TableRow;
+			var processedRow:TableRow = itemRendererParent.getItemRendererForIndex(event.index) as
TableRow;
 			while (processedRow.numElements > 0) {
 				cell = processedRow.getElementAt(0) as TableCell;
 				ir = cell.getElementAt(0) as DataItemRenderer;
@@ -132,13 +132,13 @@ package org.apache.royale.jewel.beads.itemRenderers
 				cell.removeElement(ir);
 				processedRow.removeElement(cell);
 			}
-			itemRendererParent.removeElement(processedRow);
+			//itemRendererParent.removeItemRenderer(processedRow);
 
 			// adjust the itemRenderers' index to adjust for the shift
-			var len:int = itemRendererParent.numElements;
+			var len:int = itemRendererParent.numItemRenderers;
 			for (var i:int = event.index; i < len; i++)
 			{
-				processedRow = itemRendererParent.getElementAt(i) as TableRow;
+				processedRow = itemRendererParent.getItemRendererForIndex(i) as TableRow;
 				var n:int = processedRow.numElements;
 				for (var j:int = 0; j < n; j++)
 				{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableItemRendererForArrayListData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableItemRendererForArrayListData.as
index a2c35d8..a082fe4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableItemRendererForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableItemRendererForArrayListData.as
@@ -125,7 +125,7 @@ package org.apache.royale.jewel.beads.itemRenderers
 		{
 			var ir:ISelectableItemRenderer;
 			var cell:TableCell;
-			var processedRow:TableRow = itemRendererParent.getElementAt(event.index) as TableRow;
+			var processedRow:TableRow = itemRendererParent.getItemRendererForIndex(event.index) as
TableRow;
 			var n:int = processedRow.numElements;
 			for (var i:int = 0; i < n; i++)
 			{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
index 9709e68..4452484 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
@@ -77,7 +77,12 @@ package org.apache.royale.jewel.supportClasses.table
 		/*
 		* IItemRendererParent
 		*/
-		
+
+		public function get numItemRenderers():int
+		{
+			return this.numElements;
+		}
+
 		/**
 		 * @copy org.apache.royale.core.IItemRendererParent#addItemRenderer()
 		 * @private
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;
     }


Mime
View raw message