Index: lutinutil/src/java/org/codelutin/i18n/Language.java diff -u lutinutil/src/java/org/codelutin/i18n/Language.java:1.1 lutinutil/src/java/org/codelutin/i18n/Language.java:1.2 --- lutinutil/src/java/org/codelutin/i18n/Language.java:1.1 Wed Oct 4 14:51:55 2006 +++ lutinutil/src/java/org/codelutin/i18n/Language.java Sat Nov 17 10:46:06 2007 @@ -47,9 +47,9 @@ public Language(Locale l) { String[] filenames = getFilenames(l); - for (int i = 0; i < filenames.length; i++) { + for (String filename : filenames) { try { - URL url = Resource.getURL(filenames[i]); + URL url = Resource.getURL(filename); Logger.getLogger("org.codelutin.i18n.Language.Language").info( "Langue file URL:" + url); resource = new I18nFileReader(); @@ -58,7 +58,7 @@ Logger .getLogger("org.codelutin.i18n.Language.Language") .warning( - "Unable to load language file: " + filenames[i]); + "Unable to load language file: " + filename); resource = null; continue; } @@ -77,7 +77,7 @@ String[] getFilenames(Locale l) { String prefix = "language"; String postfix = ".properties"; - ArrayList result = new ArrayList(); + java.util.List result = new ArrayList(); if (!"".equals(l.getLanguage())) { if (!"".equals(l.getCountry())) { result.add(prefix + "-" + l.getLanguage() + "_" @@ -86,13 +86,15 @@ result.add(prefix + "-" + l.getLanguage() + postfix); } result.add(prefix + postfix); - return (String[]) result.toArray(new String[result.size()]); + return result.toArray(new String[result.size()]); } /** * translate takes a sentence and returns its translation if found, the very * same string otherwise. - */ + * @param sentence sentence to translate + * @return translated sentence + */ public String translate(String sentence) { if (resource == null) { recordNotFound(sentence); @@ -140,7 +142,9 @@ /** * untranslate takes a translated sentence and returns the original one if * found, the very same string otherwise. - */ + * @param sentence sentence to untranslate + * @return untranslated sentence + */ public String untranslate(String sentence) { if (resource == null) return sentence;