- Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1302 - lutinutil/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 09:28:05 +0000 (Wed, 07 Jan 2009) New Revision: 1302 Modified: lutinutil/trunk/changelog.txt lutinutil/trunk/pom.xml Log: release Modified: lutinutil/trunk/changelog.txt =================================================================== --- lutinutil/trunk/changelog.txt 2009-01-07 08:29:41 UTC (rev 1301) +++ lutinutil/trunk/changelog.txt 2009-01-07 09:28:05 UTC (rev 1302) @@ -1,4 +1,4 @@ -ver 1.0.2 ??? 200901?? +ver 1.0.2 chemit 20090107 * 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 Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2009-01-07 08:29:41 UTC (rev 1301) +++ lutinutil/trunk/pom.xml 2009-01-07 09:28:05 UTC (rev 1302) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,13 +11,13 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.2</version> + <version>3.3</version> </parent> <artifactId>lutinutil</artifactId> - + <version>1.0.2-SNAPSHOT</version> - + <dependencies> <dependency> @@ -70,7 +71,7 @@ <labs.project>lutinutil</labs.project> -  +  <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> </properties> @@ -92,24 +93,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/deps.xml</descriptor> - <descriptor>src/main/assembly/full.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> @@ -125,4 +108,36 @@ <url>${maven.scm.url}</url> </scm> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>

1 0

[Lutinutil-commits] r1301 - lutinutil/trunk maven-i18n-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 08:29:41 +0000 (Wed, 07 Jan 2009) New Revision: 1301 Modified: lutinutil/trunk/pom.xml maven-i18n-plugin/trunk/pom.xml Log: push back scm generic values! (for others too...) Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2009-01-07 08:24:45 UTC (rev 1300) +++ lutinutil/trunk/pom.xml 2009-01-07 08:29:41 UTC (rev 1301) @@ -120,9 +120,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinutil/trunk…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project> Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:24:45 UTC (rev 1300) +++ maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:29:41 UTC (rev 1301) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,7 +16,7 @@ <artifactId>maven-i18n-plugin</artifactId> <version>0.9-SNAPSHOT</version> - + <dependencies> <dependency> @@ -64,7 +65,7 @@ <packaging>maven-plugin</packaging> - <build> + <build> <defaultGoal>install</defaultGoal> </build> @@ -84,10 +85,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> -</project> - +</project> \ No newline at end of file

1 0

[Lutinutil-commits] r1300 - maven-i18n-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 08:24:45 +0000 (Wed, 07 Jan 2009) New Revision: 1300 Modified: maven-i18n-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:24:42 UTC (rev 1299) +++ maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:24:45 UTC (rev 1300) @@ -14,7 +14,7 @@ <artifactId>maven-i18n-plugin</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> <dependencies> @@ -84,9 +84,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> </scm> </project>

1 0

