[Openutils-svn] SF.net SVN: openutils:[1647] trunk

[<cs...@us...>]

Revision: 1647
          http://openutils.svn.sourceforge.net/openutils/?rev=1647&view=rev
Author:   cstrap
Date:     2010-01-15 13:32:35 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
Moving elfunction 'splitAndTokenize' in MgnlUtilsElFunction.

Modified Paths:
--------------
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java
    trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld
    trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld

Modified: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java
===================================================================
--- trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java	2010-01-15 11:09:11 UTC (rev 1646)
+++ trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/ElStringUtils.java	2010-01-15 13:32:35 UTC (rev 1647)
@@ -109,25 +109,6 @@
     }
 
     /**
-     * Splits the given strings on newline (<code>\n</code>) and after on tabs (<code>\t</code>) Usually used to
-     * retrieve data from a magnolia grid component
-     * @param string string to be splitted
-     * @return array
-     */
-    public static String[][] splitAndTokenize(String string)
-    {
-        List<String[]> list = new ArrayList<String[]>();
-        for (String line : ElStringUtils.splitNewlines(string))
-        {
-            if (StringUtils.isNotBlank(line))
-            {
-                list.add(ElStringUtils.splitOnTabs(line));
-            }
-        }
-        return list.toArray(new String[0][]);
-    }
-
-    /**
      * Tests if this string ends with the specified suffix.
      * @param string
      * @param suffix

Modified: trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld
===================================================================
--- trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld	2010-01-15 11:09:11 UTC (rev 1646)
+++ trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld	2010-01-15 13:32:35 UTC (rev 1647)
@@ -97,12 +97,6 @@
     <function-signature>java.lang.String[] splitOnTabs(java.lang.String)</function-signature>
   </function>
   <function>
-    <description>Splits the given string on newlines and after on tab characters</description>
-    <name>splitAndTokenize</name>
-    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
-    <function-signature>java.lang.String[][] splitAndTokenize(java.lang.String)</function-signature>
-  </function>
-  <function>
     <description>Strips whitespaces from the start and the end of a String</description>
     <name>strip</name>
     <function-class>org.apache.commons.lang.StringUtils</function-class>

Modified: trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2010-01-15 11:09:11 UTC (rev 1646)
+++ trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2010-01-15 13:32:35 UTC (rev 1647)
@@ -9,9 +9,11 @@
 import info.magnolia.link.LinkException;
 import info.magnolia.link.LinkUtil;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
@@ -155,7 +157,6 @@
 
     public static String tolink(String url)
     {
-
         String cleanedurl = StringUtils.replace(StringUtils.trim(url), "&", "&amp;");
         if (cleanedurl != null && cleanedurl.startsWith("http"))
         {
@@ -357,4 +358,23 @@
         return ISO9075.encodePath(handle);
     }
 
+    /**
+     * Splits the given strings on newline (<code>\n</code>) and after on tabs (<code>\t</code>) Usually used to
+     * retrieve data from a magnolia grid component
+     * @param string string to be splitted
+     * @return array
+     */
+    public static String[][] splitAndTokenize(String string)
+    {
+        List<String[]> list = new ArrayList<String[]>();
+        for (String line : StringUtils.splitPreserveAllTokens(string, '\n'))
+        {
+            if (StringUtils.isNotBlank(line))
+            {
+                list.add(StringUtils.splitPreserveAllTokens(string, '\t'));
+            }
+        }
+        return list.toArray(new String[0][]);
+    }
+
 }

Modified: trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2010-01-15 11:09:11 UTC (rev 1646)
+++ trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld	2010-01-15 13:32:35 UTC (rev 1647)
@@ -173,4 +173,10 @@
     <function-class>--to be set --</function-class>
     <function-signature>java.lang.Boolean isLine(java.lang.String, java.lang.String)</function-signature>
   </function>
+  <function>
+    <name>splitAndTokenize</name>
+    <description>Splits the given string on newlines and after on tab characters</description>
+    <function-class>net.sourceforge.openutils.elfunctions.ElStringUtils</function-class>
+    <function-signature>java.lang.String[][] splitAndTokenize(java.lang.String)</function-signature>
+  </function>
 </taglib>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.