- I18n-commits - mailman.cloud.codelutin.com

r1971 - in trunk/i18n-maven-plugin/src: main/java/org/nuiton/i18n/plugin/parser main/java/org/nuiton/i18n/plugin/parser/impl test/java/org/nuiton/i18n/plugin/parser test/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Aug. 29, 2012

Aug. 29, 2012

Author: tchemit Date: 2012-08-29 21:38:52 +0200 (Wed, 29 Aug 2012) New Revision: 1971 Url: http://nuiton.org/repositories/revision/i18n/1971 Log: fixes #2288: Add a acceptKeyFormat in parsers mojo to filter which incoming keys can be kept Added: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -30,8 +30,9 @@ import java.io.File; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; - /** * A abstract implementation of a {@link FileParser} with no logic. * @@ -53,15 +54,19 @@ private final String encoding; + protected final Pattern acceptKeyPattern; + protected AbstractFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { this.log = log; this.oldParser = oldParser; this.showTouchedFiles = showTouchedFiles; this.encoding = encoding; result = new SortedProperties(encoding); + this.acceptKeyPattern = acceptKeyPattern; } public boolean isShowTouchedFiles() { @@ -104,6 +109,13 @@ * @param key the i18n key to register */ protected void registerKey(String key) { + if (acceptKeyPattern != null) { + Matcher matcher = acceptKeyPattern.matcher(key); + if (!matcher.matches()) { + return; + } + } + Object value = oldParser.get(key); if (value == null) { // nouvelle clef du parser, on utilise la clef comme valeur @@ -112,6 +124,9 @@ // register result getResult().put(key, value); + // one key found in file, so file is marked as touched + setTouched(true); + //old code with event // String keyModified = key; // for (ParserEvent event : events) { Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -34,6 +34,7 @@ import java.io.File; import java.io.IOException; import java.util.List; +import java.util.regex.Pattern; /** * Abstract implementation for parsing goal. @@ -55,10 +56,11 @@ protected abstract File getDefaultBasedir(); /** + * @param acceptPattern optional pattern to accept incoming keys * @return a new file parser to be used in the parser consumer parserExecutor * @since 1.2 */ - public abstract FileParser newFileParser(); + public abstract FileParser newFileParser(Pattern acceptPattern); /** * @param entry the incoming source entry to attach to the file updater @@ -108,6 +110,18 @@ @Parameter(property = "i18n.force", defaultValue = "false") protected boolean force; + /** + * A regex pattern to accept incoming keys. + * + * Only incoming keys which match the pattern will be kept. + * + * @since 2.5 + */ + @Parameter(property = "i18n.acceptKeyFormat") + protected String acceptKeyFormat; + + protected Pattern acceptPattern; + private SortedProperties result; protected SortedProperties oldParser; @@ -160,6 +174,10 @@ } } + if (acceptKeyFormat != null) { + acceptPattern = Pattern.compile(acceptKeyFormat); + } + parserExecutor = new ParserExecutor(this); } @@ -225,7 +243,7 @@ String fileName = entry.getBasedir().getAbsolutePath() + File.separator + file1; File file = new File(fileName); - parserExecutor.addFile(newFileParser(), file); + parserExecutor.addFile(newFileParser(acceptPattern), file); } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -60,6 +60,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.regex.Pattern; /** * Abstract xml parser mojo. @@ -166,7 +167,7 @@ } @Override - public final FileParser newFileParser() { + public final FileParser newFileParser(Pattern acceptPattern) { DocumentBuilder builder; try { @@ -312,13 +313,14 @@ public XmlFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles, String rules, XPath xpath, DocumentBuilder builder, Map<String, String> namespaces, boolean verbose) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); this.xpath = xpath; this.rules = rules; this.builder = builder; @@ -408,7 +410,7 @@ key = extract(key); if (key != null) { - setTouched(true); +// setTouched(true); registerKey(key); } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -45,7 +45,9 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.regex.Pattern; /** * To detect from GWT java files new I18n keys, says content of patterns : @@ -142,11 +144,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new GWTJavaFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -157,8 +160,9 @@ public GWTJavaFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern,showTouchedFiles); } @@ -218,8 +222,8 @@ return; } - // one key found in file, so file is marked as touched - setTouched(true); +// // one key found in file, so file is marked as touched +// setTouched(true); // Found a i18n key, register it. if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -44,6 +44,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -108,11 +109,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new JavaFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -130,8 +132,9 @@ public JavaFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); } public Pattern getI18nPattern() { @@ -170,8 +173,8 @@ if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } - // one key found in file, so file is marked as touched - setTouched(true); +// // one key found in file, so file is marked as touched +// setTouched(true); // register key registerKey(key); Added: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java (rev 0) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -0,0 +1,212 @@ +package org.nuiton.i18n.plugin.parser.impl; + +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 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>. + * #L% + */ + +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.nuiton.i18n.plugin.parser.AbstractFileParser; +import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; +import org.nuiton.i18n.plugin.parser.FileParser; +import org.nuiton.i18n.plugin.parser.I18nSourceEntry; +import org.nuiton.i18n.plugin.parser.ParserException; +import org.nuiton.i18n.plugin.parser.SourceEntry; +import org.nuiton.io.FileUpdater; +import org.nuiton.io.MirroredFileUpdater; +import org.nuiton.io.SortedProperties; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * To parse struts2 jsp and obtain all keys. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +@Mojo(name = "parserStruts2", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) +public class ParserStruts2Mojo extends AbstractI18nParserMojo { + + public static final String DEFAULT_INCLUDES = "**/*.jsp"; + + /** Root directory of the default entry. */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp") + protected File defaultBasedir; + + /** + * Default included files to process (ant-like expression). + * <p/> + * <strong>Note:</strong> default value is **\/*.jsp + */ + @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) + protected String defaultIncludes; + + /** + * Defines the file name of the getter where to put detected i18n keys + * while getter phase. + * + * @since 2.0 + */ + @Parameter(property = "i18n.outputGetter", defaultValue = "struts2.getter") + protected String outputGetter; + + /** Exploded war Build directory (used to know if files in sources are up-to-date). */ + @Parameter(property = "i18n.explodedWarPath", defaultValue = "${project.build.directory}/${project.artifactId}-{project.version}") + protected File explodedWarPath; + + @Override + public String[] getDefaultIncludes() { + return new String[]{defaultIncludes}; + } + + @Override + public String[] getDefaultExcludes() { + return I18nSourceEntry.EMPTY_STRING_ARRAY; + } + + @Override + public File getDefaultBasedir() { + return defaultBasedir; + } + + @Override + public FileUpdater newFileUpdater(SourceEntry entry) { + return new MirroredFileUpdater("", "", entry.getBasedir(), explodedWarPath) { + + @Override + public File getMirrorFile(File f) { + String file = + f.getAbsolutePath().substring(prefixSourceDirecotory); + return new File(destinationDirectory + File.separator + file); + } + }; + } + + @Override + protected String getOutGetter() { + return outputGetter; + } + + @Override + public FileParser newFileParser(Pattern acceptPattern) { + + return new Struts2JspFileParser(getLog(), + encoding, + oldParser, + acceptPattern, + isShowTouchedFiles() + ); + } + + protected static class Struts2JspFileParser extends AbstractFileParser { + + /** + * Pattern used to detect i18n keys. + * + * @since 2.3 + */ + protected final Pattern i18nPattern = + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\""); + + protected final Pattern i18nPattern2 = + Pattern.compile("(?:text\\s*name='|key=')(.*?)'"); + + public Struts2JspFileParser(Log log, + String encoding, + SortedProperties oldParser, + Pattern acceptKeyPattern, + boolean showTouchedFiles) { + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); + } + + public Pattern getI18nPattern() { + return i18nPattern; + } + + @Override + public void parseFile(File file) throws IOException { + String line = null; + LineNumberReader lnr = new LineNumberReader(new InputStreamReader( + new FileInputStream(file), getEncoding())); + try { + while ((line = lnr.readLine()) != null) { + parseLine(file, line); + } + } catch (Exception e) { + if (line != null) { + getLog().error( + "could not parse line (" + lnr.getLineNumber() + ") '" + + line + "' of file " + file); + } + throw new ParserException(e); + } finally { + lnr.close(); + } + } + + @Override + public void parseLine(File file, String line) throws IOException { + + Matcher matcher = i18nPattern.matcher(line); + + boolean match = false; + while (matcher.find()) { + match = true; + String key = matcher.group(1); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } + // register key + registerKey(key); + } + + if (!match) { + + // try with second pattern + matcher = i18nPattern2.matcher(line); + + while (matcher.find()) { + String key = matcher.group(1); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } +// // one key found in file, so file is marked as touched +// setTouched(true); + + // register key + registerKey(key); + } + } + } + } + +} \ No newline at end of file Property changes on: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -154,6 +154,7 @@ return new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -108,6 +108,7 @@ XmlFileParser fileParser = new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -1,5 +1,29 @@ package org.nuiton.i18n.plugin.parser; +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 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>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; import org.nuiton.i18n.plugin.parser.impl.ParserJavaMojo; Property changes on: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -64,6 +64,7 @@ log, ENCODING, oldParser, + null, false) { @Override protected void registerKey(String key) { Added: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java (rev 0) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -0,0 +1,126 @@ +package org.nuiton.i18n.plugin.parser.impl; + +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 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>. + * #L% + */ + +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.io.SortedProperties; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * To tes the {@link ParserStruts2Mojo.Struts2JspFileParser} parser. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +public class Struts2JspFileParserTest { + + public static final String ENCODING = "utf-8"; + + protected static final SystemStreamLog log = new SystemStreamLog(); + + protected ParserStruts2Mojo.Struts2JspFileParser parser; + + protected SortedProperties oldParser; + + protected Set<String> detectedKeys; + + @Before + public void setUp() throws Exception { + oldParser = new SortedProperties(ENCODING); + + + parser = new ParserStruts2Mojo.Struts2JspFileParser( + log, + ENCODING, + oldParser, + Pattern.compile("^i18n\\..*$"), + false) { + @Override + protected void registerKey(String key) { + if (acceptKeyPattern != null) { + Matcher matcher = acceptKeyPattern.matcher(key); + if (!matcher.matches()) { + return; + } + } + detectedKeys.add(key); + } + }; + detectedKeys = new HashSet<String>(); + } + + @After + public void tearDown() throws Exception { + detectedKeys.clear(); + detectedKeys = null; + parser = null; + } + + @Test + public void getKeys() throws IOException { + + File file = new File("getKeys"); + String line; + + line = "label='%{getText(\"i18n.key1\")}'/>"; + parseLine(file, line, "i18n.key1"); + + line = "key=\"key22\" label='%{getText(\"i18n.key2\")}'/> "; + parseLine(file, line, "i18n.key2"); + } + + @Test + public void getKeys2() throws IOException { + + String line; + File file = new File("getKeys2"); + + line = "<s:text name=\"i18n.key3\"/>"; + parseLine(file, line, "i18n.key3"); + + line = "<s:text key='i18n.key4'/>"; + parseLine(file, line, "i18n.key4"); + } + + protected void parseLine(File f, String line, String... expectedKeys) throws IOException { + parser.parseLine(f, line); + for (String expectedKey : expectedKeys) { + + Assert.assertTrue("Key " + expectedKey + + " was expected from line " + line, + detectedKeys.contains(expectedKey)); + } + } +} Property changes on: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1970 - in trunk: i18n-maven-plugin/src/it/ano-1494/iso-8859-1 i18n-maven-plugin/src/it/ano-1494/migrate i18n-maven-plugin/src/it/ano-1494/utf-8 i18n-maven-plugin/src/it/ano-672 i18n-maven-plugin/src/it/evo-1507 i18n-maven-plugin/src/it/parsers/newProject i18n-maven-plugin/src/it/parsers/withNewKeys nuiton-i18n-editor/src/main/resources/i18n
by tchemit＠users.nuiton.org Aug. 29, 2012