[Lutinutil-commits] r1299 - in maven-i18n-plugin/tags: . 0.8
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 08:24:42 +0000 (Wed, 07 Jan 2009) New Revision: 1299 Added: maven-i18n-plugin/tags/0.8/ maven-i18n-plugin/tags/0.8/changelog.txt maven-i18n-plugin/tags/0.8/pom.xml Removed: maven-i18n-plugin/tags/0.8/changelog.txt maven-i18n-plugin/tags/0.8/pom.xml Log: [maven-release-plugin] copy for tag 0.8 Copied: maven-i18n-plugin/tags/0.8 (from rev 1296, maven-i18n-plugin/trunk) Deleted: maven-i18n-plugin/tags/0.8/changelog.txt =================================================================== --- maven-i18n-plugin/trunk/changelog.txt 2009-01-05 08:25:16 UTC (rev 1296) +++ maven-i18n-plugin/tags/0.8/changelog.txt 2009-01-07 08:24:42 UTC (rev 1299) @@ -1,22 +0,0 @@ -0.8 chemit 200812?? - * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) - -0.7 chemit 20081117 - * 20081205 [chemit] use lutinpluginproject 3.2 -ver-0-7 chemit 20081117 - * 20081118 [chemit] use lutinpluginproject 3.1 - * 20081026 [chemit] add xworks validator parse - * 20081026 [chemit] improve parser mojo logging - -ver-0-6 thimel 20080922 - * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) - * 20080922 [thimel] Using lutinpluginproject 3.0 - -ver-0-5 chemit 20080824 - * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 - * 20080824 [chemit] suppresion dependance lutinutil - * 20080824 [chemit] passage du projet en utf8 - * 20080824 [chemit] passage en maven 2 layout directory - -ver-0-4 - * [chemit] pas maintenu avant ! Copied: maven-i18n-plugin/tags/0.8/changelog.txt (from rev 1297, maven-i18n-plugin/trunk/changelog.txt) =================================================================== --- maven-i18n-plugin/tags/0.8/changelog.txt (rev 0) +++ maven-i18n-plugin/tags/0.8/changelog.txt 2009-01-07 08:24:42 UTC (rev 1299) @@ -0,0 +1,22 @@ +0.8 chemit 20090107 + * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) + +0.7 chemit 20081117 + * 20081205 [chemit] use lutinpluginproject 3.2 +ver-0-7 chemit 20081117 + * 20081118 [chemit] use lutinpluginproject 3.1 + * 20081026 [chemit] add xworks validator parse + * 20081026 [chemit] improve parser mojo logging + +ver-0-6 thimel 20080922 + * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) + * 20080922 [thimel] Using lutinpluginproject 3.0 + +ver-0-5 chemit 20080824 + * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 + * 20080824 [chemit] suppresion dependance lutinutil + * 20080824 [chemit] passage du projet en utf8 + * 20080824 [chemit] passage en maven 2 layout directory + +ver-0-4 + * [chemit] pas maintenu avant ! Deleted: maven-i18n-plugin/tags/0.8/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-01-05 08:25:16 UTC (rev 1296) +++ maven-i18n-plugin/tags/0.8/pom.xml 2009-01-07 08:24:42 UTC (rev 1299) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>maven-i18n-plugin</artifactId> - - <version>0.8-SNAPSHOT</version> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinprocessor</artifactId> - <version>0.15</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> - <scope>compile</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Plugin maven pour lutini18n</name> - <description> - Plugin pour maven 2 pour la génération des bundles pour l'internationnalisation des applications java fait par - lutinutil-i18n - </description> - <inceptionYear>2007</inceptionYear> - -  -  -  - - <packaging>maven-plugin</packaging> - - <build> - <defaultGoal>install</defaultGoal> - </build> - - <properties> - -  - <labs.id>12</labs.id> - -  - <labs.project>lutinutil</labs.project> - - </properties> - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> - Copied: maven-i18n-plugin/tags/0.8/pom.xml (from rev 1298, maven-i18n-plugin/trunk/pom.xml) =================================================================== --- maven-i18n-plugin/tags/0.8/pom.xml (rev 0) +++ maven-i18n-plugin/tags/0.8/pom.xml 2009-01-07 08:24:42 UTC (rev 1299) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>maven-i18n-plugin</artifactId> + + <version>0.8</version> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinprocessor</artifactId> + <version>0.15</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven pour lutini18n</name> + <description> + Plugin pour maven 2 pour la génération des bundles pour l'internationnalisation des applications java fait par + lutinutil-i18n + </description> + <inceptionYear>2007</inceptionYear> + +  +  +  + + <packaging>maven-plugin</packaging> + + <build> + <defaultGoal>install</defaultGoal> + </build> + + <properties> + +  + <labs.id>12</labs.id> + +  + <labs.project>lutinutil</labs.project> + + </properties> + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> + </scm> + +</project> +

1 0

[Lutinutil-commits] r1298 - maven-i18n-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 08:24:38 +0000 (Wed, 07 Jan 2009) New Revision: 1298 Modified: maven-i18n-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.8 Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:23:42 UTC (rev 1297) +++ maven-i18n-plugin/trunk/pom.xml 2009-01-07 08:24:38 UTC (rev 1298) @@ -14,7 +14,7 @@ <artifactId>maven-i18n-plugin</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> <dependencies> @@ -84,9 +84,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.8</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> </scm> </project>

1 0

[Lutinutil-commits] r1297 - maven-i18n-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jan '09

07 Jan '09

