This is an automated email from the ASF dual-hosted git repository.
harbs 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 7da0b7c Fixed more coercions
7da0b7c is described below
commit 7da0b7cb22114242a13286186c53e8f59c4561be
Author: Harbs <[email protected]>
AuthorDate: Mon Jul 6 01:18:09 2020 +0300
Fixed more coercions
---
.../org/apache/royale/html/beads/WebBrowserView.as | 10 +++++++
.../html/beads/controllers/ComboBoxController.as | 20 +++++++++++---
.../controllers/DateChooserMouseController.as | 31 ++++++++++++++--------
.../src/main/royale/org/apache/royale/svg/Text.as | 3 +--
.../royale/org/apache/royale/utils/DisplayUtils.as | 4 +--
.../royale/utils/event/hasPlatformModifier.as | 2 ++
.../org/apache/royale/utils/undo/UndoManager.as | 2 ++
7 files changed, 53 insertions(+), 19 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
index e7dbe0d..c54eb5a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
@@ -153,6 +153,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
*/
public function get host():IUIBase
{
@@ -166,6 +167,9 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion HTMLIFrameElement
*/
public function set strand(value:IStrand):void
{
@@ -183,6 +187,9 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.WebBrowserModel
+ * @royaleignorecoercion HTMLIFrameElement
*/
private function loadPage(event:Event):void
{
@@ -194,6 +201,9 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.WebBrowserModel
+ * @royaleignorecoercion HTMLIFrameElement
*/
private function handlePageShow(event:Event):void
{
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ComboBoxController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ComboBoxController.as
index 3130e16..141ff67 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ComboBoxController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ComboBoxController.as
@@ -40,6 +40,11 @@ package org.apache.royale.html.beads.controllers
protected var viewBead:IComboBoxView;
+ /**
+ * @royaleignorecoercion
org.apache.royale.html.beads.IComboBoxView
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ *
+ */
public function set strand(value:IStrand):void
{
_strand = value;
@@ -48,24 +53,31 @@ package org.apache.royale.html.beads.controllers
if (viewBead) {
finishSetup(null);
} else {
-
IEventDispatcher(_strand).addEventListener("viewChanged", finishSetup);
+ (_strand as
IEventDispatcher).addEventListener("viewChanged", finishSetup);
}
}
+ /**
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion
org.apache.royale.html.beads.IComboBoxView
+ */
protected function finishSetup(event:Event):void
{
if (viewBead == null) {
viewBead = _strand.getBeadByType(IComboBoxView)
as IComboBoxView;
}
-
IEventDispatcher(viewBead.popupButton).addEventListener("click",
handleButtonClick);
-
IEventDispatcher(viewBead.textInputField).addEventListener("click",
handleButtonClick);
+ (viewBead.popupButton as
IEventDispatcher).addEventListener("click", handleButtonClick);
+ (viewBead.textInputField as
IEventDispatcher).addEventListener("click", handleButtonClick);
}
+ /**
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ */
protected function handleButtonClick(event:MouseEvent):void
{
viewBead.popUpVisible = !viewBead.popUpVisible;
-
IEventDispatcher(viewBead.popUp).addEventListener("change", handleListChange);
+ (viewBead.popUp as
IEventDispatcher).addEventListener("change", handleListChange);
}
private function handleListChange(event:Event):void
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DateChooserMouseController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DateChooserMouseController.as
index ccf3cbc..b016f47 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DateChooserMouseController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DateChooserMouseController.as
@@ -21,7 +21,7 @@ package org.apache.royale.html.beads.controllers
import org.apache.royale.html.beads.DateChooserView;
import org.apache.royale.html.beads.models.DateChooserModel;
import org.apache.royale.html.supportClasses.DateChooserButton;
- import org.apache.royale.html.supportClasses.DateChooserList;
+ import org.apache.royale.html.supportClasses.DateChooserList;
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.IBeadModel;
@@ -64,31 +64,39 @@ package org.apache.royale.html.beads.controllers
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion
org.apache.royale.html.beads.DateChooserView
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
*/
public function set strand(value:IStrand):void
{
_strand = value;
- var view:DateChooserView = value.getBeadByType(IBeadView) as
DateChooserView;
+ var view:DateChooserView =
value.getBeadByType(IBeadView) as DateChooserView;
view.prevMonthButton.addEventListener("click",
prevMonthClickHandler);
view.nextMonthButton.addEventListener("click",
nextMonthClickHandler);
- IEventDispatcher(view.dayList).addEventListener("change",
listHandler);
+ (view.dayList as
IEventDispatcher).addEventListener("change", listHandler);
}
- private function listHandler(event:Event):void
- {
- var list:DateChooserList = event.target as DateChooserList;
- var model:DateChooserModel = _strand.getBeadByType(IBeadModel) as
DateChooserModel;
- model.selectedDate = list.selectedItem as Date;
- }
+ /**
+ * @royaleignorecoercion
org.apache.royale.html.supportClasses.DateChooserList
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.DateChooserModel
+ * @royaleignorecoercion Date
+ */
+ private function listHandler(event:Event):void
+ {
+ var list:DateChooserList = event.target as
DateChooserList;
+ var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
+ model.selectedDate = list.selectedItem as Date;
+ }
/**
* @private
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.DateChooserModel
*/
private function prevMonthClickHandler(event:MouseEvent):void
{
- event.preventDefault();
+ event.preventDefault();
var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
var month:Number = model.displayedMonth - 1;
@@ -103,10 +111,11 @@ package org.apache.royale.html.beads.controllers
/**
* @private
+ * @royaleignorecoercion
org.apache.royale.html.beads.models.DateChooserModel
*/
private function nextMonthClickHandler(event:MouseEvent):void
{
- event.preventDefault();
+ event.preventDefault();
var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
var month:Number = model.displayedMonth + 1;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/Text.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/Text.as
index 4722c95..727b22b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/Text.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/svg/Text.as
@@ -107,7 +107,6 @@ package org.apache.royale.svg
* @playerversion AIR 2.6
* @productversion Royale 0.0
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
- * @royaleignorecoercion Text
* @royaleignorecoercion Node
* @royaleignorecoercion SVGLocatable
*/
@@ -144,7 +143,7 @@ package org.apache.royale.svg
_textElem.setAttribute('style', style);
_textElem.setAttribute('x', xt);
_textElem.setAttribute('y', yt);
- var textNode:Text =
document.createTextNode(value) as Text;
+ var textNode:Node =
document.createTextNode(value) as Node;
_textElem.appendChild(textNode as Node);
// resize(x, y, getBBox(_textElem));
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/DisplayUtils.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/DisplayUtils.as
index 5b46d7b..5e85db1 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/DisplayUtils.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/DisplayUtils.as
@@ -105,7 +105,7 @@ package org.apache.royale.utils
* @playerversion AIR 2.6
* @productversion Royale 0.0
* @royaleignorecoercion HTMLElement
- * @royaleignorecoercion ITransformHost
+ * @royaleignorecoercion org.apache.royale.core.ITransformHost
*/
public static function
getTransormMatrix(obj:IUIBase):org.apache.royale.geom.Matrix
{
@@ -117,7 +117,7 @@ package org.apache.royale.utils
COMPILE::JS
{
// currently only works for SVG elements
- var svgElement:Object = (obj as
ITransformHost).transformElement as Object;
+ var svgElement:Object = (obj as
ITransformHost).transformElement;
var sm:SVGMatrix = svgElement.getScreenCTM();
return new
org.apache.royale.geom.Matrix(sm.a,sm.b,sm.c,sm.d,sm.e,sm.f);
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/event/hasPlatformModifier.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/event/hasPlatformModifier.as
index 304496b..adfce10 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/event/hasPlatformModifier.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/event/hasPlatformModifier.as
@@ -23,6 +23,8 @@ package org.apache.royale.utils.event
import org.apache.royale.utils.OSUtils;
/**
* @royalesuppressexport
+ * @royaleignorecoercion org.apache.royale.events.MouseEvent
+ * @royaleignorecoercion org.apache.royale.events.KeyboardEvent
*/
COMPILE::JS
public function hasPlatformModifier(event:*):Boolean{
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/undo/UndoManager.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/undo/UndoManager.as
index 1ae53d2..4ac2ac1 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/undo/UndoManager.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/undo/UndoManager.as
@@ -106,6 +106,7 @@ package org.apache.royale.utils.undo
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion org.apache.royale.utils.undo.IOperation
*/
public function popUndo():IOperation
{
@@ -167,6 +168,7 @@ package org.apache.royale.utils.undo
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion org.apache.royale.utils.undo.IOperation
*/
public function popRedo():IOperation
{
