Index: lutinutil/src/java/org/codelutin/i18n/Language.java diff -u lutinutil/src/java/org/codelutin/i18n/Language.java:1.5 lutinutil/src/java/org/codelutin/i18n/Language.java:1.6 --- lutinutil/src/java/org/codelutin/i18n/Language.java:1.5 Fri Feb 8 15:17:24 2008 +++ lutinutil/src/java/org/codelutin/i18n/Language.java Fri Feb 8 15:30:16 2008 @@ -35,9 +35,10 @@ import java.util.Locale; import java.util.MissingResourceException; import java.util.Properties; -import java.util.logging.Logger; import org.codelutin.util.Resource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * This class is used byte the i18n class. It encapsulates the translation @@ -45,7 +46,10 @@ */ public class Language { - protected Properties resource; + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static final Log log = LogFactory.getLog(Language.class); + + protected Properties resource; protected Locale locale; public Language(Locale l,String toEncoding) { @@ -56,13 +60,15 @@ resource = new Properties(); List urls = Resource.getURLs(filename); for (URL url : urls) { - Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); + log.info("Langue file URL:" + url); + // Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); I18nFileReader fileReader = new I18nFileReader(); fileReader.load2(url.openStream(), toEncoding); resource.putAll(fileReader); } } catch (Exception eee) { - Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); + log.warn("Unable to load language file: " + filename); + //Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); resource = null; continue; } @@ -82,13 +88,15 @@ resource = new Properties(); List urls = Resource.getURLs(filename); for (URL url : urls) { - Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); + log.info("Langue file URL:" + url); + //Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); I18nFileReader fileReader = new I18nFileReader(); fileReader.load2(url.openStream(), "UTF-8"); resource.putAll(fileReader); } } catch (Exception eee) { - Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); + log.warn("Unable to load language file: " + filename); + //Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); resource = null; continue; } @@ -137,13 +145,13 @@ recordNotFound(sentence); return sentence; } catch (MissingResourceException eee) { - Logger.getLogger("org.codelutin.i18n.Language.translate").info( - "Resource " + sentence + " unavailable"); + log.warn("Resource " + sentence + " unavailable"); + //Logger.getLogger("org.codelutin.i18n.Language.translate").info("Resource " + sentence + " unavailable"); return sentence; } catch (Exception eee) { - Logger.getLogger("org.codelutin.i18n.Language.translate").severe( - "Unexpected error while translating : " + eee); - return sentence; + log.error("Unexpected error while translating : " + eee); + //Logger.getLogger("org.codelutin.i18n.Language.translate").severe("Unexpected error while translating : " + eee); + return sentence; } } @@ -195,17 +203,6 @@ return sentence; } - @Override - public boolean equals(Object o) { - return this == o || o instanceof Language && - locale.equals(((Language) o).locale); - } - - @Override - public int hashCode() { - return locale.hashCode(); - } - public Locale getLocale() { return locale; }