Author: tchemit Date: 2009-01-07 08:23:42 +0000 (Wed, 07 Jan 2009) New Revision: 1297 Modified: maven-i18n-plugin/trunk/changelog.txt Log: do release :) Modified: maven-i18n-plugin/trunk/changelog.txt =================================================================== --- maven-i18n-plugin/trunk/changelog.txt 2009-01-05 08:25:16 UTC (rev 1296) +++ maven-i18n-plugin/trunk/changelog.txt 2009-01-07 08:23:42 UTC (rev 1297) @@ -1,4 +1,4 @@ -0.8 chemit 200812?? +0.8 chemit 20090107 * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) 0.7 chemit 20081117

1 0

[Lutinutil-commits] r1296 - lutinutil/trunk lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle lutinutil/trunk/src/main/java/org/codelutin/util maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl
by tchemit＠users.labs.libre-entreprise.org 05 Jan '09

05 Jan '09

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); } }

1 0

[Lutinutil-commits] r1295 - in lutinutil/trunk: . src/main src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 10:14:33 +0000 (Mon, 22 Dec 2008) New Revision: 1295 Added: lutinutil/trunk/src/main/assembly/ lutinutil/trunk/src/main/assembly/deps.xml lutinutil/trunk/src/main/assembly/full.xml Modified: lutinutil/trunk/pom.xml Log: Configuration du plugin assembly Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2008-12-22 09:16:41 UTC (rev 1294) +++ lutinutil/trunk/pom.xml 2008-12-22 10:14:33 UTC (rev 1295) @@ -92,9 +92,22 @@ </executions> </plugin> -  <plugin> - <artifactId>maven-javadoc-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> </plugins> Added: lutinutil/trunk/src/main/assembly/deps.xml =================================================================== --- lutinutil/trunk/src/main/assembly/deps.xml (rev 0) +++ lutinutil/trunk/src/main/assembly/deps.xml 2008-12-22 10:14:33 UTC (rev 1295) @@ -0,0 +1,33 @@ +<assembly> + <id>deps</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <source>target/${artifact.artifactId}-${artifact.version}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: lutinutil/trunk/src/main/assembly/full.xml =================================================================== --- lutinutil/trunk/src/main/assembly/full.xml (rev 0) +++ lutinutil/trunk/src/main/assembly/full.xml 2008-12-22 10:14:33 UTC (rev 1295) @@ -0,0 +1,37 @@ +<assembly> + <id>full</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> + <source>target/${artifact.artifactId}-${artifact.version}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file

1 0

[Lutinutil-commits] r1294 - lutinutil/trunk
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 09:16:41 +0000 (Mon, 22 Dec 2008) New Revision: 1294 Modified: lutinutil/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2008-12-22 09:16:38 UTC (rev 1293) +++ lutinutil/trunk/pom.xml 2008-12-22 09:16:41 UTC (rev 1294) @@ -15,7 +15,7 @@ <artifactId>lutinutil</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <dependencies> @@ -107,9 +107,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/tags/lutinutil-1.0.1</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/tags/lutinutil-1.0.1</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinutil/tags/…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinutil/trunk…</url> </scm> </project>

1 0

