[royale-asjs] 02/04: use interfaces for Menu

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 9c69d22540c40b00fde8dd8a0760b64125190b92
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue May 12 00:40:04 2020 -0700

    use interfaces for Menu
---
 .../controllers/CascadingMenuSelectionMouseController.as     | 12 ++++++------
 .../apache/royale/html/beads/models/CascadingMenuModel.as    |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
index 874448d..eaa15be 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
@@ -22,12 +22,12 @@ package org.apache.royale.html.beads.controllers
 	import org.apache.royale.core.IMenu;
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.core.IUIBase;
+	import org.apache.royale.core.ICascadingMenuModel;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.ItemClickedEvent;
 	import org.apache.royale.html.CascadingMenu;
-	import org.apache.royale.html.beads.models.CascadingMenuModel;
-	import org.apache.royale.html.beads.models.MenuModel;
 	import org.apache.royale.html.Menu;
+	import org.apache.royale.html.beads.models.MenuModel;
 	import org.apache.royale.core.ISelectionModel;
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.core.ValuesManager;
@@ -93,7 +93,7 @@ package org.apache.royale.html.beads.controllers
 		{
 			var node:Object = event.data;
 			
-			var model:CascadingMenuModel = _strand.getBeadByType(IBeadModel) as CascadingMenuModel;
+			var model:ICascadingMenuModel = _strand.getBeadByType(IBeadModel) as ICascadingMenuModel;
 			
 			if (getHasMenu(node, model)) {
 				var c:Class = ValuesManager.valuesImpl.getValue(_strand, "iMenu");
@@ -139,7 +139,7 @@ package org.apache.royale.html.beads.controllers
 				var menuModel:ISelectionModel = menu.model as ISelectionModel;
 				if (menuModel && menuModel.selectedItem == selectedItem)
 				{
-					var dp:Object = getSubMenuDataProvider(selectedItem, menuModel as CascadingMenuModel);
+					var dp:Object = getSubMenuDataProvider(selectedItem, menuModel as ICascadingMenuModel);
 					if (dp)
 					{
 						// though this is being called in a loop, performance shouldn't be a big issue as
@@ -180,12 +180,12 @@ package org.apache.royale.html.beads.controllers
 			return null;
 		}
 
-		protected function getSubMenuDataProvider(node:Object, model:CascadingMenuModel):Object
+		protected function getSubMenuDataProvider(node:Object, model:ICascadingMenuModel):Object
 		{
 			return node[model.submenuField];
 		}
 		
-		protected function getHasMenu(node:Object, model:CascadingMenuModel):Boolean
+		protected function getHasMenu(node:Object, model:ICascadingMenuModel):Boolean
 		{
 			return node.hasOwnProperty(model.submenuField);
 		}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/CascadingMenuModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/CascadingMenuModel.as
index a89ea04..8f7fab8 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/CascadingMenuModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/CascadingMenuModel.as
@@ -19,9 +19,10 @@
 package org.apache.royale.html.beads.models
 {
 	import org.apache.royale.core.IStrand;
+	import org.apache.royale.core.ICascadingMenuModel;
 	import org.apache.royale.events.Event;
 
-	public class CascadingMenuModel extends MenuModel
+	public class CascadingMenuModel extends MenuModel implements ICascadingMenuModel
 	{
 		public function CascadingMenuModel()
 		{