[royale-asjs] branch develop updated: Fix VerifyError: Error #1053 in Flash Debug Player due to wrong IDataInput / IDataOutput used in mx.messaging.messages.* classes, and due to mismatch of IFactory type between spark.components.DataGroup and IItemRendererProvider.

[ha...@apache.org]

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 6127592  Fix VerifyError: Error #1053 in Flash Debug Player due to wrong IDataInput / IDataOutput used in mx.messaging.messages.* classes, and due to mismatch of IFactory type between spark.components.DataGroup and IItemRendererProvider.
     new 53a07e3  Merge pull request #960 from estanglerbm/verifyerror-wrongfuncsig
6127592 is described below

commit 612759260f078c117c801fc38cfa9007821e3394
Author: Edward Stangler <es...@bradmark.com>
AuthorDate: Sun Nov 29 06:24:07 2020 -0600

    Fix VerifyError: Error #1053 in Flash Debug Player due to wrong IDataInput / IDataOutput used in mx.messaging.messages.* classes, and due to mismatch of IFactory type between spark.components.DataGroup and IItemRendererProvider.
---
 .../src/main/royale/mx/messaging/messages/AbstractMessage.as | 12 ++++++++++--
 .../main/royale/mx/messaging/messages/AcknowledgeMessage.as  | 10 ++++++++--
 .../royale/mx/messaging/messages/AcknowledgeMessageExt.as    |  7 ++++++-
 .../src/main/royale/mx/messaging/messages/AsyncMessage.as    | 11 +++++++++--
 .../src/main/royale/mx/messaging/messages/AsyncMessageExt.as |  7 ++++++-
 .../src/main/royale/mx/messaging/messages/CommandMessage.as  | 10 ++++++++--
 .../main/royale/mx/messaging/messages/CommandMessageExt.as   |  7 ++++++-
 .../src/main/royale/spark/components/DataGroup.as            |  2 ++
 8 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AbstractMessage.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AbstractMessage.as
index cb74cae..888d88f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AbstractMessage.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AbstractMessage.as
@@ -21,8 +21,16 @@ package mx.messaging.messages
 {
 
 import org.apache.royale.utils.BinaryData;
-import org.apache.royale.utils.net.IDataInput;
-import org.apache.royale.utils.net.IDataOutput;
+
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataInput;
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataInput;
+	import flash.utils.IDataOutput;
+}
+
 import org.apache.royale.reflection.getQualifiedClassName;
 
 import mx.core.mx_internal;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessage.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessage.as
index 21891c0..dc74b28 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessage.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessage.as
@@ -20,8 +20,14 @@
 package mx.messaging.messages
 {
 
-import org.apache.royale.utils.net.IDataInput;
-import org.apache.royale.utils.net.IDataOutput;
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataInput;
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataInput;
+	import flash.utils.IDataOutput;
+}
 
 [RemoteClass(alias="flex.messaging.messages.AcknowledgeMessage")]
 
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessageExt.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessageExt.as
index ce904b3..a250457 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessageExt.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AcknowledgeMessageExt.as
@@ -20,7 +20,12 @@
 package mx.messaging.messages
 {
 
-import org.apache.royale.utils.net.IDataOutput;
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataOutput;
+}
 import org.apache.royale.utils.net.IExternalizable;
 
 [RemoteClass(alias="DSK")]
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessage.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessage.as
index dc06749..a749230 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessage.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessage.as
@@ -21,8 +21,15 @@ package mx.messaging.messages
 {
 
 import org.apache.royale.utils.BinaryData;
-import org.apache.royale.utils.net.IDataInput;
-import org.apache.royale.utils.net.IDataOutput;
+
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataInput;
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataInput;
+	import flash.utils.IDataOutput;
+}
 
 import mx.utils.RPCUIDUtil;
 
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessageExt.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessageExt.as
index d99c010..5954ff2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessageExt.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/AsyncMessageExt.as
@@ -20,7 +20,12 @@
 package mx.messaging.messages
 {
 
-import org.apache.royale.utils.net.IDataOutput;
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataOutput;
+}
 import org.apache.royale.utils.net.IExternalizable;
 
 [RemoteClass(alias="DSA")]
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessage.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessage.as
index bb34f03..f13197b 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessage.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessage.as
@@ -20,8 +20,14 @@
 package mx.messaging.messages
 {
 
-import org.apache.royale.utils.net.IDataInput;
-import org.apache.royale.utils.net.IDataOutput;
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataInput;
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataInput;
+	import flash.utils.IDataOutput;
+}
 import org.apache.royale.utils.net.IExternalizable;
 
 [RemoteClass(alias="flex.messaging.messages.CommandMessage")]
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessageExt.as b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessageExt.as
index 1251e2d..eba2f17 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessageExt.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/messaging/messages/CommandMessageExt.as
@@ -20,7 +20,12 @@
 package mx.messaging.messages
 {
 
-import org.apache.royale.utils.net.IDataOutput;
+COMPILE::JS {
+	import org.apache.royale.utils.net.IDataOutput;
+}
+COMPILE::SWF{
+	import flash.utils.IDataOutput;
+}
 import org.apache.royale.utils.net.IExternalizable;
 
 [RemoteClass(alias="DSC")]
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
index d82486f..bc8cb2a 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataGroup.as
@@ -504,6 +504,7 @@ public class DataGroup extends GroupBase implements IItemRendererProvider, IStra
      *  @playerversion AIR 1.5
      *  @productversion Flex 4
      */
+    [SWFOverride(returns="org.apache.royale.core.IFactory")]
     public function get itemRenderer():IFactory
     {
         return _itemRenderer;
@@ -512,6 +513,7 @@ public class DataGroup extends GroupBase implements IItemRendererProvider, IStra
     /**
      *  @private
      */
+    [SWFOverride(params="org.apache.royale.core.IFactory", altparams="mx.core.IFactory")]
     public function set itemRenderer(value:IFactory):void
     {
         _itemRenderer = value;