[Lutinutil-commits] r1293 - in lutinutil/tags: . lutinutil-1.0.1 lutinutil-1.0.1/src/main/java/org/codelutin/i18n
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 09:16:38 +0000 (Mon, 22 Dec 2008) New Revision: 1293 Added: lutinutil/tags/lutinutil-1.0.1/ lutinutil/tags/lutinutil-1.0.1/pom.xml lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/I18nf.java lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java Removed: lutinutil/tags/lutinutil-1.0.1/pom.xml lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java Log: [maven-release-plugin] copy for tag lutinutil-1.0.1 Copied: lutinutil/tags/lutinutil-1.0.1 (from rev 1287, lutinutil/trunk) Deleted: lutinutil/tags/lutinutil-1.0.1/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2008-12-15 02:11:01 UTC (rev 1287) +++ lutinutil/tags/lutinutil-1.0.1/pom.xml 2008-12-22 09:16:38 UTC (rev 1293) @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>lutinutil</artifactId> - - <version>1.1-SNAPSHOT</version> - - <dependencies> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - <scope>compile</scope> - </dependency> - - </dependencies> - - -  -  -  - - <name>Lutin utilities library</name> - <description>Library of usefull class to be used in any project.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> - - <labs.id>12</labs.id> - - <labs.project>lutinutil</labs.project> - -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - </properties> - - <build> - - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: lutinutil/tags/lutinutil-1.0.1/pom.xml (from rev 1292, lutinutil/trunk/pom.xml) =================================================================== --- lutinutil/tags/lutinutil-1.0.1/pom.xml (rev 0) +++ lutinutil/tags/lutinutil-1.0.1/pom.xml 2008-12-22 09:16:38 UTC (rev 1293) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>lutinutil</artifactId> + + <version>1.0.1</version> + + <dependencies> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + <scope>compile</scope> + </dependency> + + </dependencies> + + +  +  +  + + <name>Lutin utilities library</name> + <description>Library of usefull class to be used in any project.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <labs.id>12</labs.id> + + <labs.project>lutinutil</labs.project> + +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + </properties> + + <build> + + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/tags/lutinutil-1.0.1</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutinutil/lutinutil/tags/lutinutil-1.0.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinutil/tags/…</url> + </scm> + +</project> Copied: lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/I18nf.java (from rev 1290, lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nf.java) =================================================================== --- lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/I18nf.java (rev 0) +++ lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/I18nf.java 2008-12-22 09:16:38 UTC (rev 1293) @@ -0,0 +1,34 @@ +/* *##% Lutin utilities library + * Copyright (C) 2004 - 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + +package org.codelutin.i18n; + +/** + * Transition class during project switch between MessageFormat.format syntax + * to String.format syntax. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + * + * @deprecated Use I18n class instead. + */ +public class I18nf extends I18n { + +} \ No newline at end of file Deleted: lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java 2008-12-15 02:11:01 UTC (rev 1287) +++ lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java 2008-12-22 09:16:38 UTC (rev 1293) @@ -1,205 +0,0 @@ -/* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ - -/** - * Language.java - */ - -package org.codelutin.i18n; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.bundle.I18nBundleManager; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URLClassLoader; -import java.util.Enumeration; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.Properties; - -/** - * This class is used by the i18n class. It encapsulates the translation - * resource for a given language. - * <p/> - * Encoding to be used to read properties files will be ISO-8859-1 since java does it like this. - */ -public class Language { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final Log log = LogFactory.getLog(Language.class); - - public static URLClassLoader getLoader() { - ClassLoader loader = Language.class.getClassLoader(); - if (loader instanceof URLClassLoader) { - return (URLClassLoader) loader; - } - log.warn("could not find the URLClassLoader : "+loader); - return null; - } - - /** toutes les traductions pour cette langue */ - protected Properties resource; - - /** la locale de la langue */ - protected Locale locale; - - /** @param l the current locale of the language */ - public Language(Locale l) { - this.locale = l; - } - - /** - * charge les traductions de la langue. - * <p/> - * recherche dans un premier temps, les urls des bundles puis les charge. - * - * @param bundleManager the used bundle manager - */ - public void load(I18nBundleManager bundleManager) { - // make sure the bundlemanager is init - bundleManager.init(); - // load resources from bundles - resource = new Properties(); - // get bundles for this locale - try { - bundleManager.load(this, resource); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 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); - return sentence; - } - try { - String result = resource.getProperty(sentence); - if (null != result && !"".equals(result)) { - return result; - } - recordNotFound(sentence); - return sentence; - } catch (MissingResourceException eee) { - log.warn("Resource " + sentence + " unavailable"); - return sentence; - } catch (Exception eee) { - log.error("Unexpected error while translating : " + eee); - return sentence; - } - } - - private void recordNotFound(String key) { - if (I18n.recordFilePath != null && key != null && !"".equals(key)) { - File f = new File(I18n.recordFilePath); - Properties recordProps = new Properties(); - try { - if (f.exists()) { - FileInputStream fis = new FileInputStream(f); - recordProps.load(fis); - fis.close(); - } - recordProps.put(key, ""); - FileOutputStream fos = new FileOutputStream(f); - recordProps.store(fos, "Adding the key : " + key); - fos.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - /** - * 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; - } - try { - Enumeration<?> e = resource.propertyNames(); - // Look for the given sentence through all translations - while (e.hasMoreElements()) { - String key = (String) e.nextElement(); - String translation = resource.getProperty(key); - // If found returns the corresponding key - if (sentence.equals(translation)) { - return key; - } - } - } catch (MissingResourceException eee) { - // Well, this can't happen... - } - // No such translated sentence in our resourceBundle - return sentence; - } - - public Locale getLocale() { - return locale; - } - - public int size() { - 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) { - return this == o || o instanceof Language && locale.equals(((Language) o).locale); - } - - @Override - public int hashCode() { - return locale.hashCode(); - } - - @Override - public String toString() { - return "Language <locale: " + locale + ",nbStences:" + (size()) + ">"; - } -} Copied: lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java (from rev 1289, lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java) =================================================================== --- lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java (rev 0) +++ lutinutil/tags/lutinutil-1.0.1/src/main/java/org/codelutin/i18n/Language.java 2008-12-22 09:16:38 UTC (rev 1293) @@ -0,0 +1,206 @@ +/* *##% Lutin utilities library + * Copyright (C) 2004 - 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + +/** + * Language.java + */ + +package org.codelutin.i18n; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URLClassLoader; +import java.util.Enumeration; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.i18n.bundle.I18nBundleManager; +import org.codelutin.util.RecursiveProperties; + +/** + * This class is used by the i18n class. It encapsulates the translation + * resource for a given language. + * <p/> + * Encoding to be used to read properties files will be ISO-8859-1 since java does it like this. + */ +public class Language { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static final Log log = LogFactory.getLog(Language.class); + + public static URLClassLoader getLoader() { + ClassLoader loader = Language.class.getClassLoader(); + if (loader instanceof URLClassLoader) { + return (URLClassLoader) loader; + } + log.warn("could not find the URLClassLoader : "+loader); + return null; + } + + /** toutes les traductions pour cette langue */ + protected Properties resource; + + /** la locale de la langue */ + protected Locale locale; + + /** @param l the current locale of the language */ + public Language(Locale l) { + this.locale = l; + } + + /** + * charge les traductions de la langue. + * <p/> + * recherche dans un premier temps, les urls des bundles puis les charge. + * + * @param bundleManager the used bundle manager + */ + public void load(I18nBundleManager bundleManager) { + // make sure the bundlemanager is init + bundleManager.init(); + // load resources from bundles + resource = new RecursiveProperties(); + // get bundles for this locale + try { + bundleManager.load(this, resource); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 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); + return sentence; + } + try { + String result = resource.getProperty(sentence); + if (null != result && !"".equals(result)) { + return result; + } + recordNotFound(sentence); + return sentence; + } catch (MissingResourceException eee) { + log.warn("Resource " + sentence + " unavailable", eee); + return sentence; + } catch (Exception eee) { + log.error("Unexpected error while translating : ", eee); + return sentence; + } + } + + private void recordNotFound(String key) { + if (I18n.recordFilePath != null && key != null && !"".equals(key)) { + File f = new File(I18n.recordFilePath); + Properties recordProps = new Properties(); + try { + if (f.exists()) { + FileInputStream fis = new FileInputStream(f); + recordProps.load(fis); + fis.close(); + } + recordProps.put(key, ""); + FileOutputStream fos = new FileOutputStream(f); + recordProps.store(fos, "Adding the key : " + key); + fos.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + /** + * 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; + } + try { + Enumeration<?> e = resource.propertyNames(); + // Look for the given sentence through all translations + while (e.hasMoreElements()) { + String key = (String) e.nextElement(); + String translation = resource.getProperty(key); + // If found returns the corresponding key + if (sentence.equals(translation)) { + return key; + } + } + } catch (MissingResourceException eee) { + // Well, this can't happen... + } + // No such translated sentence in our resourceBundle + return sentence; + } + + public Locale getLocale() { + return locale; + } + + public int size() { + 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) { + return this == o || o instanceof Language && locale.equals(((Language) o).locale); + } + + @Override + public int hashCode() { + return locale.hashCode(); + } + + @Override + public String toString() { + return "Language <locale: " + locale + ",nbStences:" + (size()) + ">"; + } +}

1 0