You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/06/26 15:45:04 UTC
[24/50] git commit: [flex-falcon] [refs/heads/master] - revert
appending library-path to js-library-path and swc-library-path
revert appending library-path to js-library-path and swc-library-path
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d210ac57
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d210ac57
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d210ac57
Branch: refs/heads/master
Commit: d210ac57c1a2d3bd8f87c664d8453fdc702c623c
Parents: 55ca0b2
Author: Alex Harui <ah...@apache.org>
Authored: Mon May 15 15:12:46 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon May 15 15:12:46 2017 -0700
----------------------------------------------------------------------
.../flex/compiler/internal/projects/FlexJSProject.java | 10 ++++++----
.../flex/compiler/internal/projects/FlexProject.java | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d210ac57/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index a726d38..8dc88b0 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -392,8 +392,9 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsExternalLibraryPath();
- list.addAll(config.getCompilerExternalLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerExternalLibraryPath();
}
/**
@@ -402,8 +403,9 @@ public class FlexJSProject extends FlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = ((JSConfiguration)config).getCompilerJsLibraryPath();
- list.addAll(config.getCompilerLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerLibraryPath();
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d210ac57/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
index b01eed5..6a8ffd9 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java
@@ -2340,8 +2340,9 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerExternalLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfExternalLibraryPath();
- list.addAll(config.getCompilerExternalLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerExternalLibraryPath();
}
/**
@@ -2350,8 +2351,9 @@ public class FlexProject extends ASProject implements IFlexProject
public List<String> getCompilerLibraryPath(Configuration config)
{
List<String> list = config.getCompilerSwfLibraryPath();
- list.addAll(config.getCompilerLibraryPath());
- return list;
+ if (list != null && list.size() > 0)
+ return list;
+ return config.getCompilerLibraryPath();
}
/**