You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@shindig.apache.org by li...@apache.org on 2008/03/03 08:20:35 UTC

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

Author: lindner
Date: Sun Mar  2 23:20:35 2008
New Revision: 632965

URL: http://svn.apache.org/viewvc?rev=632965&view=rev
Log:
Split featurs.txt on all variations of CR/LF

This should fix the problem with running on windows.

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.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=632965&r1=632964&r2=632965&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 Sun Mar  2 23:20:35 2008
@@ -78,7 +78,7 @@
         path = path.substring(6);
         logger.info("Loading resources from: " + path);
         if (path.endsWith(".txt")) {
-          loadResources(ResourceLoader.getContent(path).split("\n"), features);
+          loadResources(ResourceLoader.getContent(path).split("[\r\n]+"), features);
         } else {
           loadResources(new String[]{path}, features);
         }
@@ -325,4 +325,4 @@
 
     syndLibs.add(library);
   }
-}
\ No newline at end of file
+}