You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/08/01 21:34:18 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - - Fix failing
Maven build of TLF module by adding CONFIG::debug and CONFIG:release to
defines - Surround assert function by curly brackets in TLF debug package
Repository: flex-asjs
Updated Branches:
refs/heads/develop 498d3113f -> 88c62cb38
- Fix failing Maven build of TLF module by adding CONFIG::debug and CONFIG:release to defines
- Surround assert function by curly brackets in TLF debug package
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b52122d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b52122d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b52122d9
Branch: refs/heads/develop
Commit: b52122d95e925da051ad889e18681b830acbc802
Parents: 8ce67e2
Author: piotrz <pi...@apache.org>
Authored: Tue Aug 1 23:29:05 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Tue Aug 1 23:29:05 2017 +0200
----------------------------------------------------------------------
frameworks/projects/TLF/pom.xml | 10 +++++
.../org/apache/flex/textLayout/debug/assert.as | 43 ++++++++++----------
2 files changed, 32 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml
index 1b7aac0..a052743 100644
--- a/frameworks/projects/TLF/pom.xml
+++ b/frameworks/projects/TLF/pom.xml
@@ -63,6 +63,16 @@
</includeFiles>
<allowSubclassOverrides>true</allowSubclassOverrides>
<skipExtern>true</skipExtern>
+ <defines>
+ <define>
+ <name>CONFIG::debug</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>CONFIG::release</name>
+ <value>true</value>
+ </define>
+ </defines>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
index 62ec778..09b6edf 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
@@ -16,32 +16,33 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.textLayout.debug
+package org.apache.flex.textLayout.debug
{
-
-
-
-
/** @private
* Debug only function that prints a trace message if condition is false.
* @return count of errors reported this assert: 1 or 0.
* */
CONFIG::debug
- public function assert(condition:Boolean, warning:String):int
- {
- if (!condition)
- {
- trace("ERROR: " + warning);
- // throw if the bit is set
- if (Debugging.throwOnAssert)
- throw(new Error("TextLayoutAssert: " + warning));
- return 1;
- }
- return 0;
- }
+ {
+ public function assert(condition:Boolean, warning:String):int
+ {
+ if (!condition)
+ {
+ trace("ERROR: " + warning);
+ // throw if the bit is set
+ if (Debugging.throwOnAssert)
+ throw(new Error("TextLayoutAssert: " + warning));
+ return 1;
+ }
+ return 0;
+ }
+ }
+
/** @private */
- CONFIG::release
- public function assert(condition:Boolean, warning:String):void
- {
- }
+ CONFIG::release
+ {
+ public function assert(condition:Boolean, warning:String):void
+ {
+ }
+ }
} // end package
[2/2] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by pi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88c62cb3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88c62cb3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88c62cb3
Branch: refs/heads/develop
Commit: 88c62cb38372144f7131e1a6219b967778a526d7
Parents: b52122d 498d311
Author: piotrz <pi...@apache.org>
Authored: Tue Aug 1 23:32:16 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Tue Aug 1 23:32:16 2017 +0200
----------------------------------------------------------------------
.../html/supportClasses/OverflowViewport.as | 129 +++++++++++++++++++
.../Basic/src/main/resources/basic-manifest.xml | 4 +-
.../flex/textLayout/compose/TextLineRecycler.as | 2 +-
3 files changed, 133 insertions(+), 2 deletions(-)
----------------------------------------------------------------------