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 7741201 Better organization of functional
7741201 is described below
commit 77412010ad73bd1345403280f719a0ec9c5bc7e3
Author: Harbs <[email protected]>
AuthorDate: Fri Jan 7 13:58:25 2022 +0200
Better organization of functional
---
frameworks/projects/Core/src/main/royale/CoreClasses.as | 10 +++++-----
.../org/apache/royale/{utils => }/functional/Animated.as | 2 +-
.../functional => functional/decorator}/animateFunction.as | 4 +++-
.../{utils/functional => functional/decorator}/debounceLong.as | 2 +-
.../functional => functional/decorator}/debounceShort.as | 2 +-
.../functional => functional/decorator}/delayFunction.as | 2 +-
.../{utils/functional => functional/decorator}/throttle.as | 2 +-
.../Core/src/main/royale/org/apache/royale/utils/JXON.as | 6 +++---
.../Core/src/test/royale/flexUnitTests/FunctionalTests.as | 4 ++--
9 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index e3da6a1..b506982 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -379,11 +379,11 @@ internal class CoreClasses
import org.apache.royale.utils.replaceBead; replaceBead;
- import org.apache.royale.utils.functional.debounceLong; debounceLong;
- import org.apache.royale.utils.functional.debounceShort; debounceShort;
- import org.apache.royale.utils.functional.throttle; throttle;
- import org.apache.royale.utils.functional.animateFunction;
animateFunction;
- import org.apache.royale.utils.functional.delayFunction; delayFunction;
+ import org.apache.royale.functional.decorator.debounceLong;
debounceLong;
+ import org.apache.royale.functional.decorator.debounceShort;
debounceShort;
+ import org.apache.royale.functional.decorator.throttle; throttle;
+ import org.apache.royale.functional.decorator.animateFunction;
animateFunction;
+ import org.apache.royale.functional.decorator.delayFunction;
delayFunction;
import org.apache.royale.core.TextLineMetrics; TextLineMetrics;
import org.apache.royale.utils.ClassSelectorList; ClassSelectorList;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/Animated.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/Animated.as
similarity index 99%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/Animated.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/Animated.as
index a5ed1f8..5fac97e 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/Animated.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/Animated.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional
{
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/animateFunction.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/animateFunction.as
similarity index 94%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/animateFunction.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/animateFunction.as
index 190eb3e..41dcc6d 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/animateFunction.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/animateFunction.as
@@ -16,12 +16,14 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional.decorator
{
COMPILE::SWF{
import flash.utils.setTimeout;
import flash.utils.clearTimeout;
}
+ import org.apache.royale.functional.Animated;
+
/**
* Returns a debounced function to run after a delay.
* The first invocation of the function will be run after its delay.
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceLong.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceLong.as
similarity index 97%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceLong.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceLong.as
index b119709..3f3bd44 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceLong.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceLong.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional.decorator
{
COMPILE::SWF{
import flash.utils.setTimeout;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceShort.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceShort.as
similarity index 97%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceShort.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceShort.as
index ff480b5..8b15ef8 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/debounceShort.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/debounceShort.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional.decorator
{
COMPILE::SWF{
import flash.utils.setTimeout;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/delayFunction.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/delayFunction.as
similarity index 97%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/delayFunction.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/delayFunction.as
index 44367f1..39983be 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/delayFunction.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/delayFunction.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional.decorator
{
COMPILE::SWF{
import flash.utils.setTimeout;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/throttle.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/throttle.as
similarity index 97%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/throttle.as
rename to
frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/throttle.as
index 01cfda0..35a5c8f 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/functional/throttle.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/functional/decorator/throttle.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.utils.functional
+package org.apache.royale.functional.decorator
{
COMPILE::SWF{
import flash.utils.setTimeout;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/JXON.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/JXON.as
index 3d097a6..52b0ff5 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/JXON.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/JXON.as
@@ -19,14 +19,14 @@
package org.apache.royale.utils
{
/**
+ * @royalesuppresspublicvarwarning
+ *
* JXON is a lightweight class for parsing and using simple XML.
* It gives access to children in the XML tree as an array of
`children`.
* Attributes are an object `attribute` with the attribute key/value
pairs.
* Namespaces are completely ignored.
* If you need more functionality such as E4X and advanced filtering,
use the XML and XMLList classes instead.
* To parse XML, use JXON.parse(xmlStr) where xmlStr is a string of
your XML.
- *
- * @royalesuppresspublicvarwarning
*/
public class JXON
{
@@ -37,7 +37,7 @@ package org.apache.royale.utils
/**
* Static flag to ignore whitespace text nodes
*/
- public static var ignoreWhiteSpace:Boolean = true;
+ public static var ignoreWhiteSpace:Boolean = true;
/**
* The tag name of the element
diff --git
a/frameworks/projects/Core/src/test/royale/flexUnitTests/FunctionalTests.as
b/frameworks/projects/Core/src/test/royale/flexUnitTests/FunctionalTests.as
index fc68806..5bf52cf 100644
--- a/frameworks/projects/Core/src/test/royale/flexUnitTests/FunctionalTests.as
+++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/FunctionalTests.as
@@ -24,8 +24,8 @@ package flexUnitTests
import org.apache.royale.test.asserts.*;
import org.apache.royale.test.async.*;
- import org.apache.royale.utils.functional.*;
- import org.apache.royale.utils.functional.animateFunction;
+ import org.apache.royale.functional.*;
+ import org.apache.royale.functional.decorator.*;
import org.apache.royale.test.asserts.assertTrue;
import org.apache.royale.test.asserts.assertEquals;
