When an error is thrown, press will now output the original source js…

…/css file instead of trying to output the compressed version (which would fail)

app/press/Plugin.java

@@ -7,6 +7,7 @@
 public class Plugin extends PlayPlugin {
     static ThreadLocal<JSCompressor> jsCompressor = new ThreadLocal<JSCompressor>();
     static ThreadLocal<CSSCompressor> cssCompressor = new ThreadLocal<CSSCompressor>();
+    static ThreadLocal<Boolean> errorOccurred = new ThreadLocal<Boolean>();
 
     @Override
     public void onApplicationStart() {
@@ -23,48 +24,29 @@ public void beforeActionInvocation(Method actionMethod) {
         // Before each action, create a new CSS and JS Compressor
         jsCompressor.set(new JSCompressor());
         cssCompressor.set(new CSSCompressor());
+        errorOccurred.set(false);
     }
 
     /**
      * Get the url for the compressed version of the given JS file, in real time
      */
     public static String compressedSingleJSUrl(String fileName) {
-        // This can happen in some extreme error cases
-        if(jsCompressor.get() == null) {
-            return "";
-        }
-
         return jsCompressor.get().compressedSingleFileUrl(fileName);
     }
 
     /**
      * Get the url for the compressed version of the given CSS file, in real time
      */
     public static String compressedSingleCSSUrl(String fileName) {
-        // This can happen in some extreme error cases
-        if(cssCompressor.get() == null) {
-            return "";
-        }
-
         return cssCompressor.get().compressedSingleFileUrl(fileName);
     }
 
     public static String addJS(String fileName, boolean compress) {
-        // This can happen in some extreme error cases
-        if(jsCompressor.get() == null) {
-            return "";
-        }
-
         // Add files to the JS compressor
         return jsCompressor.get().add(fileName, compress);
     }
 
     public static String addCSS(String fileName, boolean compress) {
-        // This can happen in some extreme error cases
-        if(cssCompressor.get() == null) {
-            return "";
-        }
-
         // Add files to the CSS compressor
         return cssCompressor.get().add(fileName, compress);
     }
@@ -75,11 +57,6 @@ public static String addCSS(String fileName, boolean compress) {
      * compressed file.
      */
     public static String compressedJSUrl() {
-        // This can happen in some extreme error cases
-        if(jsCompressor.get() == null) {
-            return "";
-        }
-
         return jsCompressor.get().compressedUrl();
     }
 
@@ -89,11 +66,6 @@ public static String compressedJSUrl() {
      * file.
      */
     public static String compressedCSSUrl() {
-        // This can happen in some extreme error cases
-        if(cssCompressor.get() == null) {
-            return "";
-        }
-
         return cssCompressor.get().compressedUrl();
     }
 
@@ -107,6 +79,19 @@ public void afterActionInvocation() {
         }
     }
 
+    @Override
+    public void onInvocationException(Throwable e) {
+         errorOccurred.set(true);
+    }
+
+
+    /**
+     * Indicates whether or not an error has occurred
+     */
+    public static boolean hasErrorOccurred() {
+        return errorOccurred.get() == null || errorOccurred.get();
+    }
+
     /**
      * Indicates whether or not compression is enabled.
      */

app/views/tags/press/compressed-script.tag

@@ -12,6 +12,6 @@
  *  See the plugin documentation for more information.
  *  
 }*
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   <script src="${press.Plugin.compressedJSUrl()}" type="text/javascript" language="javascript" charset="utf-8"></script>
 #{/if}

app/views/tags/press/compressed-stylesheet.tag

@@ -16,6 +16,6 @@
  *  See the plugin documentation for more information.
  *  
 }*
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   <link href="${press.Plugin.compressedCSSUrl()}" rel="stylesheet" type="text/css" charset="utf-8" #{if _media} media="${_media}"#{/if}></link>
 #{/if}

app/views/tags/press/script.tag

@@ -34,7 +34,7 @@
         throw new play.exceptions.TagInternalException("src attribute cannot be empty for press.script tag");
     }
 }%
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   ${ press.Plugin.addJS(_src, _compress) }
 #{/if}
 #{else}

app/views/tags/press/single-script.tag

@@ -1,6 +1,8 @@
 *{
  *  Outputs a <script> tag whose source is the compressed output of the file
  *  specified as a parameter
+ *  When the plugin is disabled, outputs a script tag with the original source
+ *  for easy debugging.
  *
  *  eg:
  *  #{press.single-script "widget.js"}
@@ -19,6 +21,9 @@
     }
 }%
 
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   <script src="${press.Plugin.compressedSingleJSUrl(_src)}" type="text/javascript" language="javascript" charset="utf-8"></script>
 #{/if}
+#{else}
+  <script src="/public/javascripts/${_src}" type="text/javascript" language="javascript" charset="utf-8"></script>
+#{/else}

app/views/tags/press/single-stylesheet.tag

@@ -1,6 +1,8 @@
 *{
  *  Outputs a <css> tag whose source is the compressed output of the file
  *  specified as a parameter
+ *  When the plugin is disabled, outputs a css tag with the original source
+ *  for easy debugging.
  *
  *  eg:
  *  #{press.single-stylesheet "widget.css"}
@@ -19,6 +21,9 @@
     }
 }%
 
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   <link href="${press.Plugin.compressedSingleCSSUrl(_src)}" rel="stylesheet" type="text/css" charset="utf-8" #{if _media} media="${_media}"#{/if}></link>
 #{/if}
+#{else}
+  <link href="/public/stylesheets/${_src}" rel="stylesheet" type="text/css" charset="utf-8" #{if _media} media="${_media}"#{/if}></link>
+#{/else}

app/views/tags/press/stylesheet.tag

@@ -33,7 +33,7 @@
         throw new play.exceptions.TagInternalException("src attribute cannot be empty for stylesheet tag");
     }
 }%
-#{if press.Plugin.enabled() }
+#{if press.Plugin.enabled() && !press.Plugin.hasErrorOccurred() }
   ${ press.Plugin.addCSS(_src, _compress) }
 #{/if}
 #{else}