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 359778e Revert "Take advantage of new abstract classes"
359778e is described below
commit 359778e921817c82233445de30b1d16bc84fef61
Author: Harbs <[email protected]>
AuthorDate: Sat Jan 26 18:42:48 2019 +0200
Revert "Take advantage of new abstract classes"
This reverts commit a660cdcea7ff1379b8f252faab0a35e8f73f83b3.
---
.../js/projects/CoreJS/src/main/config/compile-js-config.xml | 1 -
frameworks/projects/Core/asconfig.json | 3 +--
frameworks/projects/Core/src/main/config/compile-swf-config.xml | 1 -
.../Core/src/main/royale/org/apache/royale/utils/ObjectUtil.as | 6 +++++-
.../Core/src/main/royale/org/apache/royale/utils/PointUtils.as | 9 ++++++++-
.../src/main/royale/org/apache/royale/utils/StringTrimmer.as | 9 ++++++++-
.../Core/src/main/royale/org/apache/royale/utils/StringUtil.as | 6 +++++-
.../Core/src/main/royale/org/apache/royale/utils/UIUtils.as | 9 ++++++++-
8 files changed, 35 insertions(+), 9 deletions(-)
diff --git
a/frameworks/js/projects/CoreJS/src/main/config/compile-js-config.xml
b/frameworks/js/projects/CoreJS/src/main/config/compile-js-config.xml
index 00bf7a1..740621a 100644
--- a/frameworks/js/projects/CoreJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/CoreJS/src/main/config/compile-js-config.xml
@@ -74,7 +74,6 @@
<!-- Use of the instanceof operator. -->
<warn-instance-of-changes>false</warn-instance-of-changes>
- <allow-abstract-classes>true</allow-abstract-classes>
</compiler>
<include-file>
diff --git a/frameworks/projects/Core/asconfig.json
b/frameworks/projects/Core/asconfig.json
index ebae21b..e67de41 100644
--- a/frameworks/projects/Core/asconfig.json
+++ b/frameworks/projects/Core/asconfig.json
@@ -34,7 +34,6 @@
"src/test/royale/flexUnitTests"
],
"output": "target/Core.swc"
- },
- "additionalOptions": "-allow-abstract-classes"
+ }
}
diff --git a/frameworks/projects/Core/src/main/config/compile-swf-config.xml
b/frameworks/projects/Core/src/main/config/compile-swf-config.xml
index c6cbf43..ecd4c77 100644
--- a/frameworks/projects/Core/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-swf-config.xml
@@ -78,7 +78,6 @@
<!-- Use of the instanceof operator. -->
<warn-instance-of-changes>false</warn-instance-of-changes>
- <allow-abstract-classes>true</allow-abstract-classes>
</compiler>
<include-classes>
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/ObjectUtil.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/ObjectUtil.as
index 8a69adb..11b1bfd 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/ObjectUtil.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/ObjectUtil.as
@@ -30,8 +30,12 @@ package org.apache.royale.utils
* @productversion Royale 1.0.0
* @productversion Royale 0.0
*/
- public abstract class ObjectUtil
+ public class ObjectUtil
{
+ public function ObjectUtil()
+ {
+ throw new Error("ObjectUtil should not be
instantiated.");
+ }
/**
* Count the properties in an object.
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PointUtils.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PointUtils.as
index 44da4e6..139a4cd 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PointUtils.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PointUtils.as
@@ -37,8 +37,15 @@ package org.apache.royale.utils
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public abstract class PointUtils
+ public class PointUtils
{
+ /**
+ * @private
+ */
+ public function PointUtils()
+ {
+ throw new Error("PointUtils should not be
instantiated.");
+ }
/**
* Converts a point from global coordinates to local
coordinates
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringTrimmer.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringTrimmer.as
index 8b3d2e1..a508f1c 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringTrimmer.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringTrimmer.as
@@ -28,8 +28,15 @@ package org.apache.royale.utils
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public abstract class StringTrimmer
+ public class StringTrimmer
{
+ /**
+ * @private
+ */
+ public function StringTrimmer()
+ {
+ throw new Error("StringTrimmer should not be
instantiated.");
+ }
/**
* Removes all whitespace characters from the beginning and end
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringUtil.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringUtil.as
index 7de7daf..8e7f6dc 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringUtil.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/StringUtil.as
@@ -31,8 +31,12 @@ package org.apache.royale.utils
* @productversion Royale 1.0.0
* @productversion Royale 0.0
*/
- public abstract class StringUtil
+ public class StringUtil
{
+ public function StringUtil()
+ {
+ throw new Error("StringUtil should not be
instantiated.");
+ }
/**
* Substitutes "{n}" tokens within the specified string
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/UIUtils.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/UIUtils.as
index 5b3c0f9..da680a9 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/UIUtils.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/UIUtils.as
@@ -33,8 +33,15 @@ package org.apache.royale.utils
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public abstract class UIUtils
+ public class UIUtils
{
+ /**
+ * @private
+ */
+ public function UIUtils()
+ {
+ throw new Error("UIUtils should not be instantiated.");
+ }
/**
* Centers the given item relative to another item. Typically
the item being centered is
