You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/07/31 15:26:56 UTC
[royale-asjs] branch develop updated: jewel-table: simplify
TableArrayListSelectionModel
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 35f98e9 jewel-table: simplify TableArrayListSelectionModel
35f98e9 is described below
commit 35f98e92b705adc49d4264b026ab33522b0b81fd
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Jul 31 17:26:42 2020 +0200
jewel-table: simplify TableArrayListSelectionModel
---
.../jewel/beads/models/ArrayListSelectionModel.as | 6 +-
.../beads/models/TableArrayListSelectionModel.as | 238 ++-------------------
2 files changed, 23 insertions(+), 221 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
index 60f295c..6e3dbc8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
@@ -135,7 +135,7 @@ package org.apache.royale.jewel.beads.models
}
- private var _dataProvider:IArrayList;
+ protected var _dataProvider:IArrayList;
/**
* @copy org.apache.royale.core.ISelectionModel#dataProvider
@@ -191,7 +191,7 @@ package org.apache.royale.jewel.beads.models
}
}
- private var _selectedIndex:int = -1;
+ protected var _selectedIndex:int = -1;
private var _rollOverIndex:int = -1;
private var _labelField:String = null;
@@ -277,7 +277,7 @@ package org.apache.royale.jewel.beads.models
}
}
- private var _selectedItem:Object;
+ protected var _selectedItem:Object;
/**
* @copy org.apache.royale.core.ISelectionModel#selectedItem
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableArrayListSelectionModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableArrayListSelectionModel.as
index 0ad8196..3b9de7d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableArrayListSelectionModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableArrayListSelectionModel.as
@@ -18,15 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.models
{
- COMPILE::SWF{
- import flash.events.Event;
- }
import org.apache.royale.collections.IArrayList;
- import org.apache.royale.core.IRollOverModel;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.EventDispatcher;
- import org.apache.royale.events.IEventDispatcher;
/**
* The ArrayListSelectionModel class is a selection model for
@@ -38,7 +30,7 @@ package org.apache.royale.jewel.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class TableArrayListSelectionModel implements IJewelSelectionModel, IRollOverModel
+ public class TableArrayListSelectionModel extends ArrayListSelectionModel
{
/**
* Constructor.
@@ -52,106 +44,10 @@ package org.apache.royale.jewel.beads.models
{
}
- //IJewelSelectionModel
- private var _dispatcher:IEventDispatcher;
- public function get dispatcher():IEventDispatcher {
- if (!_dispatcher) {
- _dispatcher = new EventDispatcher(this) as IEventDispatcher;
- }
- return _dispatcher;
- }
- public function set dispatcher(value:IEventDispatcher):void{
- _dispatcher = value;
- }
-
- public function get hasDispatcher():Boolean{
- return !!_dispatcher;
- }
-
- //IEventDispatcher JS
- COMPILE::JS
- public function addEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void{
- dispatcher.addEventListener(type, handler, opt_capture, opt_handlerScope);
- }
- COMPILE::JS
- public function removeEventListener(type:String, handler:Function, opt_capture:Boolean = false, opt_handlerScope:Object = null):void{
- dispatcher.removeEventListener(type, handler, opt_capture, opt_handlerScope);
- }
-
- COMPILE::JS
- public function dispatchEvent(event:Object):Boolean{
- return dispatcher.dispatchEvent(event);
- }
-
-
-
- //IEventDispatcher SWF
- COMPILE::SWF
- public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void {
- dispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
- }
- COMPILE::SWF
- public function removeEventListener(type:String, listener:Function, useCapture:Boolean = false):void{
- dispatcher.removeEventListener(type, listener, useCapture);
- }
-
- COMPILE::SWF
- public function dispatchEvent(event:flash.events.Event):Boolean{
- return dispatcher.dispatchEvent(event);
- }
-
- COMPILE::SWF
- public function willTrigger(type:String):Boolean{
- return dispatcher.willTrigger(type);
- }
-
- //IEventDispatcher (shared)
- public function hasEventListener(type:String):Boolean{
- return dispatcher.hasEventListener(type);
- }
-
- /**
- * @private
- */
- protected function dispatchChange(eventName:String):void{
- dispatchEvent(new org.apache.royale.events.Event(eventName));
- }
-
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.royale.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
- }
-
- private var _dataProvider:IArrayList;
-
- [Bindable("dataProviderChanged")]
- /**
- * @copy org.apache.royale.core.ISelectionModel#dataProvider
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get dataProvider():Object
- {
- return _dataProvider;
- }
-
/**
* @private
*/
- public function set dataProvider(value:Object):void
+ override public function set dataProvider(value:Object):void
{
if (value == _dataProvider) return;
@@ -164,51 +60,10 @@ package org.apache.royale.jewel.beads.models
dispatchChange("dataProviderChanged");
}
- private var _selectedIndex:int = -1;
- private var _rollOverIndex:int = -1;
- private var _labelField:String = null;
-
- /**
- * @copy org.apache.royale.core.ISelectionModel#labelField
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get labelField():String
- {
- return _labelField;
- }
-
- /**
- * @private
- */
- public function set labelField(value:String):void
- {
- if (value != _labelField) {
- _labelField = value;
- dispatchChange("labelFieldChanged");
- }
- }
-
- /**
- * @copy org.apache.royale.core.ISelectionModel#selectedIndex
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get selectedIndex():int
- {
- return _selectedIndex;
- }
-
/**
* @private
*/
- public function set selectedIndex(value:int):void
+ override public function set selectedIndex(value:int):void
{
if (value == _selectedIndex) return;
@@ -216,50 +71,11 @@ package org.apache.royale.jewel.beads.models
_selectedItem = (value == -1 || _dataProvider == null) ? null : (value < _dataProvider.length) ? _dataProvider.getItemAt(value) : null;
dispatchChange("selectionChanged");
}
-
- /**
- * @copy org.apache.royale.core.IRollOverModel#rollOverIndex
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get rollOverIndex():int
- {
- return _rollOverIndex;
- }
-
- /**
- * @private
- */
- public function set rollOverIndex(value:int):void
- {
- if (value != _rollOverIndex) {
- _rollOverIndex = value;
- dispatchChange("rollOverIndexChanged");
- }
- }
-
- private var _selectedItem:Object;
-
- /**
- * @copy org.apache.royale.core.ISelectionModel#selectedItem
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get selectedItem():Object
- {
- return _selectedItem;
- }
-
+
/**
* @private
*/
- public function set selectedItem(value:Object):void
+ override public function set selectedItem(value:Object):void
{
if (value == _selectedItem) return;
@@ -276,38 +92,24 @@ package org.apache.royale.jewel.beads.models
dispatchChange("selectionChanged");
}
- private var _selectedString:String;
-
- /**
- * An alternative to selectedItem for strongly typing the
- * the selectedItem if the Array is an Array of Strings.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get selectedString():String
- {
- return String(_selectedItem);
- }
+ // private var _selectedString:String;
/**
* @private
*/
- public function set selectedString(value:String):void
- {
- _selectedString = value;
- var n:int = _dataProvider.length;
- for (var i:int = 0; i < n; i++)
- {
- if (String(_dataProvider.getItemAt(i)) == value)
- {
- _selectedIndex = i;
- break;
- }
- }
- dispatchChange("selectionChanged");
- }
+ // public function set selectedString(value:String):void
+ // {
+ // _selectedString = value;
+ // var n:int = _dataProvider.length;
+ // for (var i:int = 0; i < n; i++)
+ // {
+ // if (String(_dataProvider.getItemAt(i)) == value)
+ // {
+ // _selectedIndex = i;
+ // break;
+ // }
+ // }
+ // dispatchChange("selectionChanged");
+ // }
}
}