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

[jo...@apache.org]

Author: johnh
Date: Tue Mar 29 00:29:31 2011
New Revision: 1086451

URL: http://svn.apache.org/viewvc?rev=1086451&view=rev
Log:
Added comment to getUniqueSrc() in ClosureJsCompiler; convenience getter for ClosureJsCompiler's Result object; spacing fix.


Modified:
    shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.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=1086451&r1=1086450&r2=1086451&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 Tue Mar 29 00:29:31 2011
@@ -213,6 +213,10 @@ public class ClosureJsCompiler implement
     return sources;
   }
   
+  // Return a unique string to represent the inbound "source" parameter.
+  // Closure Compiler errors out when two JSSourceFiles with the same name are
+  // provided, so this method tracks the currently-used source names (in the
+  // provided sourceMap) and ensures that a unique name is returned.
   private static String getUniqueSrc(String source, Map<String, Integer> sourceMap) {
     Integer ix = sourceMap.get(source);
     if (ix == null) {
@@ -281,6 +285,10 @@ public class ClosureJsCompiler implement
     public String getExterns() {
       return externs;
     }
+
+    public JsResponse getResponse() {
+      return response;
+    }
   }
   
   /**

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java?rev=1086451&r1=1086450&r2=1086451&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java Tue Mar 29 00:29:31 2011
@@ -77,7 +77,7 @@ public class JsServletTest extends Servl
     JsProcessorRegistry jsProcessorRegistry =
         new DefaultJsProcessorRegistry(
             ImmutableList.<JsProcessor>of(jsLoadProcessor, new IfModifiedSinceProcessor(),
-               getJsProcessorMock, new AddOnloadFunctionProcessor()));
+                 getJsProcessorMock, new AddOnloadFunctionProcessor()));
 
     jsServingPipeline = new DefaultJsServingPipeline(jsProcessorRegistry);
     servlet.setJsServingPipeline(jsServingPipeline);