You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2019/01/25 11:58:30 UTC

[royale-asjs] branch develop updated: Take advantage of new abstract classes

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 a660cdc  Take advantage of new abstract classes
a660cdc is described below

commit a660cdcea7ff1379b8f252faab0a35e8f73f83b3
Author: Harbs <ha...@in-tools.com>
AuthorDate: Fri Jan 25 13:58:19 2019 +0200

    Take advantage of new abstract classes
---
 .../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, 9 insertions(+), 35 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 740621a..00bf7a1 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,6 +74,7 @@
         
         <!-- 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 e67de41..ebae21b 100644
--- a/frameworks/projects/Core/asconfig.json
+++ b/frameworks/projects/Core/asconfig.json
@@ -34,6 +34,7 @@
             "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 ecd4c77..c6cbf43 100644
--- a/frameworks/projects/Core/src/main/config/compile-swf-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-swf-config.xml
@@ -78,6 +78,7 @@
         
         <!-- 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 11b1bfd..8a69adb 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,12 +30,8 @@ package org.apache.royale.utils
 	 *  @productversion Royale 1.0.0
 	 *  @productversion Royale 0.0
 	 */
-	public class ObjectUtil
+	public abstract 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 139a4cd..44da4e6 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,15 +37,8 @@ package org.apache.royale.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion Royale 0.0
 	 */
-	public class PointUtils
+	public abstract 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 a508f1c..8b3d2e1 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,15 +28,8 @@ package org.apache.royale.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion Royale 0.0
 	 */
-	public class StringTrimmer
+	public abstract 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 8e7f6dc..7de7daf 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,12 +31,8 @@ package org.apache.royale.utils
 	 *  @productversion Royale 1.0.0
 	 *  @productversion Royale 0.0
 	 */
-	public class StringUtil
+	public abstract 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 da680a9..5b3c0f9 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,15 +33,8 @@ package org.apache.royale.utils
 	 *  @playerversion AIR 2.6
 	 *  @productversion Royale 0.0
 	 */
-	public class UIUtils
+	public abstract 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