Index: lutinutil/src/java/org/codelutin/util/StringUtil.java
diff -u lutinutil/src/java/org/codelutin/util/StringUtil.java:1.17 lutinutil/src/java/org/codelutin/util/StringUtil.java:1.18
--- lutinutil/src/java/org/codelutin/util/StringUtil.java:1.17	Fri Jun  8 13:28:33 2007
+++ lutinutil/src/java/org/codelutin/util/StringUtil.java	Fri Jun  8 13:36:30 2007
@@ -1,32 +1,32 @@
 /* *##%%
-* Copyright (C) 2002, 2003 Code Lutin
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*##%%**/
+ * Copyright (C) 2002, 2003 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *##%%**/
 /* *
-* StringUtil.java
-*
-* Created: Sun Apr 14 2002
-*
-* @author POUSSIN Benjamin <bpoussin@free.fr>
-* Copyright Code Lutin
-* @version $Revision: 1.17 $
-*
-* Mise a jour: $Date: 2007/06/08 13:28:33 $
-* par : $Author: bpoussin $
-*/
+ * StringUtil.java
+ *
+ * Created: Sun Apr 14 2002
+ *
+ * @author POUSSIN Benjamin <bpoussin@free.fr>
+ * Copyright Code Lutin
+ * @version $Revision: 1.18 $
+ *
+ * Mise a jour: $Date: 2007/06/08 13:36:30 $
+ * par : $Author: thimel $
+ */
 package org.codelutin.util;
 
 import java.awt.Color;
@@ -42,38 +42,47 @@
  * Classe contenant un ensemle de m?thode static utiles pour la manipulation des
  * cha?ne de caract?re mais qui ne sont pas d?fini dans la classe String de
  * Java.
- *
- *@author    poussin
- *@created   21 octobre 2003
+ * 
+ * @author poussin
+ * @created 21 octobre 2003
  */
 public class StringUtil { // StringUtil
 
     /** Constructor for the StringUtil object */
     protected StringUtil() {
     }
-    
+
     static public String unaccent(String s) {
         String result = "";
-        for (char c: s.toCharArray()) {
+        for (char c : s.toCharArray()) {
             if ("éèêë".indexOf(c) != -1) {
                 result += "e";
             } else if ("àäâ".indexOf(c) != -1) {
                 result += "a";
-            } else if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
+            } else if ("ç".indexOf(c) != -1) {
+                result += "c";
+            } else if ("îï".indexOf(c) != -1) {
+                result += "i";
+            } else if ("ôö".indexOf(c) != -1) {
+                result += "a";
+            } else if ("ùûü".indexOf(c) != -1) {
+                result += "u";
+            } else if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')
+                    || ('0' <= c && c <= '9')) {
                 result += c;
             } else {
                 // on ne l'ajoute pas a result donc on supprime le caractere
-//                result += encodeUTF(c);
+                // result += encodeUTF(c);
             }
         }
         return result;
     }
-    
+
     static public String substring(String s, int begin) {
         String result = substring(s, begin, s.length());
         return result;
     }
