svn commit: r788927 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/JsLibrary.java test/java/org/apache/shindig/gadgets/JsLibraryTest.java

[lindner]

Author: lindner
Date: Sat Jun 27 06:19:16 2009
New Revision: 788927

URL: http://svn.apache.org/viewvc?rev=788927&view=rev
Log:
SHINDIG-1102 | JsLibary fix for libraries without optimized content

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=788927&r1=788926&r2=788927&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 Sat Jun 27 06:19:16 2009
@@ -277,9 +277,19 @@
    */
   protected JsLibrary(String feature, Type type, String content,
       String debugContent) {
+    if (content == null) { 
+      content = debugContent; 
+    } else if (content.equalsIgnoreCase("null")) { 
+      // this is because null was returned as a String 
+      content = debugContent; 
+    } else if (content.length() == 0) { 
+      content = debugContent; 
+    }  
+
     this.feature = feature;
     this.type = type;
     this.content = content;
     this.debugContent = debugContent;
+
   }
 }

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java?rev=788927&r1=788926&r2=788927&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
 Sat Jun 27 06:19:16 2009
@@ -64,6 +64,12 @@
     out.write(UNCOMPRESSED_FILE_JS);
     out.close();
 
+    // Test situation when we have no optimized file
+    JsLibrary lib = JsLibrary.create(JsLibrary.Type.FILE, 
uncompressed.getPath(), null, null);
+    assertEquals(JsLibrary.Type.FILE, lib.getType());
+    assertEquals(UNCOMPRESSED_FILE_JS, lib.getContent());
+    assertEquals(UNCOMPRESSED_FILE_JS, lib.getDebugContent());
+
     File compressed = new File(uncompressed.getPath().replace(".js", 
".opt.js"));
     // This might fail, but it shouldn't fail if the temp creation worked.
     compressed.createNewFile();
@@ -72,7 +78,8 @@
     out.write(FILE_JS);
     out.close();
 
-    JsLibrary lib = JsLibrary.create(JsLibrary.Type.FILE, 
uncompressed.getPath(), null, null);
+    // Now test situation with compressed and uncompressed 
+    lib = JsLibrary.create(JsLibrary.Type.FILE, uncompressed.getPath(), null, 
null);
     assertEquals(JsLibrary.Type.FILE, lib.getType());
     assertEquals(FILE_JS, lib.getContent());
     assertEquals(UNCOMPRESSED_FILE_JS, lib.getDebugContent());