Index: lutinutil/src/java/org/codelutin/i18n/Language.java
diff -u lutinutil/src/java/org/codelutin/i18n/Language.java:1.12 lutinutil/src/java/org/codelutin/i18n/Language.java:1.13
--- lutinutil/src/java/org/codelutin/i18n/Language.java:1.12	Sat Mar 22 23:26:31 2008
+++ lutinutil/src/java/org/codelutin/i18n/Language.java	Sun Mar 23 06:02:24 2008
@@ -32,18 +32,17 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLClassLoader;
-import java.net.URL;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.Properties;
 
 /**
- * This class is used byte the i18n class. It encapsulates the translation
- * resource for one language.
+ * This class is used by the i18n class. It encapsulates the translation
+ * resource for a given language and a given encoding.
  * <p/>
  * The class offers a public static factory method :
- * {@link #newLanguage(Locale, String,URL[])}.
+ * {@link #newLanguage(Locale, String)}.
  * <p/>
  * Note : <b>You SHOULD always use the factory method, since constructor does
  * not load i18n bundle resources.</b>
@@ -62,12 +61,11 @@
      *
      * @param l          la locale choisie
      * @param toEncoding l'encoding choisi
-     * @param extraUrl   extra urls where to detect bundles
      * @return l'instance du language correspondant, initialisé
      */
-    public static Language newLanguage(Locale l, String toEncoding, URL... extraUrl) {
+    public static Language newLanguage(Locale l, String toEncoding) {
         Language language = new Language(l, toEncoding);
-        language.init(extraUrl);
+        language.init();
         return language;
     }
 
@@ -93,24 +91,16 @@
         this.encoding = toEncoding;
     }
 
-    protected Language(Locale l) {
-        this(l, I18n.UTF_8_ENCONDING);
-    }
-
     /**
      * charge les traductions de la langue.
      * <p/>
      * recherche dans un premier temps, les urls des bundles puis les charge.
-     *
-     * @param extraUrl extra urls where to detect bundles
      */