-    
+
     static public String substring(String s, int begin, int end) {
         if (begin < 0) {
             begin = s.length() + begin;
@@ -85,16 +94,18 @@
             end = begin;
         }
 
-        String result = s.substring(begin, end); 
+        String result = s.substring(begin, end);
         return result;
     }
 
     /**
      * Met en majuscule le premier caract?re de la cha?ne pass? en param?tre
-     *
-     * @param word  La cha?ne ? capitaliser
-     * @return      La cha?ne capitalis?e
-     * @deprecated you must use org.apache.commons.lang.StringUtils.capitalise(String)
+     * 
+     * @param word
+     *            La cha?ne ? capitaliser
+     * @return La cha?ne capitalis?e
+     * @deprecated you must use
+     *             org.apache.commons.lang.StringUtils.capitalise(String)
      */
     public static String capitalize(String word) {
         return word.substring(0, 1).toUpperCase() + word.substring(1);
@@ -102,10 +113,12 @@
 
     /**
      * Met en minuscule le premier caract?re de la cha?ne pass? en param?tre
-     *
-     *@param word  La cha?ne ? decapitaliser
-     *@return      La cha?ne decapitalis?e
-     * @deprecated you must use org.apache.commons.lang.StringUtils.uncapitalise(String)
+     * 
+     * @param word
+     *            La cha?ne ? decapitaliser
+     * @return La cha?ne decapitalis?e
+     * @deprecated you must use
+     *             org.apache.commons.lang.StringUtils.uncapitalise(String)
      */
     public static String uncapitalize(String word) {
         return word.substring(0, 1).toLowerCase() + word.substring(1);
@@ -113,11 +126,13 @@
 
     /**
      * Concat?ne un tableau de cha?ne de caract?res en une seul cha?ne.
-     *
-     *@param s    le tableau de cha?nes
-     *@param sep  le s?parateur ? utiliser pour s?parer chaque cha?ne.
-     *@return     la cha?ne r?sultante de la concat?nation. Si le tableau est
-     *      null ou vide, la cha?ne r?sultante est une chaine vide.
+     * 
+     * @param s
+     *            le tableau de cha?nes
+     * @param sep
+     *            le s?parateur ? utiliser pour s?parer chaque cha?ne.
+     * @return la cha?ne r?sultante de la concat?nation. Si le tableau est null
+     *         ou vide, la cha?ne r?sultante est une chaine vide.
      * @deprecated you must use org.apache.commons.lang.StringUtils.join
      */
     public static String unsplit(String[] s, String sep) {
@@ -133,27 +148,29 @@
     }
 
     /**
-     * Split string use 'separator' as separator. If String contains "'()[]{} this
-     * method count the number of open char end close char to split correctly
-     * argument
+     * Split string use 'separator' as separator. If String contains "'()[]{}
+     * this method count the number of open char end close char to split
+     * correctly argument
      * 
-     * @param args string to split
-     * @param separator separator use to split string
+     * @param args
+     *            string to split
+     * @param separator
+     *            separator use to split string
      * @return array of string
      */
-    static public String [] split(String args, String separator) {
+    static public String[] split(String args, String separator) {
         if (args == null) {
             return new String[0];
         }
-        
+
         List<String> result = new ArrayList<String>();
-        
+
         int start = 0;
         int end = 0;
         StringBuffer op = new StringBuffer(); // stack of {([ currently open
         char last = '\0'; // contains " or ' if string is openned
 
-        for (int i=0; i<args.length(); i++) {
+        for (int i = 0; i < args.length(); i++) {
             char c = args.charAt(i);
             if (c == '\\') {
                 // pass next char
@@ -162,18 +179,20 @@
                 if (c == '(' || c == '{' || c == '[') {
                     // open ({|
                     op.append(c);
-                }else if (c == ')' || c == '}' || c == ']') {
+                } else if (c == ')' || c == '}' || c == ']') {
                     // close ({[
                     op.deleteCharAt(op.length() - 1);
                 } else if (c == '"' || c == '\'') {
                     // open string " or '
                     last = c;
-                } else if (op.length() == 0 && args.regionMatches(i, separator, 0, separator.length())) {
+                } else if (op.length() == 0
+                        && args.regionMatches(i, separator, 0, separator
+                                .length())) {
                     // end of one arguement
                     end = i;
                     // pass separator
-                    i += separator.length() -1;
-                    
+                    i += separator.length() - 1;
+
                     String a = args.substring(start, end);
                     result.add(a);
                     // start of next argument
@@ -184,138 +203,141 @@
                 last = '\0';
             }
         }
-        
+
         if (start < args.length()) {
             String a = args.substring(start, args.length());
             result.add(a);
         }
-        
-        return (String[])result.toArray(new String[result.size()]);
+
+        return (String[]) result.toArray(new String[result.size()]);
     }
 
-    
     /**
      * Use to split string array representation in array according with swixat
      * seperator list
      * 
-     * @param listAsString string that represent array
+     * @param listAsString
+     *            string that represent array
      * @return array with length > 0 if listAsString != null or null
      */
-    static public String [] split(String stringList) {
-        String [] result = split(stringList, ",");
+    static public String[] split(String stringList) {
+        String[] result = split(stringList, ",");
         return result;
     }
 
-    public static boolean toBoolean(String s){
+    public static boolean toBoolean(String s) {
         return "true".equalsIgnoreCase(s);
     }
 
-    public static byte toByte(String s){
+    public static byte toByte(String s) {
         return Byte.parseByte(s);
     }
 
-    public static double toDouble(String s){
+    public static double toDouble(String s) {
         return Double.parseDouble(s);
     }
 
-    public static float toFloat(String s){
+    public static float toFloat(String s) {
         return Float.parseFloat(s);
     }
 
-    public static long toLong(String s){
+    public static long toLong(String s) {
         return Long.parseLong(s);
     }
 
-    public static short toShort(String s){
+    public static short toShort(String s) {
         return Short.parseShort(s);
     }
 
-    public static int toInt(String s){
+    public static int toInt(String s) {
         return Integer.parseInt(s);
     }
 
-    public static char toChar(String s){
-        //fixme a revoir
-        return s.charAt(0) ;
+    public static char toChar(String s) {
+        // fixme a revoir
+        return s.charAt(0);
     }
 
-    public static boolean [] toArrayBoolean(String ... s){
-        boolean [] result = new boolean[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static boolean[] toArrayBoolean(String... s) {
+        boolean[] result = new boolean[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toBoolean(s[i]);
         }
         return result;
     }
 
-    public static byte [] toArrayByte(String ... s){
-        byte [] result = new byte[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static byte[] toArrayByte(String... s) {
+        byte[] result = new byte[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toByte(s[i]);
         }
         return result;
     }
 
-    public static double [] toArrayDouble(String ... s){
-        double [] result = new double[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static double[] toArrayDouble(String... s) {
+        double[] result = new double[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toDouble(s[i]);
         }
         return result;
     }
 
-    public static float [] toArrayFloat(String ... s){
-        float [] result = new float[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static float[] toArrayFloat(String... s) {
+        float[] result = new float[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toFloat(s[i]);
         }
         return result;
     }
 
-    public static long [] toArrayLong(String ... s){
-        long [] result = new long[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static long[] toArrayLong(String... s) {
+        long[] result = new long[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toLong(s[i]);
         }
         return result;
     }
 
-    public static short [] toArrayShort(String ... s){
-        short [] result = new short[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static short[] toArrayShort(String... s) {
+        short[] result = new short[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toShort(s[i]);
         }
         return result;
     }
 
-    public static int [] toArrayInt(String ... s){
-        int [] result = new int[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static int[] toArrayInt(String... s) {
+        int[] result = new int[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toInt(s[i]);
         }
         return result;
     }
 
-    public static char [] toArrayChar(String ... s){
-        char [] result = new char[s.length];
-        for (int i=0; i<result.length; i++) {
+    public static char[] toArrayChar(String... s) {
+        char[] result = new char[s.length];
+        for (int i = 0; i < result.length; i++) {
             result[i] = toChar(s[i]);
         }
-        //fixme a revoir
+        // fixme a revoir
         return result;
     }
 
     /**
-    * Essai de convertir une chaine de caractere en une couleur si possible
-    * si ce n'est pas possible retourne null.
-    * @param s la couleur sous la forme de string, par exemple "red", "yellow"
-    * ou bien en RGB "#FFAA99", et avec un canal alpha "#FFAA3366"
-    * @return la couleur demandé si possible sinon null
+     * Essai de convertir une chaine de caractere en une couleur si possible si
+     * ce n'est pas possible retourne null.
+     * 
+     * @param s
+     *            la couleur sous la forme de string, par exemple "red",
+     *            "yellow" ou bien en RGB "#FFAA99", et avec un canal alpha
+     *            "#FFAA3366"
+     * @return la couleur demandé si possible sinon null
      * @throws IllegalAccessException
      * @throws IllegalArgumentException
-    */
+     */
     public static Color toColor(String s) throws StringUtilException {
         try {
-            if(s.startsWith("#")){
+            if (s.startsWith("#")) {
                 // récuperation des valeurs hexa
                 String hr = s.substring(1, 3);
                 String hg = s.substring(3, 5);
@@ -326,58 +348,70 @@
                 int g = Integer.parseInt(hg, 16);
                 int b = Integer.parseInt(hb, 16);
 
-                if(s.length() == 9){
+                if (s.length() == 9) {
                     // s'il y a un canal alpha on l'utilise
                     String ha = s.substring(7, 9);
                     int a = Integer.parseInt(ha, 16);
                     return new Color(r, g, b, a);
-                }else{
+                } else {
                     return new Color(r, g, b);
                 }
-            }else{
+            } else {
                 Field f;
-        f = Color.class.getField(s);
-        return (Color)f.get(Color.class);
+                f = Color.class.getField(s);
+                return (Color) f.get(Color.class);
             }
-    } catch (NumberFormatException e) {
-            throw new StringUtilException("Error during conversion from string to color", e);
-    } catch (SecurityException e) {
-            throw new StringUtilException("Error during conversion from string to color", e);
-    } catch (NoSuchFieldException e) {
-            throw new StringUtilException("Error during conversion from string to color", e);
-    } catch (IllegalArgumentException e) {
-            throw new StringUtilException("Error during conversion from string to color", e);
-    } catch (IllegalAccessException e) {
-            throw new StringUtilException("Error during conversion from string to color", e);
-    }
+        } catch (NumberFormatException e) {
+            throw new StringUtilException(
+                    "Error during conversion from string to color", e);
+        } catch (SecurityException e) {
+            throw new StringUtilException(
+                    "Error during conversion from string to color", e);
+        } catch (NoSuchFieldException e) {
+            throw new StringUtilException(
+                    "Error during conversion from string to color", e);
+        } catch (IllegalArgumentException e) {
+            throw new StringUtilException(
+                    "Error during conversion from string to color", e);
+        } catch (IllegalAccessException e) {
+            throw new StringUtilException(
+                    "Error during conversion from string to color", e);
+        }
     }
 
-    public static Date toDate(String s) throws ParseException{
+    public static Date toDate(String s) throws ParseException {
         return DateFormat.getDateInstance().parse(s);
     }
 
-    static final protected double [] timeFactors = {1000000, 1000, 60, 60, 24};
-    static final protected String [] timeUnites = {"ns", "ms", "s", "m", "h", "d"};
-    static public String convertTime(long value){
+    static final protected double[] timeFactors = { 1000000, 1000, 60, 60, 24 };
+
+    static final protected String[] timeUnites = { "ns", "ms", "s", "m", "h",
+            "d" };
+
+    static public String convertTime(long value) {
         return convert(value, timeFactors, timeUnites);
     }
 
-    static final protected double [] memoryFactors = {1024, 1024, 1024, 1024};
-    static final protected String [] memoryUnites = {"o", "Ko", "Mo", "Go", "To"};
-    static public String convertMemory(long value){
+    static final protected double[] memoryFactors = { 1024, 1024, 1024, 1024 };
+
+    static final protected String[] memoryUnites = { "o", "Ko", "Mo", "Go",
+            "To" };
+
+    static public String convertMemory(long value) {
         return convert(value, memoryFactors, memoryUnites);
     }
 
-    static public String convert(long value, double [] factors , String [] unites){
-        long sign = value==0?1:value/Math.abs(value);
-        int i=0;
+    static public String convert(long value, double[] factors, String[] unites) {
+        long sign = value == 0 ? 1 : value / Math.abs(value);
+        int i = 0;
         double tmp = Math.abs(value);
-        while(i<factors.length && i<unites.length && tmp > factors[i] ){
+        while (i < factors.length && i < unites.length && tmp > factors[i]) {
             tmp = tmp / factors[i++];
         }
 
         tmp *= sign;
-        String result = MessageFormat.format("{0,number,0.###}{1}", tmp, unites[i]);
+        String result = MessageFormat.format("{0,number,0.###}{1}", tmp,
+                unites[i]);
         return result;
     }