Aug. 29, 2012

Author: tchemit Date: 2012-08-29 21:38:13 +0200 (Wed, 29 Aug 2012) New Revision: 1970 Url: http://nuiton.org/repositories/revision/i18n/1970 Log: add missing svn properties Modified: trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/goals.txt trunk/i18n-maven-plugin/src/it/ano-1494/migrate/goals.txt trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/goals.txt trunk/i18n-maven-plugin/src/it/ano-672/goals.txt trunk/i18n-maven-plugin/src/it/evo-1507/goals.txt trunk/i18n-maven-plugin/src/it/parsers/newProject/goals.txt trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/goals.txt trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/migrate/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-672/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/evo-1507/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/parsers/newProject/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1969 - trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Aug. 29, 2012

Aug. 29, 2012

Author: tchemit Date: 2012-08-29 21:37:13 +0200 (Wed, 29 Aug 2012) New Revision: 1969 Url: http://nuiton.org/repositories/revision/i18n/1969 Log: fixes #2289: Deprecate some parser (jsp, tapestry) : there are not enough efficient :( Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-08-29 19:36:40 UTC (rev 1968) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-08-29 19:37:13 UTC (rev 1969) @@ -51,6 +51,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 2.0 + * @deprecated since 2.5, hard to maintain jsp as valid xml docs. Will be removed soon */ @Mojo(name = "parserJsp", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserJspMojo extends AbstractParserXmlMojo { @@ -161,6 +162,7 @@ return new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2012-08-29 19:36:40 UTC (rev 1968) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2012-08-29 19:37:13 UTC (rev 1969) @@ -46,6 +46,7 @@ import java.io.LineNumberReader; import java.util.HashSet; import java.util.Set; +import java.util.regex.Pattern; /** * To parse Tapestry templates to detect new I18n keys, says content of patterns : @@ -57,6 +58,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 2.1 + * @deprecated since 2.5, Not very usefull, since not very efficient, will be removed soon. */ @Mojo(name = "parserTapestry", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserTapestryMojo extends AbstractI18nParserMojo { @@ -73,7 +75,7 @@ /** * Default included files to process (ant-like expression). - * + * <p/> * <strong>Note:</strong> default value is **\/*.tml * * @since 2.1 @@ -146,11 +148,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new TapestryFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -161,8 +164,9 @@ public TapestryFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); } @@ -222,8 +226,8 @@ return; } - // one key found in file, so file is marked as touched - setTouched(true); +// // one key found in file, so file is marked as touched +// setTouched(true); // Found a i18n key, register it. if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key);

1 0

r1968 - trunk
by tchemit＠users.nuiton.org Aug. 29, 2012

Aug. 29, 2012

Author: tchemit Date: 2012-08-29 21:36:40 +0200 (Wed, 29 Aug 2012) New Revision: 1968 Url: http://nuiton.org/repositories/revision/i18n/1968 Log: refs #2175: Updates to mavenpom 3.3.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 17:41:30 UTC (rev 1967) +++ trunk/pom.xml 2012-08-29 19:36:40 UTC (rev 1968) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.6</version> + <version>3.3.7-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -42,8 +42,6 @@ <modules> <module>nuiton-i18n</module> <module>i18n-maven-plugin</module> -  -  </modules> <dependencyManagement>

1 0

r1967 - in trunk: . i18n-maven-plugin i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl i18n-maven-plugin/src/main/resources
by tchemit＠users.nuiton.org Aug. 14, 2012

Aug. 14, 2012

Author: tchemit Date: 2012-08-14 19:41:30 +0200 (Tue, 14 Aug 2012) New Revision: 1967 Url: http://nuiton.org/repositories/revision/i18n/1967 Log: fixes #2175: Updates to mavenpom 3.3.6 fixes #2242: Error on validation compilation using nuiton-validator when no internet connection refs #928: Use maven-plugin-plugin 3 api (no need to have annotation in compile scope) Removed: trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.2.dtd trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.3.dtd Modified: trunk/i18n-maven-plugin/pom.xml trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/i18n-maven-plugin/pom.xml 2012-08-14 17:41:30 UTC (rev 1967) @@ -97,6 +97,12 @@ <artifactId>maven-plugin-annotations</artifactId> </dependency> +  + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> +  <dependency> <groupId>org.codehaus.plexus</groupId> Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-14 17:41:30 UTC (rev 1967) @@ -37,6 +37,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; import javax.xml.namespace.NamespaceContext; import javax.xml.parsers.DocumentBuilder; @@ -385,7 +386,7 @@ if (verbose) { getLog().info("Start parsing file " + fileToProcess); } - Document doc = builder.parse(fileToProcess.getAbsolutePath()); + Document doc = fileToDocument(fileToProcess); XPathExpression expression = xpath.compile(rules); NodeList list = (NodeList) expression.evaluate(doc, XPathConstants.NODESET); @@ -411,5 +412,9 @@ registerKey(key); } } + + protected Document fileToDocument(File fileToProcess) throws SAXException, IOException { + return builder.parse(fileToProcess.getAbsolutePath()); + } } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-14 17:41:30 UTC (rev 1967) @@ -25,6 +25,8 @@ package org.nuiton.i18n.plugin.parser.impl; +import com.opensymphony.xwork2.util.DomHelper; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -32,16 +34,16 @@ import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; -import org.xml.sax.EntityResolver; +import org.w3c.dom.Document; import org.xml.sax.InputSource; +import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.xpath.XPath; import java.io.File; import java.io.IOException; -import java.net.SocketTimeoutException; -import java.net.URL; -import java.net.URLConnection; +import java.util.HashMap; +import java.util.Map; /** * Find i18n keys from xworks xml validation files. @@ -56,8 +58,6 @@ public static final String DEFAULT_INCLUDES = "**/*-validation.xml"; - final URL xworksResource = getClass().getResource("/xwork-validator-1.0.2.dtd"); - /** Root directory of the default entry. */ @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/resources", required = true) protected File defaultBasedir; @@ -83,7 +83,7 @@ protected String coreRuleFile; /** - * Always use the local xowrks dtd to increase performance. + * Always use the local xworks dtd to increase performance. * * @since 1.6.0 */ @@ -99,7 +99,17 @@ @Parameter(property = "i18n.outputGetter", defaultValue = "validation.getter", required = true) protected String outputGetter; + private Map<String, String> dtdMappings; + public ParserValidationMojo() { + + dtdMappings = new HashMap<String, String>(); + dtdMappings.put("-//Apache Struts//XWork Validator 1.0//EN", "xwork-validator-1.0.dtd"); + dtdMappings.put("-//Apache Struts//XWork Validator 1.0.2//EN", "xwork-validator-1.0.2.dtd"); + dtdMappings.put("-//Apache Struts//XWork Validator 1.0.3//EN", "xwork-validator-1.0.3.dtd"); + } + + @Override public String[] getDefaultIncludes() { return new String[]{defaultIncludes}; @@ -141,9 +151,6 @@ protected XmlFileParser newXmlFileParser(final XPath xpath, final DocumentBuilder builder) { - // add cached entity resolver - builder.setEntityResolver(getEntityResolver()); - return new XmlFileParser(getLog(), encoding, oldParser, @@ -153,7 +160,15 @@ builder, namespaces, isVerbose()) { + @Override + protected Document fileToDocument(File fileToProcess) throws SAXException, IOException { + InputSource in = new InputSource(FileUtils.openInputStream(fileToProcess)); + Document doc = DomHelper.parse(in, dtdMappings); + return doc; + } + + @Override public String extract(String i18nString) { String s = null; if (!i18nString.trim().isEmpty()) { @@ -172,50 +187,4 @@ }; } - protected EntityResolver getEntityResolver() { - - return new EntityResolver() { - - public static final String XWORK_PUBLIC_ID = - "-//Apache Struts//XWork Validator 1.0.3//EN"; - - boolean useLocal = useLocalResolver; - - @Override - public InputSource resolveEntity(String publicId, - String systemId) throws IOException { - if (getLog().isDebugEnabled()) { - getLog().debug("publicID:" + publicId + ", systemId:" + - systemId); - } - if (XWORK_PUBLIC_ID.equals(publicId)) { - if (!useLocal) { - URL uri = new URL(systemId); - if (verbose) { - getLog().info("try to connect to " + uri); - } - URLConnection openConnection = uri.openConnection(); - openConnection.setUseCaches(true); - openConnection.setConnectTimeout(1000); - try { - openConnection.connect(); - return new InputSource( - openConnection.getInputStream()); - } catch (SocketTimeoutException e) { - useLocal = true; - } catch (IOException e) { - useLocal = true; - } - } - - // use directly local resource - InputSource inputSource = - new InputSource(xworksResource.openStream()); - return inputSource; - } - // use the default behaviour - return null; - } - }; - } } Deleted: trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.2.dtd =================================================================== --- trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.2.dtd 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.2.dtd 2012-08-14 17:41:30 UTC (rev 1967) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - -<!ELEMENT validators (field|validator)+> - -<!ELEMENT field (field-validator+)> -<!ATTLIST field - name CDATA #REQUIRED -> - -<!ELEMENT field-validator (param*, message)> -<!ATTLIST field-validator - type CDATA #REQUIRED - short-circuit (true|false) "false" -> - -<!ELEMENT validator (param*, message)> -<!ATTLIST validator - type CDATA #REQUIRED - short-circuit (true|false) "false" -> - -<!ELEMENT param (#PCDATA)> -<!ATTLIST param - name CDATA #REQUIRED -> - -<!ELEMENT message (#PCDATA)> -<!ATTLIST message - key CDATA #IMPLIED -> - - Deleted: trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.3.dtd =================================================================== --- trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.3.dtd 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/i18n-maven-plugin/src/main/resources/xwork-validator-1.0.3.dtd 2012-08-14 17:41:30 UTC (rev 1967) @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - -<!ELEMENT validators (field|validator)+> - -<!ELEMENT field (field-validator+)> -<!ATTLIST field - name CDATA #REQUIRED -> - -<!ELEMENT field-validator (param*, message)> -<!ATTLIST field-validator - type CDATA #REQUIRED - short-circuit (true|false) "false" -> - -<!ELEMENT validator (param*, message)> -<!ATTLIST validator - type CDATA #REQUIRED - short-circuit (true|false) "false" -> - -<!ELEMENT param (#PCDATA)> -<!ATTLIST param - name CDATA #REQUIRED -> - -<!ELEMENT message (#PCDATA|param)*> -<!ATTLIST message - key CDATA #IMPLIED -> - - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:50:14 UTC (rev 1966) +++ trunk/pom.xml 2012-08-14 17:41:30 UTC (rev 1967) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <artifactId>i18n</artifactId> @@ -154,9 +154,15 @@ <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>${pluginPluginVersion}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>2.3.4</version> + </dependency> +  <dependency> <groupId>org.codehaus.plexus</groupId>

