svn commit: r789454 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: JsFeatureLoader.java JsLibrary.java

[lindner]

Author: lindner
Date: Mon Jun 29 21:29:57 2009
New Revision: 789454

URL: http://svn.apache.org/viewvc?rev=789454&view=rev
Log:
SHINDIG-1102 | JsLibrary fix for optimized without debug libs

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

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=789454&r1=789453&r2=789454&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
 Mon Jun 29 21:29:57 2009
@@ -94,7 +94,7 @@
           logger.info("Loading resources from: " + location);
           if (location.endsWith(".txt")) {
             List<String> resources = Lists.newArrayList();
-            for(String resource : 
StringUtils.split(ResourceLoader.getContent(location), "[\r\n]+")) {
+            for (String resource : 
ResourceLoader.getContent(location).split("[\r\n]+")) {
               // Skip blank/commented lines
               if (StringUtils.trim(resource).length() > 0 && 
resource.charAt(0) != '#') {
                 resources.add(StringUtils.trim(resource));

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=789454&r1=789453&r2=789454&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
 Mon Jun 29 21:29:57 2009
@@ -277,13 +277,18 @@
    */
   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) { 
+
+    // Validate that we have something here.
+    if ((content == null && debugContent == null) || 
+        ("null".equals(content) && "null".equals(debugContent))) {
+      throw new IllegalArgumentException("no content for feature " + feature);
+    }
+
+    if (content == null || "null".equals(content) || content.length() == 0) { 
       content = debugContent; 
+    }
+    if (debugContent == null || "null".equasl(debugContent) || 
debugContent.length() == 0) { 
+      debugContent = content;
     }  
 
     this.feature = feature;