-    protected void init(URL... extraUrl) {
+    protected void init() {
         // make sure the bundlemanager is init
-        I18nBundleManager.init(extraUrl);
-
+        I18nBundleManager.init();
         // load resources from bundles
         resource = new Properties();
-
         // get bundles for this locale
         I18nBundleManager.getInstance().load(this, resource);
     }
@@ -172,8 +162,9 @@
      * @return untranslated sentence
      */
     public String untranslate(String sentence) {
-        if (resource == null)
+        if (resource == null) {
             return sentence;
+        }
         try {
             Enumeration e = resource.propertyNames();
             // Look for the given sentence through all translations
@@ -181,8 +172,9 @@
                 String key = (String) e.nextElement();
                 String translation = resource.getProperty(key);
                 // If found returns the corresponding key
-                if (sentence.equals(translation))
+                if (sentence.equals(translation)) {
                     return key;
+                }
             }
         } catch (MissingResourceException eee) {
             // Well, this can't happen...
@@ -203,6 +195,20 @@
         return resource == null ? 0 : resource.size();
     }
 
+    public void close() {
+        if (resource != null) {
+            log.info(this);
+            resource.clear();
+            resource = null;
+        }
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        close();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -222,6 +228,6 @@
 
     @Override
     public String toString() {
-        return "Language <locale: " + locale + ", encoding: " + encoding + ">";
+        return "Language <locale: " + locale + ", encoding: " + encoding + ",nbStences:" + (size()) + ">";
     }
 }
\ No newline at end of file

Index: lutinutil/src/java/org/codelutin/i18n/I18n.java
diff -u lutinutil/src/java/org/codelutin/i18n/I18n.java:1.15 lutinutil/src/java/org/codelutin/i18n/I18n.java:1.16
--- lutinutil/src/java/org/codelutin/i18n/I18n.java:1.15	Sat Mar 22 23:29:24 2008
+++ lutinutil/src/java/org/codelutin/i18n/I18n.java	Sun Mar 23 06:02:24 2008
@@ -23,14 +23,16 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
  *
- * Mise a jour: $Date: 2008-03-22 23:29:24 $
+ * Mise a jour: $Date: 2008-03-23 06:02:24 $
  * par : $Author: tchemit $
  */
 
 package org.codelutin.i18n;
 
+import org.codelutin.i18n.bundle.I18nBundleManager;
+
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -42,9 +44,9 @@
  * you can either :
  * <ul>
  * <li> import the org.codelutin.i18n.I18n class,
- * <li> init the translation support with the initXXX(String language) or
- * initXXX(String language, String country) static methods in your main, ( eg:
- * I18n.initXXX("fr","FR") ) (XXX=ISO88591 | UTF8)
+ * <li> init the translation support with the init(String language) or
+ * init(String language, String country), init(Localelocale) static methods in your main, ( eg:
+ * I18n.init("fr","FR") )
  * <li> call the translate static method for each sentence, ( eg:
  * I18n._("hello you !") )
  * <li> create a resource file for each language following the naming
@@ -59,29 +61,17 @@
 @org.codelutin.i18n.I18nable
 public class I18n {
 
-    static final String ISO_8859_1_ENCONDING = "ISO-8859-1";
+    public static final String ISO_8859_1_ENCONDING = "ISO-8859-1";
 
-    static final String UTF_8_ENCONDING = "UTF-8";
+    public static final String UTF_8_ENCONDING = "UTF-8";
 
-    static final Locale DEFAULT_LOCALE = Locale.UK;
+    public static final Locale DEFAULT_LOCALE = Locale.UK;
 
     public static final String DEFAULT_ENCODING = ISO_8859_1_ENCONDING;
 
+    /** la classe responsable du chargement des ressources */
     static I18nLoader loader;
 
-    protected static I18nLoader getLoader(String encoding) {
-        if (loader == null) {
-            loader = new I18nLoader(encoding, DEFAULT_LOCALE);
-        } else {
-            if (!loader.getEncoding().equals(encoding)) {
-                // close previous loader
-                loader.close();
-                loader = new I18nLoader(encoding, DEFAULT_LOCALE);
-            }
-        }
-        return loader;
-    }
-
     /** Filtre a appliquer avant de retourner les chaines */
     protected static I18nFilter filter;
 
@@ -89,27 +79,25 @@
     protected static String recordFilePath;
 
     /**
-     * Initialise la librairie avec encoing par defaut et locale par defaut
-     *
-     * @param extraUrl some extra urls where to find bundles
-     */
-    public static void init(URL... extraUrl) {
-        init(DEFAULT_LOCALE, DEFAULT_ENCODING, extraUrl);
+     * some extra urls to given to bundle manager.
+     * <p/>
+     * Note: use this before call <code>init(...)</code> methods
+     */
+    protected static URL[] extraURL;
+
+    /** Initialise la librairie avec encoing par defaut et locale par defaut */
+    public static void init() {
+        init(null, null, DEFAULT_ENCODING);
     }
 
-    //===========================================================
-    //== With default encoding init
-    //===========================================================
-
     /**
      * Initialize the library for given <code>locale</code with
      * default encoding says <code>ISO-8859-1</code> enconding
      *
-     * @param locale   language to use
-     * @param extraUrl some extra urls where to find bundles
+     * @param locale language to use
      */
-    public static void init(Locale locale, URL... extraUrl) {
-        init(locale, DEFAULT_ENCODING, extraUrl);
+    public static void init(Locale locale) {
+        init(locale, DEFAULT_ENCODING);
     }
 
     /**
@@ -117,133 +105,30 @@
      *
      * @param language une chaine representant la langue à utiliser fr, en, ...
      * @param country  une chaine representant le pays à utiliser FR, GB, ...
-     * @param extraUrl some extra urls where to find bundles
      */
-    public static void init(String language, String country, URL... extraUrl) {
-        init(language, country, DEFAULT_ENCODING, extraUrl);
+    public static void init(String language, String country) {
+        init(language, country, DEFAULT_ENCODING);
     }
 
     /**
      * Initialise la librairie.
      *
      * @param language une chaine representant la langue à utiliser fr, en, ...
-     * @param extraUrl some extra urls where to find bundles
      * @deprecated
      */
-    public static void init(String language, URL... extraUrl) {
-        init(language, null, DEFAULT_ENCODING, extraUrl);
+    public static void init(String language) {
+        init(language, null, DEFAULT_ENCODING);
     }
 
-//    //===========================================================
-//    //== With ISO-8859-1 encoding init
-//    //===========================================================
-//
-//    /**
-//     * Initialize the library with default locale {@link #DEFAULT_LOCALE}
-//     * with <code>ISO-8859-1</code> enconding
-//     *
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initISO88591(URL... extraUrl) {
-//        init((Locale) null, ISO_8859_1_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>locale</code with
-//     * <code>ISO-8859-1</code> enconding
-//     *
-//     * @param locale   language to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initISO88591(Locale locale, URL... extraUrl) {
-//        init(locale, ISO_8859_1_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>language</code> and given
-//     * <code>country</code> with <code>ISO-8859-1</code> enconding
-//     *
-//     * @param language language to use
-//     * @param country  country to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initISO88591(String language, String country, URL... extraUrl) {
-//        init(language, country, ISO_8859_1_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>language</code> with
-//     * <code>ISO-8859-1</code> enconding
-//     *
-//     * @param language language to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initISO88591(String language, URL... extraUrl) {
-//        init(language,null, ISO_8859_1_ENCONDING, extraUrl);
-//    }
-//
-//    //===========================================================
-//    //== With UTF-8 encoding init
-//    //===========================================================
-//
-//    /**
-//     * Initialize the library with default locale {@link #DEFAULT_LOCALE}
-//     * with <code>UTF-8</code> enconding
-//     *
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initUTF8(URL... extraUrl) {
-//        init((String) null, UTF_8_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>locale</code with
-//     * <code>UTF-8</code> enconding
-//     *
-//     * @param locale   language to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initUTF8(Locale locale, URL... extraUrl) {
-//        init(locale, UTF_8_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>language</code> and
-//     * given <code>country</code> with <code>UTF-81</code> enconding
-//     *
-//     * @param language language to use
-//     * @param country  country to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initUTF8(String language, String country, URL... extraUrl) {
-//        init(language, country, UTF_8_ENCONDING, extraUrl);
-//    }
-//
-//    /**
-//     * Initialize the library for given <code>language</code> with
-//     * <code>UTF-8</code> enconding
-//     *
-//     * @param language language to use
-//     * @param extraUrl some extra urls where to find bundles
-//     */
-//    public static void initUTF8(String language, URL... extraUrl) {
-//        init(language, null, UTF_8_ENCONDING, extraUrl);
-//    }
-
-    //===========================================================
-    //== With given encoding init
-    //===========================================================
-
     /**
      * Initialise la librairie
      *
      * @param language une chaine representant la langue à utiliser fr, en, ...
      * @param country  une chaine representant le pays à utiliser FR, GB, ...
      * @param encoding l'encoding a utiliser, si null DEFAULT_ENCODING est utilise
-     * @param extraUrl some extra urls where to find bundles
      */
-    public static void init(String language, String country, String encoding, URL... extraUrl) {
-        getLoader(encoding).init(language, country, extraUrl);
+    public static void init(String language, String country, String encoding) {
+        getLoader(encoding).init(language, country);
     }
 
     /**
@@ -251,13 +136,11 @@
      *
      * @param newLocale la locale a charger
      * @param encoding  l'encoding a utiliser, si null DEFAULT_ENCODING est utilise
-     * @param extraUrl  some extra urls where to find bundles
      */
-    public static void init(Locale newLocale, String encoding, URL... extraUrl) {
-        getLoader(encoding).init(newLocale, extraUrl);
+    public static void init(Locale newLocale, String encoding) {
+        getLoader(encoding).init(newLocale);
     }
 
-
     /**
      * Retourne la chaine traduite si possible.
      *
@@ -266,12 +149,13 @@
      *         sinon.
      */
     public static String _(String message) {
-        if (loader.getLanguage() == null) {
+        if (loader == null || loader.getLanguage() == null) {
             return applyFilter(message);
         }
         return applyFilter(loader.getLanguage().translate(message));
     }
 
+
     /**
      * Retourne la chaine traduite si possible.
      *
@@ -282,7 +166,7 @@
      */
     public static String _(String message, Object... args) {
         String result = message;
-        Language language = loader.getLanguage();
+        Language language = loader == null ? null : loader.getLanguage();
         if (language != null) {
             result = language.translate(message);
         }
@@ -327,6 +211,45 @@
         }
     }
 
+    public static String getRecordFilePath() {
+        return recordFilePath;
+    }
+
+    /**
+     * Change le filtre des chaines traduites
+     *
+     * @param filter l'objet filtre a utiliser
+     */
+    public static void setFilter(I18nFilter filter) {
+        I18n.filter = filter;
+    }
+
+    public static void setRecordFilePath(String recordFilePath) {
+        I18n.recordFilePath = recordFilePath;
+    }
+
+    /**
+     * Change extra urls to use in bundle discovering
+     * <p/>
+     * Note: <b>This method will close the i18n system and reset cache of url in {@link I18nBundleManager}</b>
+     *
+     * @param extraURL new extra urls to use
+     */
+    public static void setExtraURL(URL[] extraURL) {
+        I18n.extraURL = extraURL;
+        // must reset bundlemanager urls
+        I18nBundleManager.resetURL();
+        // and close system
+        close();
+    }
+
+    public static void close() {
+        if (loader != null) {
+            loader.close();
+            loader = null;
+        }
+    }
+
     /**
      * Applique le filtre s'il y en a un
      *
@@ -345,34 +268,25 @@
         return filter;
     }
 
-    public static String getRecordFilePath() {
-        return recordFilePath;
+    public static URL[] getExtraURL() {
+        return extraURL == null ? new URL[0] : extraURL;
     }
 
-    /*protected static Language getLanguage() {
-        return LanguageManager.getLanguage();
-    }*/
-
-    /*protected static void setLanguage(Locale newLocale, String toEncoding, URL... extraUrl) {
-        // delegate to LanguageManager
-        LanguageManager.setLanguage(newLocale, toEncoding, extraUrl);
-    }*/
-
-    /**
-     * Change le filtre des chaines traduites
-     *
-     * @param filter l'objet filtre a utiliser
-     */
-    public static void setFilter(I18nFilter filter) {
-        I18n.filter = filter;
-    }
-
-    public static void setRecordFilePath(String recordFilePath) {
-        I18n.recordFilePath = recordFilePath;
+    protected static synchronized I18nLoader getLoader(String encoding) {
+        if (encoding == null) {
+            encoding = DEFAULT_ENCODING;
+        }
+        if (loader == null) {
+            loader = new I18nLoader(encoding, DEFAULT_LOCALE);
+        } else {
+            if (!loader.getEncoding().equals(encoding)) {
+                // close previous loader
+                loader.close();
+                // open a new loader
+                loader = new I18nLoader(encoding, DEFAULT_LOCALE);
+            }
+        }
+        return loader;
     }
 
-    /*protected static Locale newLocale(String str) {
-        return ConverterUtil.convert(Locale.class, str);
-    } */
-
 } //I18n
\ No newline at end of file

Index: lutinutil/src/java/org/codelutin/i18n/I18nBundleBridge.java
diff -u lutinutil/src/java/org/codelutin/i18n/I18nBundleBridge.java:1.1 lutinutil/src/java/org/codelutin/i18n/I18nBundleBridge.java:1.2
--- lutinutil/src/java/org/codelutin/i18n/I18nBundleBridge.java:1.1	Wed Oct  4 14:51:55 2006
+++ lutinutil/src/java/org/codelutin/i18n/I18nBundleBridge.java	Sun Mar 23 06:02:24 2008
@@ -24,22 +24,18 @@
 * Created: 6 sept. 06
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.1 $
+* @version $Revision: 1.2 $
 *
-* Mise a jour: $Date: 2006-10-04 14:51:55 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2008-03-23 06:02:24 $
+* par : $Author: tchemit $
 */
 
 package org.codelutin.i18n;
 
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
-
-public class I18nBundleBridge extends ResourceBundle {
+public class I18nBundleBridge extends java.util.ResourceBundle {
 
     @Override
-    public Enumeration<String> getKeys() {
+    public java.util.Enumeration<String> getKeys() {
         throw new UnsupportedOperationException();
     }
 

Index: lutinutil/src/java/org/codelutin/i18n/I18nLoader.java
diff -u lutinutil/src/java/org/codelutin/i18n/I18nLoader.java:1.1 lutinutil/src/java/org/codelutin/i18n/I18nLoader.java:1.2
--- lutinutil/src/java/org/codelutin/i18n/I18nLoader.java:1.1	Sat Mar 22 23:27:08 2008
+++ lutinutil/src/java/org/codelutin/i18n/I18nLoader.java	Sun Mar 23 06:02:24 2008
@@ -14,26 +14,43 @@
  */
 package org.codelutin.i18n;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codelutin.i18n.bundle.I18nBundleManager;
 import org.codelutin.util.ConverterUtil;
 
-import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 /**
  * Classe responsalbe du chargement du systeme i18n.
  * <p/>
- * L'invarian de ce chargeur est l'eecoding
+ * L'invarian de ce chargeur est l'eecoding.
+ * <p/>
+ * Contient les différents languages deja charges par le systeme ainsi que le language courant
  *
  * @author chemit
  */
 public class I18nLoader {
 
+
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    private static final Log log = LogFactory.getLog(I18nLoader.class);
+
     /** l'encoding a utiliser pour charger les traductions */
     protected final String encoding;
 
     /** la locale a utiliser si aucune n'est preciser pendant l'init */
     protected final Locale defaultLocale;
 
+    /** le language actuellement utilise */
+    protected Language language;
+
+    /** le cache de languages deja charges */
+    protected List<Language> languages;
+
+
     public I18nLoader(String encoding, Locale defaultLocale) {
         this.encoding = encoding;
         this.defaultLocale = defaultLocale;
@@ -47,51 +64,51 @@
         return defaultLocale;
     }
 
+    /**
+     * @return le language actuellement utilise (ou null si aucun language
+     *         positionne )
+     */
     public Language getLanguage() {
-        return LanguageManager.getLanguage();
+        return language;
     }
 
     /**
      * Initialise la librairie
      *
-     * @param extraUrl some extra urls where to find bundles
      */
-    protected void init(URL... extraUrl) {
-        init(defaultLocale, extraUrl);
+    protected void init() {
+        init(defaultLocale);
     }
 
     /**
      * Initialise la librairie
      *
      * @param newLocale la locale a charger
-     * @param extraUrl  some extra urls where to find bundles
      */
-    protected void init(Locale newLocale, URL... extraUrl) {
+    protected void init(Locale newLocale) {
         if (newLocale == null) {
-            newLocale = defaultLocale;
+            init(null, null);
         }
-        setLanguage(newLocale, encoding, extraUrl);
+        setLanguage(newLocale);
     }
 
+
     /**
      * Initialise la librairie
      *
      * @param language une chaine representant la langue à utiliser fr, en, ...
-     * @param extraUrl some extra urls where to find bundles
      */
-    protected void init(String language, URL... extraUrl) {
-        init(language, null, extraUrl);
+    protected void init(String language) {
+        init(language, null);
     }
 
-
     /**
      * Initialise la librairie
      *
      * @param language une chaine representant la langue à utiliser fr, en, ...
      * @param country  une chaine representant le pays à utiliser FR, GB, ...
-     * @param extraUrl some extra urls where to find bundles
      */
-    protected void init(String language, String country, URL... extraUrl) {
+    protected void init(String language, String country) {
         if (language == null) {
             language = System.getProperty("user.language", defaultLocale.getLanguage());
         }
@@ -99,20 +116,82 @@
             country = System.getProperty("user.country", defaultLocale.getCountry());
         }
         Locale newLocale = newLocale(language + "_" + country);
+        if (newLocale == null) {
+            newLocale = defaultLocale;
+        }
+        setLanguage(newLocale);
+    }
 
-        setLanguage(newLocale, encoding, extraUrl);
+    public static Locale newLocale(String str) {
+        try {
+            return ConverterUtil.convert(Locale.class, str);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    protected void setLanguage(Locale newLocale, String toEncoding, URL... extraUrl) {
-        // delegate to LanguageManager
-        LanguageManager.setLanguage(newLocale, toEncoding, extraUrl);
+    /**
+     * Positionne un nouveau language. Si celui n'existe pas déjà dans le cache,
+     * alors il est crée.
+     *
+     * @param locale   la locale du language requis
+     */
+    public synchronized void setLanguage(Locale locale) {
+
+        Language result = getLanguage(locale);
+        if (result == null) {
+            result = addLanguage(locale);
+        } else {
+            log.debug("using cached " + result);
+        }
+        language = result;
     }
 
-    public static Locale newLocale(String str) {
-        return ConverterUtil.convert(Locale.class, str);
+    /**
+     * @param locale la locale du language recherche
+     * @return le language trouve dans le cache, ou null.
+     */
+    public Language getLanguage(Locale locale) {
+
+        if (!(languages == null || languages.isEmpty())) {
+            for (Language language : languages) {
+                if (locale.equals(language.getLocale())) {
+                    return language;
+                }
+            }
+        }
+        return null;
     }
 
     public void close() {
-        //TODO
+        if (languages != null) {
+            log.info("nb languages: "+languages.size());
+            for (Language language1 : languages) {
+                language1.close();
+            }
+            languages.clear();
+            languages = null;
+        }
+        I18nBundleManager.getInstance().close();
+    }
+
+
+    /** @return le cache de language avec instanciation paresseuse */
+    protected List<Language> getLanguages() {
+        if (languages == null) {
+            languages = new ArrayList<Language>();
+        }
+        return languages;
     }
+
+    protected Language addLanguage(Locale locale) {
+        Language result;
+        result = Language.newLanguage(locale, encoding);
+        if (log.isDebugEnabled()) {
+            log.debug(result);
+        }
+        getLanguages().add(result);
+        return result;
+    }
+
 }