1 0

r1966 - trunk
by tchemit＠users.nuiton.org Aug. 7, 2012

Aug. 7, 2012

Author: tchemit Date: 2012-08-07 09:50:14 +0200 (Tue, 07 Aug 2012) New Revision: 1966 Url: http://nuiton.org/repositories/revision/i18n/1966 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 16:44:49 UTC (rev 1965) +++ trunk/pom.xml 2012-08-07 07:50:14 UTC (rev 1966) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <artifactId>i18n</artifactId>

1 0

r1965 - in trunk: ant-i18n-task i18n-maven-plugin nuiton-i18n
by tchemit＠users.nuiton.org July 9, 2012

July 9, 2012

Author: tchemit Date: 2012-07-09 18:44:49 +0200 (Mon, 09 Jul 2012) New Revision: 1965 Url: http://nuiton.org/repositories/revision/i18n/1965 Log: remove svn properties from pom Modified: trunk/ant-i18n-task/pom.xml trunk/i18n-maven-plugin/pom.xml trunk/nuiton-i18n/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2012-07-09 13:53:44 UTC (rev 1964) +++ trunk/ant-i18n-task/pom.xml 2012-07-09 16:44:49 UTC (rev 1965) @@ -2,9 +2,6 @@ <!-- #%L I18n :: Ant task - - $Id$ - $HeadURL$ %% Copyright (C) 2010 CodeLutin %% Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-07-09 13:53:44 UTC (rev 1964) +++ trunk/i18n-maven-plugin/pom.xml 2012-07-09 16:44:49 UTC (rev 1965) @@ -2,9 +2,6 @@ <!-- #%L I18n :: Maven Plugin - - $Id$ - $HeadURL$ %% Copyright (C) 2007 - 2010 CodeLutin %% Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2012-07-09 13:53:44 UTC (rev 1964) +++ trunk/nuiton-i18n/pom.xml 2012-07-09 16:44:49 UTC (rev 1965) @@ -2,9 +2,6 @@ <!-- #%L I18n :: Api - - $Id$ - $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin %%

1 0

r1964 - in trunk/nuiton-i18n-editor: . src/main/java/org/nuiton/i18n/editor src/main/java/org/nuiton/i18n/editor/ui/project/tabs src/main/resources/i18n
by tchemit＠users.nuiton.org July 9, 2012

July 9, 2012

