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

r1680 - in trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor: . ui/project
by tchemit＠users.nuiton.org 22 Oct '09

22 Oct '09

Author: tchemit Date: 2009-10-22 12:59:35 +0200 (Thu, 22 Oct 2009) New Revision: 1680 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/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx Log: move context entry def static methods to jaxx.runtime.Util 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 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -23,7 +23,6 @@ import java.io.IOException; import javax.swing.SwingUtilities; -import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.SwingUtil; import jaxx.runtime.Util; import org.apache.commons.logging.Log; @@ -61,7 +60,7 @@ log.info(_("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); - Util.checkJAXXContextEntry(context, JAXXContextEntryDef.newDef(I18nEditorConfig.class)); + Util.checkJAXXContextEntry(context, Util.newContextEntryDef(I18nEditorConfig.class)); I18nEditorConfig config = context.getContextValue(I18nEditorConfig.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -21,6 +21,7 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; +import jaxx.runtime.Util; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,11 +45,11 @@ //------------------------------------------- // UI instances //------------------------------------------- - public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainui", I18nEditorUI.class); - public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = JAXXContextEntryDef.newDef(I18nProject.class); - private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("selectedKey", String.class); - private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("reSelectedKey", String.class); - private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = JAXXContextEntryDef.newDef(TreeModelMode.class); + public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainui", I18nEditorUI.class); + public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = Util.newContextEntryDef(I18nProject.class); + private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = Util.newContextEntryDef("selectedKey", String.class); + private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = Util.newContextEntryDef("reSelectedKey", String.class); + private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = Util.newContextEntryDef(TreeModelMode.class); public static final String PROJECT_PROPERTY = "project"; public static final String SELECTED_PACKAGES_PROPERTY = "selectedPackages"; public static final String SELECTED_BUNDLES_PROPERTY = "selectedBundles"; 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 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-22 10:59:35 UTC (rev 1680) @@ -35,7 +35,7 @@ import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.context.JAXXContextEntryDef.newDef; +import static jaxx.runtime.Util.newContextEntryDef; import static jaxx.runtime.Util.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; @@ -58,9 +58,9 @@ super(owner); // verification du context parent - checkJAXXContextEntry(parentContext, newDef(ProjectUIModel.class)); - checkJAXXContextEntry(parentContext, newDef("apply", Runnable.class)); - checkJAXXContextEntry(parentContext, newDef("cancel", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef(ProjectUIModel.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("apply", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("cancel", Runnable.class)); if (owner != null) { setContextValue(owner, "parent");

1 0

r1679 - in trunk/nuiton-i18n-editor: . src/main/java/org/nuiton/i18n/editor src/main/java/org/nuiton/i18n/editor/ui src/main/java/org/nuiton/i18n/editor/ui/project
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 19:00:52 +0200 (Fri, 16 Oct 2009) New Revision: 1679 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/I18nEditorConfig.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 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/project/ProjectUI.jaxx Log: use JAXX-2.0.x Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/pom.xml 2009-10-16 17:00:52 UTC (rev 1679) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -34,13 +34,13 @@  <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> + <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> + <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> </dependency> @@ -58,8 +58,8 @@ <licenses> <license> <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> + <url>${maven.license.file}</url> + <distribution>local</distribution> </license> </licenses> @@ -73,8 +73,8 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxx.version>1.7.1-SNAPSHOT</jaxx.version> - <lutinutil.version>1.1.0-rc-9-SNAPSHOT</lutinutil.version> + <jaxx.version>2.0.0-SNAPSHOT</jaxx.version> + <lutinutil.version>1.1.2-SNAPSHOT</lutinutil.version>  <license.licenseName>gpl_v3</license.licenseName> @@ -135,10 +135,7 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <configuration> - <copyToMETA_INF>true</copyToMETA_INF> - </configuration> + <artifactId>maven-license-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> @@ -176,12 +173,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <silent>true</silent> - </configuration> <executions> <execution> - <id>copy-dependencies</id> + <id>copy-deps</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> </execution> </executions> @@ -191,7 +195,41 @@ <pluginManagement> <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> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + </configuration> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -211,7 +249,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.2-rc-1</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> @@ -220,6 +258,16 @@ </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin> + </plugins> + </reporting> +    @@ -235,70 +283,43 @@ </activation> <build> <plugins> -  -  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> <executions> - <-execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}"/> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="javahelp-2.0.02.jar"/> - <filter token="url" value="${jnlpCodebase}"/> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${jnlpCodebase}"/> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" - verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" - failonerror="false"/> - <copy file="${project.build.directory}/lib/jxlayer-3.0.1.jar" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}/lib" failonerror="false"/> - </tasks> - </configuration> + <execution> + <id>get-keystore</id> <goals> - <goal>run</goal> + <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>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" - failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**"/> - </fileset> - <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip"/> - </fileset> - - </copy> - </tasks> - </configuration> + <id>generate-jnlp</id> + <phase>package</phase> <goals> - <goal>run</goal> + <goal>jnlp-inline</goal> </goals> </execution> </executions> - </plugin--> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -318,64 +339,6 @@ </executions> </plugin> -  </plugins> </build> </profile> 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 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -23,7 +23,7 @@ import java.io.IOException; import javax.swing.SwingUtilities; -import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.SwingUtil; import jaxx.runtime.Util; import org.apache.commons.logging.Log; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -44,9 +44,9 @@ * et quel est son type (local ou pas). * * @author chemit - * @see jaxx.runtime.DefaultApplicationContext.AutoLoad + * @see jaxx.runtime.context.DefaultApplicationContext.AutoLoad */ -(a)jaxx.runtime.DefaultApplicationContext.AutoLoad +(a)jaxx.runtime.context.DefaultApplicationContext.AutoLoad public class I18nEditorConfig extends org.nuiton.util.ApplicationConfig { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -21,7 +21,7 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; -import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.editor.project.I18nProject; @@ -37,7 +37,7 @@ * * @author chemit */ -public class I18nEditorContext extends jaxx.runtime.DefaultApplicationContext { +public class I18nEditorContext extends jaxx.runtime.context.DefaultApplicationContext { /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(I18nEditorContext.class); 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 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) @@ -279,8 +279,8 @@ <JToggleButton id='toFlatMode'/> <JSeparator orientation='vertical'/> <javax.swing.Box.Filler constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> - <JButton id='collapseAll' onActionPerformed='collapseAll((PropertieNode)tree.getSelectionValue())'/> - <JButton id='expandAll' onActionPerformed='expandAll((PropertieNode)tree.getSelectionValue())'/> + <JButton id='collapseAll' onActionPerformed='collapseAll((PropertieNode)tree.getSelectionPath().getLastPathComponent())'/> + <JButton id='expandAll' onActionPerformed='expandAll((PropertieNode)tree.getSelectionPath().getLastPathComponent())'/> </JToolBar> <PropertiesTreeModel id='treeModel' mode='{context.getTreeModelMode()}'/> @@ -295,8 +295,8 @@  <JScrollPane id='keysView'> <JTree id="tree" constructorParams='treeModel' - onKeyReleased='updateSelectedKey((PropertieNode) tree.getSelectionValue())' - onMouseClicked='updateSelectedKey((PropertieNode) tree.getSelectionValue())' + onKeyReleased='updateSelectedKey((PropertieNode) tree.getSelectionPath().getLastPathComponent())' + onMouseClicked='updateSelectedKey((PropertieNode) tree.getSelectionPath().getLastPathComponent())' cellRenderer='{ new DefaultTreeCellRenderer() { private static final long serialVersionUID=1L; 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 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -43,7 +43,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import jaxx.runtime.DefaultApplicationContext.AutoLoad; +import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUI; 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 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) @@ -32,10 +32,10 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.MyDefaultCellEditor; +import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.JAXXContextEntryDef.newDef; +import static jaxx.runtime.context.JAXXContextEntryDef.newDef; import static jaxx.runtime.Util.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; @@ -65,11 +65,7 @@ if (owner != null) { setContextValue(owner, "parent"); } - if (parentContext instanceof jaxx.runtime.JAXXInitialContext) { - ((jaxx.runtime.JAXXInitialContext)parentContext).to(this); - } else { - setContextValue(parentContext); - } + SwingUtil.initContext(this, parentContext); contextInitialized = true; }

1 0

r1678 - in trunk/maven-i18n-plugin/src/main: java/org/nuiton/i18n/plugin/parser/impl resources
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 18:44:14 +0200 (Fri, 16 Oct 2009) New Revision: 1678 Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java trunk/maven-i18n-plugin/src/main/resources/log4j.properties Log: clean javadoc + fix logger Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -134,10 +134,6 @@ } } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) - */ @Override public void parseLine(File srcFile, String line) { String keysSet = filter.parse(line); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -49,11 +49,6 @@ return "java-action-config.getter"; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ - public String extract(String i18nString) { Matcher matcher = MATCH_PATTERN.matcher(i18nString.trim()); if (matcher.matches()) { @@ -62,10 +57,6 @@ return null; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) - */ @Override public void parseLine(File srcFile, String line) { String key = extract(line); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -101,10 +101,6 @@ this.rulesJaxx = rulesJaxx; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ @Override public String extract(String i18nString) { return i18nString.length() == 0 ? null : i18nString; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -93,10 +93,6 @@ return "swixat.rules"; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ @Override public String extract(String i18nString) { return i18nString; Modified: trunk/maven-i18n-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/maven-i18n-plugin/src/main/resources/log4j.properties 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/resources/log4j.properties 2009-10-16 16:44:14 UTC (rev 1678) @@ -6,5 +6,5 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.codelutin.util=INFO -log4j.logger.org.codelutin.i18n.plugin=INFO +log4j.logger.org.nuiton.util=WARN +log4j.logger.org.nuiton.i18n.plugin=INFO

1 0

r1677 - in trunk: . nuiton-i18n-api
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:44 +0200 (Sun, 11 Oct 2009) New Revision: 1677 Modified: trunk/nuiton-i18n-api/pom.xml trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/nuiton-i18n-api/pom.xml =================================================================== --- trunk/nuiton-i18n-api/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) +++ trunk/nuiton-i18n-api/pom.xml 2009-10-11 11:27:44 UTC (rev 1677) @@ -51,10 +51,10 @@ <packaging>jar</packaging> <properties> +  - <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip - </redmine.releaseFiles> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) +++ trunk/pom.xml 2009-10-11 11:27:44 UTC (rev 1677) @@ -202,7 +202,7 @@  <projectId>i18n</projectId> - <processor.version>1.0.1-SNAPSHOT</processor.version> + <processor.version>1.0.1</processor.version> </properties>

1 0

r1676 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:37:32 +0200 (Sat, 10 Oct 2009) New Revision: 1676 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 14:32:33 UTC (rev 1675) +++ trunk/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId>

1 0

r1675 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 16:32:33 +0200 (Fri, 09 Oct 2009) New Revision: 1675 Modified: trunk/pom.xml Log: - use helper 1.0.3 (from mavenpom) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 11:41:17 UTC (rev 1674) +++ trunk/pom.xml 2009-10-09 14:32:33 UTC (rev 1675) @@ -202,9 +202,6 @@  <projectId>i18n</projectId> -  - <helper.version>1.1.0-SNAPSHOT</helper.version> - <processor.version>1.0.1-SNAPSHOT</processor.version> </properties>

1 0