svn commit: r1202888 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java

[lixu]

Author: lixu
Date: Wed Nov 16 21:18:07 2011
New Revision: 1202888

URL: http://svn.apache.org/viewvc?rev=1202888&view=rev
Log:
SHINDIG-1661 | Update ordering of javascript feature loading 

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=1202888&r1=1202887&r2=1202888&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 Wed Nov 16 21:18:07 2011
@@ -126,8 +126,8 @@ public class DefaultGuiceModule extends 
   protected List<String> 
defaultFeatures(@Named("shindig.features.default")String features,
                                          
@Named("org.apache.shindig.features-extended")Set<String> extended) {
     return ImmutableList.<String>builder()
-        .addAll(extended)
         .addAll(Splitter.on(',').split(features))
+        .addAll(extended)
         .build();
   }