Author: tchemit Date: 2009-01-05 08:25:16 +0000 (Mon, 05 Jan 2009) New Revision: 1296 Modified: lutinutil/trunk/changelog.txt lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java lutinutil/trunk/src/main/java/org/codelutin/util/FileUtil.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java Log: - add getCurrentDirectory method in FileUtil - modify I18n loading to not override sentences with empty value are found and there is already a none empty value loaded Modified: lutinutil/trunk/changelog.txt =================================================================== --- lutinutil/trunk/changelog.txt 2008-12-22 10:14:33 UTC (rev 1295) +++ lutinutil/trunk/changelog.txt 2009-01-05 08:25:16 UTC (rev 1296) @@ -1,4 +1,11 @@ -ver 1.0 ??? ??? +ver 1.0.2 ??? 200901?? + * 20090105 [chemit] add getCurrentDirectory method in FileUtil + * 20090104 [chemit] modify I18n loading to not override sentences with empty value are found and there is already a + none empty value loaded + +ver 1.0.1 chatellier 20081210 + +ver 1.0 chemit 20081210 * 20081205 [chemit] use lutinproject 3.2 * 20081120 [chatellier] Remove deprecated HashMapMultiKey * 20081120 [chatellier] Fix i18n lutinutil properties files Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java 2008-12-22 10:14:33 UTC (rev 1295) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java 2009-01-05 08:25:16 UTC (rev 1296) @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ package org.codelutin.i18n.bundle; +import org.codelutin.i18n.I18n; import org.codelutin.i18n.I18nFileReader; -import org.codelutin.i18n.I18n; import java.io.IOException; import java.io.InputStream; @@ -137,7 +137,20 @@ sb.append(I18n.ISO_8859_1_ENCONDING).append(" : ").append(entry).append("\n"); } } - resource.putAll(fileReader); + for (Entry<Object, Object> entry : fileReader.entrySet()) { + String key = (String) entry.getKey(); + String value = (String) entry.getValue(); + if (value.trim().isEmpty()) { + // if there is a previous sentence loaded but not empty + // do not override it + String oldValue = (String) resource.get(key); + if (oldValue != null) { + continue; + } + } + resource.put(key, value); + } + //resource.putAll(fileReader); if (I18nBundle.log.isDebugEnabled()) { sb.append("nbSentences : ").append(fileReader.size()).append("\n"); sb.append("====================================="); Modified: lutinutil/trunk/src/main/java/org/codelutin/util/FileUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/FileUtil.java 2008-12-22 10:14:33 UTC (rev 1295) +++ lutinutil/trunk/src/main/java/org/codelutin/util/FileUtil.java 2009-01-05 08:25:16 UTC (rev 1296) @@ -65,6 +65,10 @@ currentDirectory = dir; } + static public File getCurrentDirectory() { + return currentDirectory; + } + static public class PatternChooserFilter extends javax.swing.filechooser.FileFilter { protected String pattern = null; protected String description = null; Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java 2008-12-22 10:14:33 UTC (rev 1295) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java 2009-01-05 08:25:16 UTC (rev 1296) @@ -115,15 +115,20 @@ @Override public void parseFile(File srcFile) { + LineNumberReader lnr=null; + String line=null; try { + lnr = new LineNumberReader(new InputStreamReader(new FileInputStream(srcFile))); - LineNumberReader lnr = new LineNumberReader(new InputStreamReader(new FileInputStream(srcFile))); while (lnr.ready()) { - String line = lnr.readLine(); + line = lnr.readLine(); parseLine(srcFile, line); } } catch (Exception e) { + if (line!=null) { + getLog().error("could not parse line "+line); + } throw new ParserException(e); } }