You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2023/01/05 13:06:17 UTC

[royale-asjs] branch develop updated: Rename BindingManager to avoid compiler confusion.

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

yishayw 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 e27215df5a Rename BindingManager to avoid compiler confusion.
e27215df5a is described below

commit e27215df5afd2ac93656f9708490682ec58691d6
Author: Yishay Weiss <yi...@hotmail.com>
AuthorDate: Thu Jan 5 14:59:32 2023 +0200

    Rename BindingManager to avoid compiler confusion.
    
    It looks like compiler is interpreting the existence of this class in
    its original name as a sign that it is compiling the Flex SDK, which
    triggers incompatible code generation.
---
 .../projects/MXRoyale/src/main/royale/mx/core/UIComponent.as |  4 ++--
 .../MXRoyaleBase/src/main/royale/MXRoyaleBaseClasses.as      |  2 +-
 .../MXRoyaleBase/src/main/royale/mx/binding/Binding.as       | 12 ++++++------
 .../mx/binding/{BindingManager.as => BindingManager2.as}     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 744d716bd9..367f12e33f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -114,7 +114,7 @@ import mx.styles.CSSStyleDeclaration;
 
 import org.apache.royale.utils.ClassSelectorList;
 import mx.display.NativeMenu;
-import mx.binding.BindingManager;
+import mx.binding.BindingManager2;
 import mx.managers.CursorManager;
 
 /**
@@ -961,7 +961,7 @@ public class UIComponent extends UIBase
     public function executeBindings(recurse:Boolean = false):void
     {
 	   var bindingsHost:Object = descriptor && descriptor.document ? descriptor.document : parentMxmlDocument;
-       BindingManager.executeBindings(bindingsHost, id, this);
+       BindingManager2.executeBindings(bindingsHost, id, this);
 	   //recurse = false;
 	   //trace("UIComponent.executeBindings is not implemented");
 	   
diff --git a/frameworks/projects/MXRoyaleBase/src/main/royale/MXRoyaleBaseClasses.as b/frameworks/projects/MXRoyaleBase/src/main/royale/MXRoyaleBaseClasses.as
index 0a82b005b1..67a1bcf7f2 100644
--- a/frameworks/projects/MXRoyaleBase/src/main/royale/MXRoyaleBaseClasses.as
+++ b/frameworks/projects/MXRoyaleBase/src/main/royale/MXRoyaleBaseClasses.as
@@ -31,7 +31,7 @@ internal class MXRoyaleBaseClasses
 
 	import mx.binding.BindabilityInfo; BindabilityInfo;
 	import mx.binding.Binding; Binding;
-	import mx.binding.BindingManager; BindingManager;
+	import mx.binding.BindingManager2; BindingManager2;
 	import mx.binding.IBindingClient; IBindingClient;
 	import mx.binding.utils.ChangeWatcher; ChangeWatcher;
 	import mx.binding.utils.BindingUtils; BindingUtils;
diff --git a/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/Binding.as b/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/Binding.as
index 3c7c94b6ee..21162280db 100644
--- a/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/Binding.as
+++ b/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/Binding.as
@@ -101,7 +101,7 @@ public class Binding
         hasHadValue = false;
         uiComponentWatcher = -1;
 
-        BindingManager.addBinding(document, destString, this);
+        BindingManager2.addBinding(document, destString, this);
     }
 
  	//--------------------------------------------------------------------------
@@ -295,7 +295,7 @@ public class Binding
             //if the element does not exist : avoid exception as it's heavy on memory allocations
             if (element == null) {
                 destFuncFailed = true;
-                if (BindingManager.debugDestinationStrings[destString])
+                if (BindingManager2.debugDestinationStrings[destString])
                 {
                     trace("Binding: destString = " + destString + ", error = 1009");
                 }
@@ -429,12 +429,12 @@ public class Binding
         {
 			if (error is ItemPendingError) {
 	            //(error as ItemPendingError).addResponder(new EvalBindingResponder(this, object));
-	            if (BindingManager.debugDestinationStrings[destString])
+	            if (BindingManager2.debugDestinationStrings[destString])
 	            {
 	                trace("Binding: destString = " + destString + ", error = " + error);
 	            }
 			} else if (error is RangeError) {
-	            if (BindingManager.debugDestinationStrings[destString])
+	            if (BindingManager2.debugDestinationStrings[destString])
 	            {
 	                trace("Binding: destString = " + destString + ", error = " + error);
 	            }
@@ -461,7 +461,7 @@ public class Binding
 				}
 	            else
 	            {
-	                if (BindingManager.debugDestinationStrings[destString])
+	                if (BindingManager2.debugDestinationStrings[destString])
 	                {
 	                    trace("Binding: destString = " + destString + ", error = " + error);
 	                }
@@ -500,7 +500,7 @@ public class Binding
         destFuncFailed = false;
         var value:Object = wrapFunctionCall(document, srcFunc);
 
-        if (BindingManager.debugDestinationStrings[destString])
+        if (BindingManager2.debugDestinationStrings[destString])
         {
             trace("Binding: destString = " + destString + ", srcFunc result = " + value);
         }
diff --git a/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager.as b/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager2.as
similarity index 99%
rename from frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager.as
rename to frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager2.as
index cb0fda939f..0c255721ed 100644
--- a/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager.as
+++ b/frameworks/projects/MXRoyaleBase/src/main/royale/mx/binding/BindingManager2.as
@@ -29,7 +29,7 @@ use namespace mx_internal;
 /**
  *  @private
  */
-public class BindingManager
+public class BindingManager2
 {
     //include "../core/Version.as";
 
@@ -266,7 +266,7 @@ public class BindingManager
 	 *  BindingManager has only static methods.
 	 *  We don't create instances of BindingManager.
 	 */
-	public function BindingManager()
+	public function BindingManager2()
 	{
 		super();
 	}