Author: tchemit Date: 2012-07-09 15:53:44 +0200 (Mon, 09 Jul 2012) New Revision: 1964 Url: http://nuiton.org/repositories/revision/i18n/1964 Log: fix build Added: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties Removed: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties Modified: trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) +++ trunk/nuiton-i18n-editor/pom.xml 2012-07-09 13:53:44 UTC (rev 1964) @@ -1,4 +1,25 @@ <?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"> @@ -50,7 +71,7 @@   - <name>Nuiton I18n Editor</name> + <name>I18n :: I18n Editor</name> <description>Editeur de fichier i18n</description> <inceptionYear>2008</inceptionYear> @@ -66,7 +87,6 @@    - <packaging>jar</packaging> <properties> @@ -77,7 +97,6 @@ <nuitonUtilsVersion>1.2</nuitonUtilsVersion>  - <licensePluginVersion>1.1</licensePluginVersion> <license.licenseName>gpl_v3</license.licenseName>  @@ -93,6 +112,7 @@ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss>  <license.generateBundle>true</license.generateBundle> @@ -165,7 +185,6 @@ <artifactId>i18n-maven-plugin</artifactId> <version>${project.version}</version> <configuration> - <silent>true</silent> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2012-07-09 13:19:33 UTC (rev 1963) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2012-07-09 13:53:44 UTC (rev 1964) @@ -25,12 +25,14 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.editor.ui.I18nEditorUI; import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; +import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.StringUtil; import javax.swing.SwingUtilities; import java.io.IOException; import java.util.Arrays; import java.util.Date; +import java.util.Locale; import static org.nuiton.i18n.I18n._; @@ -57,6 +59,8 @@ startingTime = System.nanoTime(); log.info("I18nEditor start at " + new Date() + " args: " + Arrays.toString(args)); + I18n.init(new DefaultI18nInitializer("nuiton-i18n-editor-i18n"), Locale.getDefault()); + try { I18nEditorContext context = init(args); @@ -135,7 +139,7 @@ config.parse(args); // init i18n - I18n.init(null, config.getLocale()); + I18n.init(new DefaultI18nInitializer("nuiton-i18n-editor-i18n"), config.getLocale()); log.info(_("i18neditor.message.config.loaded", config.getVersion())); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2012-07-09 13:53:44 UTC (rev 1964) @@ -26,13 +26,16 @@ implements='jaxx.runtime.swing.wizard.WizardStepUI<ProjectStep, ProjectUIModel>'> <import> -static org.nuiton.i18n.I18n.n_ org.nuiton.i18n.editor.I18nEditorContext org.nuiton.i18n.editor.I18nEditorConfig org.nuiton.i18n.editor.ui.I18nEditorUIHandler org.nuiton.i18n.editor.ui.project.ProjectStep org.nuiton.i18n.editor.ui.project.ProjectUIModel +javax.swing.border.LineBorder +javax.swing.JLabel +java.awt.Color +static org.nuiton.i18n.I18n.n_ static org.nuiton.i18n.I18n._ </import> Deleted: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties 2012-07-09 13:19:33 UTC (rev 1963) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties 2012-07-09 13:53:44 UTC (rev 1964) @@ -1,121 +0,0 @@ -i18neditor.about.message=<h3>Nuiton i18n editor</h3><hr/><p>Project realised by <a href\="http\://codelutin.com">Codelutin</a> in 2009.</p><br/><hr/>For more information, visit the <a href\="http\://maven-site.nuiton.org/i18n/i18neditor">project's site</a>. -i18neditor.action.about=About -i18neditor.action.about.tip=Show about screen -i18neditor.action.apply=Apply -i18neditor.action.apply.tip= -i18neditor.action.cancel=Cancel -i18neditor.action.cancel.tip=Cancel -i18neditor.action.choose.directory.source.description= -i18neditor.action.choose.jar.source= -i18neditor.action.choose.jar.source.description= -i18neditor.action.choose.project= -i18neditor.action.choose.project.description= -i18neditor.action.choose.projectDir= -i18neditor.action.closeProject=Close the project -i18neditor.action.commandline.configure=Configure the application -i18neditor.action.commandline.disable.main.ui=Do not launch main ui -i18neditor.action.commandline.help=Show this help -i18neditor.action.configuration=Preferences -i18neditor.action.configuration.tip=show preferences screen -i18neditor.action.create=Create -i18neditor.action.createProject=Create project -i18neditor.action.delete.key.tip= -i18neditor.action.deleteProject=Delete project -i18neditor.action.editProject=Modify project -i18neditor.action.exit=Exit -i18neditor.action.exit.tip=Quit -i18neditor.action.fullscreen=Full screen -i18neditor.action.fullscreen.tip=Go into full screen mode -i18neditor.action.goto.next.stage=Continue -i18neditor.action.goto.next.stage.tip= -i18neditor.action.goto.previous.stage=Go back -i18neditor.action.goto.previous.stage.tip= -i18neditor.action.help=Show help -i18neditor.action.help.tip=Show help -i18neditor.action.new.bundle=New -i18neditor.action.new.package=New -i18neditor.action.normalscreen=Frame mode -i18neditor.action.normalscreen.tip=Go back in frame mode -i18neditor.action.openOtherProject=Open other project -i18neditor.action.openProject=Open a project -i18neditor.action.reload.application= -i18neditor.action.reset.value.tip= -i18neditor.action.save.value.tip= -i18neditor.action.showHelp.tip=Show context sensitve help -i18neditor.action.site=Website -i18neditor.action.site.tip=Go to web site of application -i18neditor.bundle.name=Locale \: %1$s -i18neditor.choose.project.to.delete= -i18neditor.common.descrition= -i18neditor.common.resume=Resume -i18neditor.config.category.directories=Directories -i18neditor.config.category.directories.description=Directories used by the application -i18neditor.config.category.ui=Application -i18neditor.config.category.ui.description=Other options used by the application -i18neditor.config.configFileName.description=configuration file -i18neditor.config.defaultProjectsDirectory.description=default directory where to store project definitions (*.i18nproject) -i18neditor.config.defaultTmpDirectory.description=tempory directory used by the application -i18neditor.config.ui.fullscreen=choose initial ui mode (true for full screen, false otherwise) -i18neditor.config.ui.locale=Language used by application (fr_FR, en_GB) -i18neditor.createProject.table.bundles.select= -i18neditor.createProject.table.bundles.select.tip= -i18neditor.createProject.table.bundles.url= -i18neditor.createProject.table.bundles.url.tip= -i18neditor.createbundle.label=Create a new bundle for all packages known -i18neditor.createbundle.newlanguage=NEw language -i18neditor.createbundle.newlocale=New locale -i18neditor.createbundle.title=Create bundle -i18neditor.createpackage.label=Create a new package (for all bundles known) -i18neditor.createpackage.newpackage=NEw language -i18neditor.createpackage.title=Create package -i18neditor.createproject.common.select= -i18neditor.createproject.directory.source.label= -i18neditor.createproject.doPersist= -i18neditor.createproject.jar.source.label= -i18neditor.createproject.name.label= -i18neditor.createproject.no.type= -i18neditor.createproject.storeProject.directory= -i18neditor.createproject.storeProject.path= -i18neditor.createproject.uniqueJarDefinition= -i18neditor.createproject.uniqueJarDefinition.tip= -i18neditor.createproject.url= -i18neditor.init.closed=Application was closed at %1$s -i18neditor.init.context.done=Initialisation of context done in %1$s. -i18neditor.init.ui.done=GUI initialized -i18neditor.main.menu.file=File -i18neditor.menu.bundles=Bundles -i18neditor.menu.help=Help -i18neditor.menu.packages=Packages -i18neditor.menu.storeall=Save all -i18neditor.message.config.loaded=Config of nuiton-i18n-editor v %1$s was loaded. -i18neditor.message.help.usage=Help of nuiton-i18n-editor v %1$s -i18neditor.message.no.project.loaded=< No project loaded > -i18neditor.no.keys=< No defined key > -i18neditor.package.name=Package \: %1$s -i18neditor.project.info.tip=Click here to display project's informations -i18neditor.project.step.chooseProjectType= -i18neditor.project.step.chooseProjectType.description= -i18neditor.project.step.configureProject= -i18neditor.project.step.configureProject.description= -i18neditor.project.step.label= -i18neditor.project.step.persist= -i18neditor.project.step.persist.description= -i18neditor.project.step.resume= -i18neditor.project.step.resume.description= -i18neditor.project.step.selecteBundles= -i18neditor.project.step.selecteBundles.description= -i18neditor.project.type.directory= -i18neditor.project.type.directory.description= -i18neditor.project.type.jar= -i18neditor.project.type.jar.description= -i18neditor.resource.name=Resource \: %1$s -i18neditor.title=Nuiton i18n editor < Project %1$s > -i18neditor.title.about=About Nuiton i18n editor -i18neditor.title.choose.directory.source= -i18neditor.title.choose.jar.source= -i18neditor.title.choose.project= -i18neditor.title.choose.projectDir= -i18neditor.title.noproject=Nuiton i18n editor < no project loaded > -i18neditor.title.project.info=Project's informations -i18neditor.warning.nimbus.landf=Could not find nymbus look and feel, please use at least a 1.6u10 version of sun jre -i18neditor.warning.no.ui=No ui environment detected\! Deleted: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties 2012-07-09 13:19:33 UTC (rev 1963) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties 2012-07-09 13:53:44 UTC (rev 1964) @@ -1,121 +0,0 @@ -i18neditor.about.message=<h3>Nuiton i18n editor</h3><hr/><p>Projet r\u00E9alis\u00E9 par la soci\u00E9t\u00E9 <a href\="http\://codelutin.com">Codelutin</a> en 2009.</p><br/><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/i18n/i18neditor">site du projet</a>. -i18neditor.action.about=A propos -i18neditor.action.about.tip=Afficher l'a propos -i18neditor.action.apply=Appliquer -i18neditor.action.apply.tip=Appliquer -i18neditor.action.cancel=Annuler -i18neditor.action.cancel.tip=Annuler -i18neditor.action.choose.directory.source.description=R\u00E9pertoire -i18neditor.action.choose.jar.source=Choisir ce jar -i18neditor.action.choose.jar.source.description=Fichier jar (*.jar) -i18neditor.action.choose.project=Choisir ce projet -i18neditor.action.choose.project.description=Fichier de d\u00E9finition de project (*.i18nproject) -i18neditor.action.choose.projectDir=Choisir ce r\u00E9pertoire -i18neditor.action.closeProject=Fermer le projet -i18neditor.action.commandline.configure=Configurer l'application -i18neditor.action.commandline.disable.main.ui=Ne pas lancer l'interface graphique principale -i18neditor.action.commandline.help=Voir l'aide -i18neditor.action.configuration=Pr\u00E9f\u00E9rences -i18neditor.action.configuration.tip=Modifier les pr\u00E9f\u00E9rences -i18neditor.action.create=Cr\u00E9er -i18neditor.action.createProject=Cr\u00E9er un projet -i18neditor.action.delete.key.tip=Supprimer cette traduction -i18neditor.action.deleteProject=Supprimer un projet -i18neditor.action.editProject=Modifier le projet -i18neditor.action.exit=Quitter -i18neditor.action.exit.tip=Quitter l'application -i18neditor.action.fullscreen=Plein \u00E9cran -i18neditor.action.fullscreen.tip=Passer en mode Plein \u00E9cran -i18neditor.action.goto.next.stage=Continuer -i18neditor.action.goto.next.stage.tip=Continuer vers l'\u00E9tape suivante -i18neditor.action.goto.previous.stage=Revenir -i18neditor.action.goto.previous.stage.tip=Revenir \u00E0 l'\u00E9tape pr\u00E9c\u00E9dente -i18neditor.action.help=Aide -i18neditor.action.help.tip=Affichier l'aide -i18neditor.action.new.bundle=Nouveau -i18neditor.action.new.package=Nouveau -i18neditor.action.normalscreen=Mode fen\u00EAtre -i18neditor.action.normalscreen.tip=retour en mode fen\u00EAtre -i18neditor.action.openOtherProject=Ouvrir un projet (autre r\u00E9pertoire) -i18neditor.action.openProject=Ouvrir un projet... -i18neditor.action.reload.application= -i18neditor.action.reset.value.tip=R\u00E9initialiser -i18neditor.action.save.value.tip=Sauver la traduction modifi\u00E9e -i18neditor.action.showHelp.tip=Voir l'aide contextuelle -i18neditor.action.site=Site -i18neditor.action.site.tip=Acc\u00E9der au site du projet -i18neditor.bundle.name=Localisation \: %1$s -i18neditor.choose.project.to.delete=Choisir le projet \u00E0 supprimer -i18neditor.common.descrition=Description -i18neditor.common.resume=R\u00E9sum\u00E9 -i18neditor.config.category.directories=R\u00E9pertoires -i18neditor.config.category.directories.description=Les r\u00E9pertoires utilis\u00E9es par l'application -i18neditor.config.category.ui=Application -i18neditor.config.category.ui.description=Les autres options de l'application -i18neditor.config.configFileName.description=Le nom du fichier de configuration -i18neditor.config.defaultProjectsDirectory.description=Le r\u00E9pertoire o\u00F9 sont sauvegarder les d\u00E9finitions de projets -i18neditor.config.defaultTmpDirectory.description=Le r\u00E9pertoire temporaire par d\u00E9faut -i18neditor.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran -i18neditor.config.ui.locale=Langue utilis\u00E9e par l'application (fr_FR, en_GB) -i18neditor.createProject.table.bundles.select=... -i18neditor.createProject.table.bundles.select.tip=S\u00E9lectionner - D\u00E9selectionner toutes les urls -i18neditor.createProject.table.bundles.url=Localisation -i18neditor.createProject.table.bundles.url.tip=location du bundle -i18neditor.createbundle.label=Cr\u00E9er un nouveau bundle pour les paquetages donn\u00E9es -i18neditor.createbundle.newlanguage=Langue -i18neditor.createbundle.newlocale=Pays -i18neditor.createbundle.title=Nouveau bundle -i18neditor.createpackage.label=Cr\u00E9er un nouveau paquetage (pour tous les bundles connus) -i18neditor.createpackage.newpackage=Nouveau paquetage -i18neditor.createpackage.title=Cr\u00E9er un nouveau paquetage -i18neditor.createproject.common.select=... -i18neditor.createproject.directory.source.label=R\u00E9pertoire de sauvegarde -i18neditor.createproject.doPersist=Sauver la d\u00E9finition du projet -i18neditor.createproject.jar.source.label=Choisir le jar source -i18neditor.createproject.name.label=Nom du projet -i18neditor.createproject.no.type=< Aucune type de projet s\u00E9lectionn\u00E9 > -i18neditor.createproject.storeProject.directory=R\u00E9pertoire de sauvegarde -i18neditor.createproject.storeProject.path=Fichier de sauvegarde -i18neditor.createproject.uniqueJarDefinition=Utilisation d'un bundle final -i18neditor.createproject.uniqueJarDefinition.tip=Utilisation d'un bundle final (un seul bundle) -i18neditor.createproject.url=Localisation -i18neditor.init.closed=Nuiton-i18n-editor a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s -i18neditor.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. -i18neditor.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. -i18neditor.main.menu.file=Fichier -i18neditor.menu.bundles=Bundles -i18neditor.menu.help=Aide -i18neditor.menu.packages=Paquetages -i18neditor.menu.storeall=Sauvegarder -i18neditor.message.config.loaded=Configuration de nuiton-i18n-editor v. %1$s charg\u00E9e. -i18neditor.message.help.usage=Aide de nuiton-i18n-editor v %1$s -i18neditor.message.no.project.loaded=< Aucun projet charg\u00E9 > -i18neditor.no.keys=< Aucune clef definie > -i18neditor.package.name=Paquetage \: %1$s -i18neditor.project.info.tip=Cliquer ici pour obtenir des informations sur le projet charg\u00E9 -i18neditor.project.step.chooseProjectType=Type de projet -i18neditor.project.step.chooseProjectType.description=Choisir le type de projet \u00E0 ouvrir -i18neditor.project.step.configureProject=Configuration -i18neditor.project.step.configureProject.description=Configurer le projet -i18neditor.project.step.label=Etape %1$d/%2$d \: %3$s -i18neditor.project.step.persist=Sauvegarde -i18neditor.project.step.persist.description=Permet de sauvegarder la d\u00E9finition du projet -i18neditor.project.step.resume=Resume -i18neditor.project.step.resume.description=Voir le r\u00E9sum\u00E9 du projet \u00E0 ouvrir -i18neditor.project.step.selecteBundles=Bundles -i18neditor.project.step.selecteBundles.description=Choisir les bundles du projet parmi ceux d\u00E9tect\u00E9s -i18neditor.project.type.directory=R\u00E9pertoire -i18neditor.project.type.directory.description=Ouvrir un projet \u00E0 partir d'un r\u00E9pertoire -i18neditor.project.type.jar=Jar (ou zip) -i18neditor.project.type.jar.description=Ouvrir un projet \u00E0 partir d'un jar -i18neditor.resource.name=Resource \: %1$s -i18neditor.title=Nuiton i18n editor < Projet %1$s > -i18neditor.title.about=A propos de nuiton-i18n-editor... -i18neditor.title.choose.directory.source=Choisir le r\u00E9pertoire -i18neditor.title.choose.jar.source=Choisir un fichier de type 'jar' -i18neditor.title.choose.project=Choisir le fichier de d\u00E9finition d'un projet -i18neditor.title.choose.projectDir=Choisir une d\u00E9finition de projet -i18neditor.title.noproject=Nuiton i18n editor < aucun projet charg\u00E9 > -i18neditor.title.project.info=Informations sur le projet -i18neditor.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. -i18neditor.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 Added: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties (rev 0) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties 2012-07-09 13:53:44 UTC (rev 1964) @@ -0,0 +1,121 @@ +i18neditor.about.message=<h3>Nuiton i18n editor</h3><hr/><p>Project realised by <a href\="http\://codelutin.com">Codelutin</a> in 2009.</p><br/><hr/>For more information, visit the <a href\="http\://maven-site.nuiton.org/i18n/i18neditor">project's site</a>. +i18neditor.action.about=About +i18neditor.action.about.tip=Show about screen +i18neditor.action.apply=Apply +i18neditor.action.apply.tip= +i18neditor.action.cancel=Cancel +i18neditor.action.cancel.tip=Cancel +i18neditor.action.choose.directory.source.description= +i18neditor.action.choose.jar.source= +i18neditor.action.choose.jar.source.description= +i18neditor.action.choose.project= +i18neditor.action.choose.project.description= +i18neditor.action.choose.projectDir= +i18neditor.action.closeProject=Close the project +i18neditor.action.commandline.configure=Configure the application +i18neditor.action.commandline.disable.main.ui=Do not launch main ui +i18neditor.action.commandline.help=Show this help +i18neditor.action.configuration=Preferences +i18neditor.action.configuration.tip=show preferences screen +i18neditor.action.create=Create +i18neditor.action.createProject=Create project +i18neditor.action.delete.key.tip= +i18neditor.action.deleteProject=Delete project +i18neditor.action.editProject=Modify project +i18neditor.action.exit=Exit +i18neditor.action.exit.tip=Quit +i18neditor.action.fullscreen=Full screen +i18neditor.action.fullscreen.tip=Go into full screen mode +i18neditor.action.goto.next.stage=Continue +i18neditor.action.goto.next.stage.tip= +i18neditor.action.goto.previous.stage=Go back +i18neditor.action.goto.previous.stage.tip= +i18neditor.action.help=Show help +i18neditor.action.help.tip=Show help +i18neditor.action.new.bundle=New +i18neditor.action.new.package=New +i18neditor.action.normalscreen=Frame mode +i18neditor.action.normalscreen.tip=Go back in frame mode +i18neditor.action.openOtherProject=Open other project +i18neditor.action.openProject=Open a project +i18neditor.action.reload.application= +i18neditor.action.reset.value.tip= +i18neditor.action.save.value.tip= +i18neditor.action.showHelp.tip=Show context sensitve help +i18neditor.action.site=Website +i18neditor.action.site.tip=Go to web site of application +i18neditor.bundle.name=Locale \: %1$s +i18neditor.choose.project.to.delete= +i18neditor.common.descrition= +i18neditor.common.resume=Resume +i18neditor.config.category.directories=Directories +i18neditor.config.category.directories.description=Directories used by the application +i18neditor.config.category.ui=Application +i18neditor.config.category.ui.description=Other options used by the application +i18neditor.config.configFileName.description=configuration file +i18neditor.config.defaultProjectsDirectory.description=default directory where to store project definitions (*.i18nproject) +i18neditor.config.defaultTmpDirectory.description=tempory directory used by the application +i18neditor.config.ui.fullscreen=choose initial ui mode (true for full screen, false otherwise) +i18neditor.config.ui.locale=Language used by application (fr_FR, en_GB) +i18neditor.createProject.table.bundles.select= +i18neditor.createProject.table.bundles.select.tip= +i18neditor.createProject.table.bundles.url= +i18neditor.createProject.table.bundles.url.tip= +i18neditor.createbundle.label=Create a new bundle for all packages known +i18neditor.createbundle.newlanguage=NEw language +i18neditor.createbundle.newlocale=New locale +i18neditor.createbundle.title=Create bundle +i18neditor.createpackage.label=Create a new package (for all bundles known) +i18neditor.createpackage.newpackage=NEw language +i18neditor.createpackage.title=Create package +i18neditor.createproject.common.select= +i18neditor.createproject.directory.source.label= +i18neditor.createproject.doPersist= +i18neditor.createproject.jar.source.label= +i18neditor.createproject.name.label= +i18neditor.createproject.no.type= +i18neditor.createproject.storeProject.directory= +i18neditor.createproject.storeProject.path= +i18neditor.createproject.uniqueJarDefinition= +i18neditor.createproject.uniqueJarDefinition.tip= +i18neditor.createproject.url= +i18neditor.init.closed=Application was closed at %1$s +i18neditor.init.context.done=Initialisation of context done in %1$s. +i18neditor.init.ui.done=GUI initialized +i18neditor.main.menu.file=File +i18neditor.menu.bundles=Bundles +i18neditor.menu.help=Help +i18neditor.menu.packages=Packages +i18neditor.menu.storeall=Save all +i18neditor.message.config.loaded=Config of nuiton-i18n-editor v %1$s was loaded. +i18neditor.message.help.usage=Help of nuiton-i18n-editor v %1$s +i18neditor.message.no.project.loaded=< No project loaded > +i18neditor.no.keys=< No defined key > +i18neditor.package.name=Package \: %1$s +i18neditor.project.info.tip=Click here to display project's informations +i18neditor.project.step.chooseProjectType= +i18neditor.project.step.chooseProjectType.description= +i18neditor.project.step.configureProject= +i18neditor.project.step.configureProject.description= +i18neditor.project.step.label= +i18neditor.project.step.persist= +i18neditor.project.step.persist.description= +i18neditor.project.step.resume= +i18neditor.project.step.resume.description= +i18neditor.project.step.selecteBundles= +i18neditor.project.step.selecteBundles.description= +i18neditor.project.type.directory= +i18neditor.project.type.directory.description= +i18neditor.project.type.jar= +i18neditor.project.type.jar.description= +i18neditor.resource.name=Resource \: %1$s +i18neditor.title=Nuiton i18n editor < Project %1$s > +i18neditor.title.about=About Nuiton i18n editor +i18neditor.title.choose.directory.source= +i18neditor.title.choose.jar.source= +i18neditor.title.choose.project= +i18neditor.title.choose.projectDir= +i18neditor.title.noproject=Nuiton i18n editor < no project loaded > +i18neditor.title.project.info=Project's informations +i18neditor.warning.nimbus.landf=Could not find nymbus look and feel, please use at least a 1.6u10 version of sun jre +i18neditor.warning.no.ui=No ui environment detected\! Added: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties (rev 0) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties 2012-07-09 13:53:44 UTC (rev 1964) @@ -0,0 +1,121 @@ +i18neditor.about.message=<h3>Nuiton i18n editor</h3><hr/><p>Projet réalisé par la société <a href\="http\://codelutin.com">Codelutin</a> en 2009.</p><br/><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/i18n/i18neditor">site du projet</a>. +i18neditor.action.about=A propos +i18neditor.action.about.tip=Afficher l'à propos +i18neditor.action.apply=Appliquer +i18neditor.action.apply.tip=Appliquer +i18neditor.action.cancel=Annuler +i18neditor.action.cancel.tip=Annuler +i18neditor.action.choose.directory.source.description=Répertoire +i18neditor.action.choose.jar.source=Choisir ce jar +i18neditor.action.choose.jar.source.description=Fichier jar (*.jar) +i18neditor.action.choose.project=Choisir ce projet +i18neditor.action.choose.project.description=Fichier de définition de project (*.i18nproject) +i18neditor.action.choose.projectDir=Choisir ce répertoire +i18neditor.action.closeProject=Fermer le projet +i18neditor.action.commandline.configure=Configurer l'application +i18neditor.action.commandline.disable.main.ui=Ne pas lancer l'interface graphique principale +i18neditor.action.commandline.help=Voir l'aide +i18neditor.action.configuration=Préférences +i18neditor.action.configuration.tip=Modifier les préférences +i18neditor.action.create=Créer +i18neditor.action.createProject=Créer un projet +i18neditor.action.delete.key.tip=Supprimer cette traduction +i18neditor.action.deleteProject=Supprimer un projet +i18neditor.action.editProject=Modifier le projet +i18neditor.action.exit=Quitter +i18neditor.action.exit.tip=Quitter l'application +i18neditor.action.fullscreen=Plein écran +i18neditor.action.fullscreen.tip=Passer en mode Plein écran +i18neditor.action.goto.next.stage=Continuer +i18neditor.action.goto.next.stage.tip=Continuer vers l'étape suivante +i18neditor.action.goto.previous.stage=Revenir +i18neditor.action.goto.previous.stage.tip=Revenir à l'étape précédente +i18neditor.action.help=Aide +i18neditor.action.help.tip=Affichier l'aide +i18neditor.action.new.bundle=Nouveau +i18neditor.action.new.package=Nouveau +i18neditor.action.normalscreen=Mode fenêtre +i18neditor.action.normalscreen.tip=retour en mode fenêtre +i18neditor.action.openOtherProject=Ouvrir un projet (autre répertoire) +i18neditor.action.openProject=Ouvrir un projet... +i18neditor.action.reload.application= +i18neditor.action.reset.value.tip=Réinitialiser +i18neditor.action.save.value.tip=Sauver la traduction modifiée +i18neditor.action.showHelp.tip=Voir l'aide contextuelle +i18neditor.action.site=Site +i18neditor.action.site.tip=Accéder au site du projet +i18neditor.bundle.name=Localisation \: %1$s +i18neditor.choose.project.to.delete=Choisir le projet à supprimer +i18neditor.common.descrition=Description +i18neditor.common.resume=Résumé +i18neditor.config.category.directories=Répertoires +i18neditor.config.category.directories.description=Les répertoires utilisées par l'application +i18neditor.config.category.ui=Application +i18neditor.config.category.ui.description=Les autres options de l'application +i18neditor.config.configFileName.description=Le nom du fichier de configuration +i18neditor.config.defaultProjectsDirectory.description=Le répertoire où sont sauvegarder les définitions de projets +i18neditor.config.defaultTmpDirectory.description=Le répertoire temporaire par défaut +i18neditor.config.ui.fullscreen=Pour afficher l'aplication en mode pleine écran +i18neditor.config.ui.locale=Langue utilisée par l'application (fr_FR, en_GB) +i18neditor.createProject.table.bundles.select=... +i18neditor.createProject.table.bundles.select.tip=Sélectionner - Déselectionner toutes les urls +i18neditor.createProject.table.bundles.url=Localisation +i18neditor.createProject.table.bundles.url.tip=location du bundle +i18neditor.createbundle.label=Créer un nouveau bundle pour les paquetages données +i18neditor.createbundle.newlanguage=Langue +i18neditor.createbundle.newlocale=Pays +i18neditor.createbundle.title=Nouveau bundle +i18neditor.createpackage.label=Créer un nouveau paquetage (pour tous les bundles connus) +i18neditor.createpackage.newpackage=Nouveau paquetage +i18neditor.createpackage.title=Créer un nouveau paquetage +i18neditor.createproject.common.select=... +i18neditor.createproject.directory.source.label=Répertoire de sauvegarde +i18neditor.createproject.doPersist=Sauver la définition du projet +i18neditor.createproject.jar.source.label=Choisir le jar source +i18neditor.createproject.name.label=Nom du projet +i18neditor.createproject.no.type=< Aucune type de projet sélectionné > +i18neditor.createproject.storeProject.directory=Répertoire de sauvegarde +i18neditor.createproject.storeProject.path=Fichier de sauvegarde +i18neditor.createproject.uniqueJarDefinition=Utilisation d'un bundle final +i18neditor.createproject.uniqueJarDefinition.tip=Utilisation d'un bundle final (un seul bundle) +i18neditor.createproject.url=Localisation +i18neditor.init.closed=Nuiton-i18n-editor a été fermé à %1$s +i18neditor.init.context.done=Initialisation du contexte terminée en %1$s. +i18neditor.init.ui.done=Initialisation de l'interface graphique terminée. +i18neditor.main.menu.file=Fichier +i18neditor.menu.bundles=Bundles +i18neditor.menu.help=Aide +i18neditor.menu.packages=Paquetages +i18neditor.menu.storeall=Sauvegarder +i18neditor.message.config.loaded=Configuration de nuiton-i18n-editor v. %1$s chargée. +i18neditor.message.help.usage=Aide de nuiton-i18n-editor v %1$s +i18neditor.message.no.project.loaded=< Aucun projet chargé > +i18neditor.no.keys=< Aucune clef definie > +i18neditor.package.name=Paquetage \: %1$s +i18neditor.project.info.tip=Cliquer ici pour obtenir des informations sur le projet chargé +i18neditor.project.step.chooseProjectType=Type de projet +i18neditor.project.step.chooseProjectType.description=Choisir le type de projet à ouvrir +i18neditor.project.step.configureProject=Configuration +i18neditor.project.step.configureProject.description=Configurer le projet +i18neditor.project.step.label=Etape %1$d/%2$d \: %3$s +i18neditor.project.step.persist=Sauvegarde +i18neditor.project.step.persist.description=Permet de sauvegarder la définition du projet +i18neditor.project.step.resume=Resume +i18neditor.project.step.resume.description=Voir le résumé du projet à ouvrir +i18neditor.project.step.selecteBundles=Bundles +i18neditor.project.step.selecteBundles.description=Choisir les bundles du projet parmi ceux détectés +i18neditor.project.type.directory=Répertoire +i18neditor.project.type.directory.description=Ouvrir un projet à partir d'un répertoire +i18neditor.project.type.jar=Jar (ou zip) +i18neditor.project.type.jar.description=Ouvrir un projet à partir d'un jar +i18neditor.resource.name=Resource \: %1$s +i18neditor.title=Nuiton i18n editor < Projet %1$s > +i18neditor.title.about=A propos de nuiton-i18n-editor... +i18neditor.title.choose.directory.source=Choisir le répertoire +i18neditor.title.choose.jar.source=Choisir un fichier de type 'jar' +i18neditor.title.choose.project=Choisir le fichier de définition d'un projet +i18neditor.title.choose.projectDir=Choisir une définition de projet +i18neditor.title.noproject=Nuiton i18n editor < aucun projet chargé > +i18neditor.title.project.info=Informations sur le projet +i18neditor.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. +i18neditor.warning.no.ui=Aucun environnement graphique détecté

