svn commit: r1097280 - in /shindig/trunk/java/gadgets/src: main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java

[mhermanto]

Author: mhermanto
Date: Wed Apr 27 23:18:18 2011
New Revision: 1097280

URL: http://svn.apache.org/viewvc?rev=1097280&view=rev
Log:
Allow request-based overrides for closure compiler options.
http://codereview.appspot.com/4426068/

Modified:
    
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
    
shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1097280&r1=1097279&r2=1097280&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
 Wed Apr 27 23:18:18 2011
@@ -30,6 +30,7 @@ import com.google.javascript.jscomp.Comp
 import com.google.javascript.jscomp.CompilerOptions;
 import com.google.javascript.jscomp.JSError;
 import com.google.javascript.jscomp.JSSourceFile;
+import com.google.javascript.jscomp.PropertyRenamingPolicy;
 import com.google.javascript.jscomp.Result;
 import com.google.javascript.jscomp.SourceMap;
 
@@ -85,7 +86,7 @@ public class ClosureJsCompiler implement
     return result;
   }
   
-  protected CompilerOptions getCompilerOptions() {
+  protected CompilerOptions getCompilerOptions(JsUri uri) {
     CompilerOptions options = defaultCompilerOptions();
 
     if (outputCorrelatedJs()) {
@@ -127,7 +128,8 @@ public class ClosureJsCompiler implement
     JsResponseBuilder builder = new JsResponseBuilder();
     
     // Only run actual compiler if necessary.
-    CompilerOptions options = getCompilerOptions();
+    CompilerOptions options = getCompilerOptions(jsUri);
+    
     if (!jsUri.isDebug() || options.isExternExportsEnabled()) {
       List<JSSourceFile> allExterns = Lists.newArrayList();
       allExterns.add(JSSourceFile.fromCode("externs", externs));
@@ -241,7 +243,7 @@ public class ClosureJsCompiler implement
     };
     List<JsContent> builder = 
Lists.newLinkedList(defaultCompiler.getJsContent(jsUri, bundle));
 
-    CompilerOptions options = getCompilerOptions();
+    CompilerOptions options = getCompilerOptions(jsUri);
     if (options.isExternExportsEnabled()) {
       List<String> exports = 
Lists.newArrayList(bundle.getApis(ApiDirective.Type.JS, true));
       Collections.sort(exports);

Modified: 
shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java?rev=1097280&r1=1097279&r2=1097280&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompilerTest.java
 Wed Apr 27 23:18:18 2011
@@ -156,7 +156,7 @@ public class ClosureJsCompilerTest exten
       }
       
       @Override
-      protected CompilerOptions getCompilerOptions() {
+      protected CompilerOptions getCompilerOptions(JsUri uri) {
         return realOptionsMock;
       }
     };