flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [6/9] git commit: [flex-falcon] [refs/heads/develop] - Revert "guarantee that target-player gets processed before library-path otherwise wrong player gets checked"
Date Wed, 16 Apr 2014 13:28:02 GMT
Revert "guarantee that target-player gets processed before library-path otherwise wrong player
gets checked"

This reverts commit b5a06269f51aa1843cc6da79dd3a6eb0f4848345.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/aecf7b86
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/aecf7b86
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/aecf7b86

Branch: refs/heads/develop
Commit: aecf7b86eb2d37cc14dc9fcc879d56270dbc4a42
Parents: 8a356a8
Author: Alex Harui <aharui@apache.org>
Authored: Tue Apr 15 11:24:33 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Apr 15 20:13:24 2014 -0700

----------------------------------------------------------------------
 .../compiler/config/ConfigurationBuffer.java    | 23 --------------------
 1 file changed, 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aecf7b86/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
index f76bf17..b6484fd 100644
--- a/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
+++ b/compiler/src/org/apache/flex/compiler/config/ConfigurationBuffer.java
@@ -102,8 +102,6 @@ import com.google.common.collect.ImmutableList;
  */
 public final class ConfigurationBuffer
 {
-    private static final String TARGET_PLAYER = "target-player";
-    
     public ConfigurationBuffer(Class<? extends Configuration> configClass)
     {
         this(configClass, new HashMap<String, String>());
@@ -716,27 +714,6 @@ public final class ConfigurationBuffer
         Set<String> done = new HashSet<String>();
         boolean success = true;
         
-        // get target-player first because its setting affect expansion of some
-        // tokens later.  The varList is populated by getMethods() which returns
-        // the methods in random order and can result in compiler.library-path being
-        // evaluated before target-player and then we end up looking up the wrong
-        // version of playerglobal.
-        if (varList.contains(TARGET_PLAYER))
-        {
-            varList.remove(TARGET_PLAYER);
-            if (varMap.containsKey(TARGET_PLAYER))
-            {
-                try
-                {
-                    commitVariable(config, TARGET_PLAYER, done);
-                }
-                catch (ConfigurationException e)
-                {
-                    problems.add(new ConfigurationProblem(e));
-                    success = false;
-                }
-            }            
-        }
         for (Iterator<String> vars = varList.iterator(); vars.hasNext();)
         {
             String var = vars.next();


Mime
View raw message