1 0

r1963 - in trunk: . ant-i18n-task i18n-maven-plugin nuiton-i18n nuiton-i18n-editor nuiton-i18n-editor/src/license nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs
by tchemit＠users.nuiton.org July 9, 2012

July 9, 2012

Author: tchemit Date: 2012-07-09 15:19:33 +0200 (Mon, 09 Jul 2012) New Revision: 1963 Url: http://nuiton.org/repositories/revision/i18n/1963 Log: pass to version 2.5-SNAPSHOT make nuiton-i18n-editro works again! Modified: trunk/ant-i18n-task/pom.xml trunk/i18n-maven-plugin/pom.xml trunk/nuiton-i18n-editor/LICENSE.txt trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/ant-i18n-task/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/i18n-maven-plugin/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n-editor/LICENSE.txt =================================================================== --- trunk/nuiton-i18n-editor/LICENSE.txt 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/LICENSE.txt 2012-07-09 13:19:33 UTC (rev 1963) @@ -1,166 +1,674 @@ - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + Preamble - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. - 0. Additional Definitions. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. - 1. Exception to Section 3 of the GNU GPL. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + The precise terms and conditions for copying, distribution and +modification follow. - 2. Conveying Modified Versions. + TERMS AND CONDITIONS - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + 0. Definitions. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + "This License" refers to version 3 of the GNU General Public License. - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 3. Object Code Incorporating Material from Library Header Files. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - 4. Combined Works. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. + 1. Source Code. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - d) Do one of the following: + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) + The Corresponding Source for a work in source code form is that +same work. - 5. Combined Libraries. + 2. Basic Permissions. - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. - 6. Revised Versions of the GNU Lesser General Public License. + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. + 4. Conveying Verbatim Copies. + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -73,10 +73,11 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxxVersion>2.0</jaxxVersion> + <jaxxVersion>2.5.1-SNAPSHOT</jaxxVersion> <nuitonUtilsVersion>1.2</nuitonUtilsVersion>  + <licensePluginVersion>1.1</licensePluginVersion> <license.licenseName>gpl_v3</license.licenseName>  @@ -92,6 +93,9 @@ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + +  + <license.generateBundle>true</license.generateBundle> </properties> <build> @@ -122,7 +126,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> <executions> <execution> @@ -134,8 +138,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> @@ -143,6 +147,14 @@ <goal>update-project-license</goal> <goal>add-third-party</goal> </goals> + <configuration> + <licenseMerges> + <licenseMerge> + The Apache Software License, Version 2.0|Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + </configuration> </execution> </executions> </plugin> @@ -150,7 +162,7 @@  <plugin> <groupId>${project.groupId}</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${project.version}</version> <configuration> <silent>true</silent> @@ -171,25 +183,24 @@ </executions> </plugin> + <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>copy-deps</id> + <id>copy-dependencies</id> <goals> <goal>copy-dependencies</goal> </goals> <configuration> - <silent>true</silent> <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> + <overWriteSnapshots>true</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> </configuration> </execution> </executions> - </plugin> </plugins> @@ -198,44 +209,6 @@ <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <jnlpExtensions> - <jnlpExtension> - <name>sun</name> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <includes> - <include>javax.help:javahelp</include> - </includes> - </jnlpExtension> - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> - </configuration> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>${licensePluginVersion}</version> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - <generateBundle>true</generateBundle> - </configuration> - </plugin> - - <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -250,10 +223,9 @@  <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.1.1</version> <dependencies> <dependency> - <groupId>org.nuiton</groupId> + <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> <version>${jrstPluginVersion}</version> </dependency> @@ -266,11 +238,7 @@ <reporting> <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> + </plugins> </reporting> @@ -290,44 +258,7 @@ <build> <plugins> -  <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> Modified: trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties 2012-07-09 13:19:33 UTC (rev 1963) @@ -1,18 +1,14 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jul 01 11:24:30 CEST 2010 -commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 +#Sat Jul 07 12:37:31 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2012-07-09 13:19:33 UTC (rev 1963) @@ -19,19 +19,19 @@ package org.nuiton.i18n.editor; import jaxx.runtime.JAXXUtil; -import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; -import org.nuiton.i18n.I18n; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Date; -import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import org.nuiton.i18n.editor.ui.I18nEditorUI; +import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; import org.nuiton.util.StringUtil; +import javax.swing.SwingUtilities; +import java.io.IOException; +import java.util.Arrays; +import java.util.Date; + import static org.nuiton.i18n.I18n._; /** @@ -42,6 +42,7 @@ public class I18nEditor { private static long startingTime = System.nanoTime(); + /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(I18nEditor.class); @@ -134,7 +135,7 @@ config.parse(args); // init i18n - I18n.init(config.getLocale()); + I18n.init(null, config.getLocale()); log.info(_("i18neditor.message.config.loaded", config.getVersion())); @@ -188,9 +189,7 @@ config.setDisplayMainUI(false); } - /** - * Désactiver la possiblite de lancer l'ui principale. - */ + /** Désactiver la possiblite de lancer l'ui principale. */ public void disableMainUI() { if (log.isDebugEnabled()) { log.debug(this); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -24,16 +24,17 @@ <Table fill='both' constraints='DirectoryI18nProject.class.getName()' implements='org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI<DirectoryI18nProject>'> - <script><![CDATA[ -import jaxx.runtime.SwingUtil; +<import> +jaxx.runtime.SwingUtil -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.I18nProject; -import org.nuiton.i18n.editor.project.impl.*; -import org.nuiton.i18n.editor.ui.project.*; +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.project.I18nProject -import java.io.File; +java.io.File +</import> + + <script><![CDATA[ protected ProjectUIModel model = getContextValue(ProjectUIModel.class); protected DirectoryI18nProject project = model.getProject(DirectoryI18nProject.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -24,16 +24,18 @@ <Table fill='both' constraints='JarI18nProject.class.getName()' implements='org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI<JarI18nProject>'> - <script><![CDATA[ -import jaxx.runtime.SwingUtil; +<import> +jaxx.runtime.SwingUtil -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.I18nProject; -import org.nuiton.i18n.editor.project.impl.*; -import org.nuiton.i18n.editor.ui.project.*; +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.project.I18nProject -import java.io.File; +java.io.File +</import> + + <script><![CDATA[ + protected ProjectUIModel model = getContextValue(ProjectUIModel.class); protected JarI18nProject project = model.getProject(JarI18nProject.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java 2012-07-09 13:19:33 UTC (rev 1963) @@ -18,11 +18,18 @@ */ package org.nuiton.i18n.editor.project.impl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.bundle.I18nBundleUtil; +import org.nuiton.i18n.editor.project.AbstractI18nProjectProvider; +import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; +import org.nuiton.i18n.editor.ui.project.ProjectUIModel; +import org.nuiton.util.ConverterUtil; +import org.nuiton.util.Resource; + import java.io.File; import java.io.IOException; - -import org.nuiton.i18n.bundle.I18nBundleUtil; -import org.nuiton.i18n.editor.project.AbstractI18nProjectProvider; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -30,13 +37,6 @@ import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; -import org.nuiton.i18n.editor.ui.project.ProjectUIModel; -import org.nuiton.util.ConverterUtil; -import org.nuiton.util.Resource; /** * @@ -142,7 +142,7 @@ urls.remove(u); } } else { - urls = Resource.getURLs(I18nBundleUtil.SEARCH_BUNDLE_PATTERN, loader); + urls = Resource.getURLs(I18nBundleUtil.DIRECTORY_SEARCH_BUNDLE_PATTERN, loader); log.info("detected bundles : " + urls); } return urls; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,13 +23,18 @@ <JCheckBoxMenuItem id='content' text='{getBundle().getDisplayName()}' toolTipText='{_("i18neditor.bundle.name", getBundle().getDisplayName())}' onItemStateChanged='updateState(event)'> + <import> +org.nuiton.i18n.editor.I18nEditorContext +java.util.Locale +jaxx.runtime.JAXXContext + +static org.nuiton.i18n.I18n._ + </import> +  <Locale id='bundle' javaBean='Locale.FRANCE'/> <script><![CDATA[ -import org.nuiton.i18n.editor.*; -import java.util.Locale; -import jaxx.runtime.JAXXContext; public BundleCheckBoxMenuUI(JAXXContext parentContext, Locale bundle, boolean selected) { super(null, selected); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,8 +23,15 @@ <JPanel layout='{new BorderLayout()}'> - <style source='BundleValueUI.css'/> + <import> +java.util.Locale +jaxx.runtime.SwingUtil +org.nuiton.i18n.editor.I18nEditorContext + +static org.nuiton.i18n.I18n._ + </import> +  <Locale id='bundle' javaBean='null'/> @@ -40,9 +47,6 @@ <Boolean id='modified' javaBean='Boolean.FALSE'/> <script><![CDATA[ -import java.util.Locale; -import jaxx.runtime.SwingUtil; -import org.nuiton.i18n.editor.*; protected I18nEditorUIHandler handler = getContextValue(I18nEditorUIHandler.class); protected I18nEditorContext context = getContextValue(I18nEditorContext.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -24,8 +24,22 @@ <org.jdesktop.swingx.JXTitledPanel id='content' title='{updateTitle(getPackageName())}'> +<import> +java.util.List +java.util.Locale + +java.awt.Dimension + +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.project.I18nProject +org.nuiton.i18n.editor.project.AbstractI18nProject + +static org.nuiton.i18n.I18n._ +</import> +  - <java.util.List id='bundles' javaBean='null' genericType='Locale'/> + <List id='bundles' javaBean='null' genericType='Locale'/>  <String id='packageName' javaBean='null'/> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,13 +23,17 @@ <JDialog id='main'> - <style source='CreateBundleUI.css'/> +<import> +java.util.Locale +java.awt.Color +org.nuiton.i18n.editor.I18nEditorContext + +static org.nuiton.i18n.I18n._ +</import> + <String id='bundle'/> <script><![CDATA[ -import java.util.Locale; -import org.nuiton.i18n.editor.*; - public boolean acceptLocale(Locale l, String expected) { return l !=null && l.toString().equals(expected); } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,12 +23,17 @@ <JDialog id='main'> - <style source='CreatePackageUI.css'/> +<import> +java.util.Locale +java.awt.Color +org.nuiton.i18n.editor.I18nEditorContext + +static org.nuiton.i18n.I18n._ +</import> + <String id='bundle'/> <script><![CDATA[ -import java.util.Locale; -import org.nuiton.i18n.editor.*; public boolean acceptLocale(Locale l, String expected) { return l !=null && l.toString().equals(expected); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -27,18 +27,29 @@ onWindowClosing='handler.close(context)' undecorated='{config.isFullScreen()}'> - <style source='I18nEditorUI.css'/> +<import> +java.beans.PropertyChangeEvent +java.beans.PropertyChangeListener - <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; +jaxx.runtime.SwingUtil +javax.swing.tree.* +java.util.Locale +org.nuiton.i18n.editor.I18nEditorContext +org.nuiton.i18n.editor.I18nEditorConfig +org.nuiton.i18n.editor.project.I18nProject -import jaxx.runtime.SwingUtil; -import javax.swing.tree.*; -import java.util.Locale; -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.I18nProject; +javax.swing.SwingUtilities +javax.swing.tree.TreePath +javax.swing.tree.DefaultTreeCellRenderer +javax.swing.event.TreeSelectionEvent +javax.swing.event.TreeSelectionListener +javax.swing.tree.TreeNode +java.awt.Component +static org.nuiton.i18n.I18n._ +</import> + + <script><![CDATA[ protected I18nEditorUIHandler handler = getContextValue(I18nEditorUIHandler.class); protected I18nEditorConfig config = getContextValue(I18nEditorConfig.class); protected I18nEditorContext context = getContextValue(I18nEditorContext.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2012-07-09 13:19:33 UTC (rev 1963) @@ -18,57 +18,56 @@ */ package org.nuiton.i18n.editor.ui; -import java.awt.Component; -import java.awt.Container; -import java.awt.event.ActionEvent; -import java.io.IOException; -import java.util.Map; -import java.util.Set; -import javax.swing.JMenu; - -import jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder; -import org.nuiton.i18n.editor.*; -import java.awt.Desktop; -import java.io.File; -import java.io.FileInputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; -import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUI; -import jaxx.runtime.swing.editor.config.ConfigUIBuilder; +import jaxx.runtime.swing.editor.config.ConfigUIHelper; import jaxx.runtime.swing.editor.config.model.ConfigUIModel; +import jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.editor.I18nEditorConfig; +import org.nuiton.i18n.editor.I18nEditorContext; import org.nuiton.i18n.editor.project.I18nProject; import org.nuiton.i18n.editor.project.I18nProjectFactory; import org.nuiton.i18n.editor.project.I18nProjectProvider; import org.nuiton.i18n.editor.ui.project.ProjectStep; import org.nuiton.i18n.editor.ui.project.ProjectUI; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import java.awt.Component; +import java.awt.Container; +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; import static org.nuiton.i18n.editor.I18nEditorConfig.Option; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +/** @author tchemit <chemit(a)codelutin.com> */ @AutoLoad public class I18nEditorUIHandler { @@ -77,11 +76,11 @@ /** * Methode pour initialiser l'ui principale sans l'afficher. - * + * <p/> * Si un projet est charge dans le context, alors on le charge dans l'ui. * - * @param context le context applicatif - * @param fullscreen flag pour indiquer si on doit ouvrir l'ui en model console (pleine ecran). + * @param context le context applicatif + * @param fullscreen flag pour indiquer si on doit ouvrir l'ui en model console (pleine ecran). * @return l'ui instancie et initialisee mais non visible encore */ public I18nEditorUI initUI(I18nEditorContext context, boolean fullscreen) { @@ -172,11 +171,11 @@ try { File f = ProjectUIModel.chooseFile(getUI(context), - _("i18neditor.title.choose.project"), - _("i18neditor.action.choose.project"), - null, - "^.+\\.i18nproject$", - _("i18neditor.action.choose.project.description")); + _("i18neditor.title.choose.project"), + _("i18neditor.action.choose.project"), + null, + "^.+\\.i18nproject$", + _("i18neditor.action.choose.project.description")); if (f == null) { return; } @@ -201,7 +200,7 @@ * Ouvre un projet. * * @param context le context applicatif - * @param name le nom du projet a ouvrir + * @param name le nom du projet a ouvrir */ public void openProject(I18nEditorContext context, String name) { try { @@ -272,7 +271,7 @@ * mode console (c'est à dire en mode plein écran exclusif), sinon on * passe en mode fenetré normal. * - * @param context le context applicatif + * @param context le context applicatif * @param fullscreen le nouvel état requis. */ public void changeScreen(I18nEditorContext context, boolean fullscreen) { @@ -289,11 +288,11 @@ /** * Methode pour changer la langue utilisee. - * + * <p/> * Cette action recharge le systeme i18n avec la nouvelle locale * donnee puis recherge les interfaces graphiques. * - * @param context applicatif + * @param context applicatif * @param newLocale la nouvelle locale a utilisee dans l'application. */ public void changeLanguage(I18nEditorContext context, Locale newLocale) { @@ -317,7 +316,7 @@ config.setLocale(newLocale); // chargement de la nouvelle locale dans le système i18n - I18n.init(newLocale); + I18n.init(null, newLocale); // on recharge l'ui reloadUI(context); @@ -512,7 +511,7 @@ // Option.TMP_DIRECTORY); builder.addCategory( - n_("i18neditor.config.category.ui"), + n_("i18neditor.config.category.ui"), n_("i18neditor.config.category.ui.description") ); @@ -524,13 +523,14 @@ // n_("i18neditor.config.category.ui.description"), // Option.FULL_SCREEN, // Option.LOCALE); - + ConfigUIModel model = builder.flushModel(); - ConfigUI configUI = ConfigUIBuilder.newConfigUI( - context, model, "i18neditor.config.category.ui"); + ConfigUIHelper configUIHelper = new ConfigUIHelper(null); + ConfigUI configUI = configUIHelper.buildUI(ui, "default"); +// context, model, "i18neditor.config.category.ui"); - ConfigUIBuilder.showConfigUI(configUI, ui, false); + configUIHelper.displayUI(ui, false); // configUI.showInDialog(ui, ui != null); } @@ -746,7 +746,7 @@ /** * Charger un projet. * - * @param context le context applicatif + * @param context le context applicatif * @param projectFile le fichier de definition du projet a ouvrir */ public void loadProject(I18nEditorContext context, File projectFile) { @@ -829,6 +829,7 @@ /** * Recharge les clés dans l'arbre des propriétés en fonction des paquetages + * * @param ui */ protected void reloadKeys(I18nEditorUI ui) { @@ -872,7 +873,7 @@ /** * Recharge les valeurs de la clef selectionnee dans l'arbre de navigation. - * + * * @param ui */ protected void reloadValues(I18nEditorUI ui) { @@ -882,7 +883,7 @@ /** * Recharge les valeurs d'une clef donnee. - * + * * @param ui * @param key la clef de traduction dont on va editer les traductions */ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -26,14 +26,18 @@ toolTipText='{_("i18neditor.resource.name", getUrl())}' onItemStateChanged='updateState(event)'> +<import> +org.nuiton.i18n.editor.I18nEditorContext +java.util.Locale +jaxx.runtime.JAXXContext + +static org.nuiton.i18n.I18n._ +</import> +  <String id='url' javaBean='""'/> <script><![CDATA[ -import org.nuiton.i18n.editor.*; -import java.util.Locale; -import jaxx.runtime.JAXXContext; - public PackageCheckBoxMenuUI(JAXXContext parentContext, String bundle, boolean selected) { super(null, selected); setContextValue(parentContext); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -25,27 +25,42 @@ implements='jaxx.runtime.swing.wizard.WizardUI<ProjectStep, ProjectUIModel>' width='550' height='560' defaultCloseOperation='dispose_on_close'> - <style source='ProjectUI.css'/> - - <script><![CDATA[ -import javax.swing.table.DefaultTableCellRenderer; +<import> +javax.swing.table.DefaultTableCellRenderer -import jaxx.runtime.JAXXContext; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.MyDefaultCellEditor; -import jaxx.runtime.swing.wizard.WizardOperationState; -import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.JAXXUtil.newContextEntryDef; -import static jaxx.runtime.JAXXUtil.checkJAXXContextEntry; +jaxx.runtime.JAXXContext +jaxx.runtime.SwingUtil +jaxx.runtime.swing.editor.MyDefaultCellEditor +jaxx.runtime.swing.wizard.WizardUtil +static jaxx.runtime.JAXXUtil.newContextEntryDef +static jaxx.runtime.JAXXUtil.checkJAXXContextEntry -import org.nuiton.i18n.editor.I18nEditorContext; -import org.nuiton.i18n.editor.I18nEditorConfig; -import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; -import org.nuiton.i18n.editor.ui.project.ProjectStep; -import org.nuiton.i18n.editor.ui.project.ProjectUIModel; -import org.nuiton.i18n.editor.ui.project.tabs.*; -import static org.nuiton.i18n.I18n.n_; +org.nuiton.i18n.editor.I18nEditorContext +org.nuiton.i18n.editor.I18nEditorConfig +org.nuiton.i18n.editor.ui.I18nEditorUIHandler +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.ui.project.tabs.AbstractProjectTabPanelUI +org.nuiton.i18n.editor.ui.project.tabs.SelectBundlesPanelUI +org.nuiton.i18n.editor.ui.project.tabs.ChooseProjectTypePanelUI +org.nuiton.i18n.editor.ui.project.tabs.ConfigureProjectPanelUI +org.nuiton.i18n.editor.ui.project.tabs.PersistPanelUI +org.nuiton.i18n.editor.ui.project.tabs.ResumePanelUI +org.nuiton.i18n.editor.ui.project.SelectBundlesTableModel +javax.swing.SwingUtilities +javax.swing.JTable +java.awt.Component +javax.swing.JComponent +java.awt.event.MouseAdapter +java.awt.event.MouseEvent + +static org.nuiton.i18n.I18n.n_ +static org.nuiton.i18n.I18n._ +</import> + + <script><![CDATA[ + protected I18nEditorUIHandler handler = getContextValue(I18nEditorUIHandler.class); protected I18nEditorConfig config = getContextValue(I18nEditorConfig.class); protected I18nEditorContext context = getContextValue(I18nEditorContext.class); @@ -121,7 +136,7 @@ return ui; } -@Override +/*@Override public void onWasStarted() { } @@ -132,7 +147,7 @@ @Override public void onOperationStateChanged(ProjectStep step, WizardOperationState newState) { // mettre a jour l'onglet -} +}*/ @Override public void onStepChanged(ProjectStep newStep) { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -25,18 +25,19 @@ abstract='true' implements='jaxx.runtime.swing.wizard.WizardStepUI<ProjectStep, ProjectUIModel>'> - <style source='AbstractProjectTabPanelUI.css'/> +<import> +static org.nuiton.i18n.I18n.n_ +org.nuiton.i18n.editor.I18nEditorContext +org.nuiton.i18n.editor.I18nEditorConfig +org.nuiton.i18n.editor.ui.I18nEditorUIHandler +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +static org.nuiton.i18n.I18n._ +</import> + <script><![CDATA[ -import static org.nuiton.i18n.I18n.n_; -import org.nuiton.i18n.editor.I18nEditorContext; -import org.nuiton.i18n.editor.I18nEditorConfig; -import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; -import org.nuiton.i18n.editor.ui.project.ProjectStep; -import org.nuiton.i18n.editor.ui.project.ProjectUIModel; -import jaxx.runtime.swing.wizard.WizardOperationState; - protected I18nEditorUIHandler handler = getContextValue(I18nEditorUIHandler.class); protected I18nEditorConfig config = getContextValue(I18nEditorConfig.class); protected I18nEditorContext context = getContextValue(I18nEditorContext.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -25,13 +25,24 @@  <AbstractProjectTabPanelUI _step='{ProjectStep.CHOOSE_PROJECT_TYPE}'> +<import> +java.beans.PropertyChangeEvent +java.beans.PropertyChangeListener +org.nuiton.i18n.editor.project.I18nProjectProvider +org.nuiton.i18n.editor.project.I18nProjectFactory +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.ui.project.ProjectStep + +javax.swing.JRadioButton +javax.swing.AbstractButton + +java.awt.GridBagConstraints +java.awt.Insets + +static org.nuiton.i18n.I18n._ +</import> + <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.*; -import org.nuiton.i18n.editor.ui.project.*; void $afterCompleteSetup() { // ajout des types de projets connus a partir des providers connus Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,16 +23,20 @@ <AbstractProjectTabPanelUI _step='{ProjectStep.CONFIGURE_PROJECT}'> - <script><![CDATA[ +<import> -import java.lang.reflect.Constructor; +java.lang.reflect.Constructor -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.I18nProjectProvider; -import org.nuiton.i18n.editor.project.I18nProjectFactory; -import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; -import org.nuiton.i18n.editor.ui.project.*; +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.project.I18nProjectProvider +org.nuiton.i18n.editor.project.I18nProjectFactory +org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI +static org.nuiton.i18n.I18n._ +</import> + + <script><![CDATA[ + protected String updateContentLayout(I18nProjectProvider<?> projectType) { if (projectType == null) { return "null"; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -22,20 +22,26 @@ --> <AbstractProjectTabPanelUI _step='{ProjectStep.PERSIST}'> - - <script><![CDATA[ -import jaxx.runtime.SwingUtil; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; +<import> +jaxx.runtime.SwingUtil -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.project.I18nProject; -import org.nuiton.i18n.editor.project.AbstractI18nProject; -import org.nuiton.i18n.editor.ui.project.*; +java.beans.PropertyChangeEvent +java.beans.PropertyChangeListener -import java.io.File; +org.nuiton.i18n.editor.I18nEditorConfig +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.project.I18nProject +org.nuiton.i18n.editor.project.AbstractI18nProject +java.io.File + +static org.nuiton.i18n.I18n._ +</import> + + <script><![CDATA[ + protected final I18nEditorConfig config = getContextValue(I18nEditorConfig.class); protected final PropertyChangeListener storeProjectPropertyChangeListener = new PropertyChangeListener() { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -23,11 +23,19 @@ <AbstractProjectTabPanelUI _step='{ProjectStep.RESUME}'> +<import> +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.project.I18nProject +org.nuiton.i18n.editor.project.AbstractI18nProject + +javax.swing.JLabel + +static org.nuiton.i18n.I18n._ +</import> + <script><![CDATA[ -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.ui.project.*; - void $afterCompleteSetup() { if (getStep()!=null) { setDescriptionText(_(getStep().getDescription())); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2012-07-09 13:19:33 UTC (rev 1963) @@ -22,14 +22,21 @@ --> <AbstractProjectTabPanelUI _step='{ProjectStep.SELECT_BUNDLES}'> - + +<import> +jaxx.runtime.SwingUtil +org.nuiton.i18n.editor.I18nEditorConfig +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.ProjectUIModel +org.nuiton.i18n.editor.ui.project.ProjectStep +org.nuiton.i18n.editor.ui.project.SelectBundlesTableModel + +static org.nuiton.i18n.I18n._ +</import> + <script><![CDATA[ -import jaxx.runtime.SwingUtil; -import org.nuiton.i18n.editor.*; -import org.nuiton.i18n.editor.ui.project.*; - void $afterCompleteSetup() { if (getStep() != null) { setDescriptionText(_(getStep().getDescription())); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) +++ trunk/pom.xml 2012-07-09 13:19:33 UTC (rev 1963) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> <modules> <module>nuiton-i18n</module>

1 0

r1962 - trunk
by tchemit＠users.nuiton.org July 9, 2012

July 9, 2012

Author: tchemit Date: 2012-07-09 15:12:56 +0200 (Mon, 09 Jul 2012) New Revision: 1962 Url: http://nuiton.org/repositories/revision/i18n/1962 Log: fixes #2176: Rename mojo module to i18n-maven-plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 13:12:35 UTC (rev 1961) +++ trunk/pom.xml 2012-07-09 13:12:56 UTC (rev 1962) @@ -41,7 +41,7 @@ <modules> <module>nuiton-i18n</module> - <module>maven-i18n-plugin</module> + <module>i18n-maven-plugin</module>   </modules>

1 0