- Buix-commits - mailman.cloud.codelutin.com

r892 - in lutinjaxx/trunk: jaxx-core/src/main/java/jaxx/tags/swing maven-jaxx-plugin/src/test/java/org/codelutin/jaxx maven-jaxx-plugin/src/test/java/testcases/i18n/title maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext
by tchemit＠users.labs.libre-entreprise.org Oct. 9, 2008

Oct. 9, 2008

Author: tchemit Date: 2008-10-09 11:08:39 +0000 (Thu, 09 Oct 2008) New Revision: 892 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: fix bug sur i18n et les JTabbedPaneHandler Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-09 11:08:39 UTC (rev 892) @@ -7,6 +7,7 @@ import jaxx.CompilerException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; @@ -56,12 +57,28 @@ String title = tabInfo.getTitle(); if (title != null) { - appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + TypeManager.getJavaCode(title) + ");"); + if (I18nHelper.isI18nAttribute("title")) { + if (!title.startsWith("_(\"")) { + // we did not have the invocation code, add it + title = I18nHelper.addI18nInvocation(getId(),"title", TypeManager.getJavaCode(title),compiler); + } + } else { + title = TypeManager.getJavaCode(title); + } + appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + title + ");"); } String toolTipText = tabInfo.getToolTipText(); if (toolTipText != null) { - appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + TypeManager.getJavaCode(toolTipText) + ");"); + if (I18nHelper.isI18nAttribute("toolTipText")) { + if (!toolTipText.startsWith("_(\"")) { + // we did not have the invocation code, add it + toolTipText = I18nHelper.addI18nInvocation(getId(),"toolTipText", TypeManager.getJavaCode(toolTipText),compiler); + } + } else { + toolTipText = TypeManager.getJavaCode(toolTipText); + } + appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + toolTipText + ");"); } boolean enabled = tabInfo.isEnabled(); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-09 11:08:39 UTC (rev 892) @@ -31,18 +31,21 @@ public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setText(_(\"test.text\"));", true); + checkPattern("\"_(\\\"test.text\\\")\"", false); } @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setTitle(_(\"test.title\"));", true); + checkPattern("\"_(\\\"test.title\\\")\"", false); } @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); + checkPattern("\"_(\\\"test.toolTipText\\\")\"", false); } protected void checkPattern(String pattern, boolean required) throws IOException { @@ -54,7 +57,9 @@ assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f); - assertEquals("could not find the pattern : " + pattern + " in file " + f, required, content.contains(pattern)); + + String errorMessage = required ? "could not find the pattern : " : "should not have found pattern :"; + assertEquals(errorMessage + pattern + " in file " + f, required, content.contains(pattern)); } } Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" title='test.title'> + <JLabel text='testLabel'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane2.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" toolTipText='test.toolTipText'> + <JLabel text='yo'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx ___________________________________________________________________ Name: svn:mergeinfo +

1 0

r891 - in lutinjaxx/trunk: jaxx-util maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 16:01:29 +0000 (Wed, 08 Oct 2008) New Revision: 891 Modified: lutinjaxx/trunk/jaxx-util/pom.xml lutinjaxx/trunk/maven-jaxx-plugin/pom.xml Log: use plugin for plugin Modified: lutinjaxx/trunk/jaxx-util/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-08 16:00:46 UTC (rev 890) +++ lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-08 16:01:29 UTC (rev 891) @@ -16,7 +16,6 @@ <packaging>jar</packaging> <version>0.5-SNAPSHOT</version> <description>Jaxx lutin library utility</description> -  <build> <plugins> Modified: lutinjaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-08 16:00:46 UTC (rev 890) +++ lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-08 16:01:29 UTC (rev 891) @@ -83,6 +83,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <id>helpmojo</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> </plugin> </plugins> @@ -93,6 +102,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> </plugin> </plugins> </reporting>

1 0

r890 - lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 16:00:46 +0000 (Wed, 08 Oct 2008) New Revision: 890 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java Log: remove accent Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 19:20:48 UTC (rev 889) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-08 16:00:46 UTC (rev 890) @@ -60,7 +60,7 @@ protected MavenProject project; /** - * Répertoire de destination des fichiers java a generer. + * Repertoire de destination des fichiers java a generer. * * @parameter expression="${jaxx.outJava}" default-value="${basedir}/target/generated-sources/java" */

1 0

r889 - lutinjaxx/trunk/maven-jaxx-plugin/src/site
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 19:20:48 +0000 (Tue, 07 Oct 2008) New Revision: 889 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml Log: add goals in site Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 18:59:47 UTC (rev 888) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 19:20:48 UTC (rev 889) @@ -34,8 +34,7 @@ <menu ref="parent"/> <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Goals" href="plugin-info.html"/> - <item name="Détail goals"> + <item name="Détail goals" href="plugin-info.html"> <item name="generate" href="generate-mojo.html"/> <item name="help" href="help-mojo.html"/> </item>

1 0

r888 - in lutinjaxx/trunk: jaxx-core/src/main/java/jaxx/compiler maven-jaxx-plugin/src/main/java/org/codelutin/jaxx maven-jaxx-plugin/src/test/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 18:59:47 +0000 (Tue, 07 Oct 2008) New Revision: 888 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: add force and i18nable options to mojo generate Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-10-07 18:59:47 UTC (rev 888) @@ -1,6 +1,7 @@ package jaxx.compiler; import java.io.File; +import java.util.Arrays; /** * Stores options which affect the jaxxc tool's operation. These options are generally specified by the @@ -14,6 +15,8 @@ private boolean keepJavaFiles; private boolean optimize; private boolean verbose; + /** a flag to enable or disable i18n generation */ + private boolean i18nable; /** * Returns the target directory, generally specified with the "-d" option on the command line. @@ -148,4 +151,25 @@ public void setVerbose(boolean verbose) { this.verbose = verbose; } + + public boolean isI18nable() { + return i18nable; + } + + public void setI18nable(boolean i18nable) { + this.i18nable = i18nable; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(super.toString()); + sb.append("\nclassPath: ").append(getClassPath()); + sb.append("\njavaOut : ").append(getTargetDirectory()); + sb.append("\noutClass : ").append(getJavacTargetDirectory()); + sb.append("\njavacOpts: ").append(getJavacOpts()); + sb.append("\nverbose: ").append(isVerbose()); + sb.append("\noptiomize: ").append(getOptimize()); + sb.append("\ni18nable: ").append(isI18nable()); + return sb.toString(); + } } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 18:59:47 UTC (rev 888) @@ -29,14 +29,18 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.DirectoryScanner; +import org.codelutin.util.FileUpdaterHelper; +import org.codelutin.util.MirroredFileUpdater; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Set; -import java.util.Arrays; /** * Classe permettant de transformer des sources jaxx vers du source java. @@ -111,12 +115,32 @@ */ protected String[] includes; + /** + * to force generation of java source for any jaxx files with no timestamp checking. + * + * By default, never force generation. + * + * @parameter expression="${jaxx.force}" default-value="false" + */ + protected boolean force; + + /** + * to make compiler i18nable, says add the {@link org.codelutin.i18n.I18n#_(String, Object[])} method + * invocation on {@link jaxx.compiler.I18nHelper#I18N_ATTRIBUTES} attributes. + * + * @parameter expression="${jaxx.i18nable}" default-value="true" + * @see jaxx.compiler.I18nHelper + */ + protected boolean i18nable; + protected String[] files; private static final String[] INCLUDES = {"**\\/*.jaxx"}; protected CompilerOptions options; + protected MirroredFileUpdater updater ; + protected void init() { if (!outResource.exists()) { @@ -135,8 +159,36 @@ boolean noIncludes = includes == null || includes.length == 0; ds.setIncludes(noIncludes ? INCLUDES : includes); ds.scan(); - files = ds.getIncludedFiles(); - getLog().info("jaxx - found " + files.length + " file(s) to generate. "); + String[] files = ds.getIncludedFiles(); + if (verbose) { + getLog().info("jaxx - discover " + files.length + " jaxx file(s). "); + } + + updater = (MirroredFileUpdater) FileUpdaterHelper.newJaxxFileUpdater(src, outJava); + + if (force) { + // we will regenerate all files + this.files = files; + } else { + // filter files + List<String> listFiles = new ArrayList<String>(); + + for (String file : files) { + if (updater.isFileUpToDate(new File(src, file))) { + if (verbose) { + getLog().info("jaxx - skip file [" + file + "]."); + } + } else { + if (verbose) { + getLog().info("jaxx - will generate file [" + file + "]."); + } + listFiles.add(file); + } + } + this.files = listFiles.toArray(new String[listFiles.size()]); + } + + options = toCompilerOptions(); if (verbose) { @@ -166,18 +218,15 @@ result.setJavacTargetDirectory(outClass); result.setTargetDirectory(outJava); result.setVerbose(verbose); + result.setI18nable(i18nable); return result; } protected void printInit() { - getLog().info("classPath: " + options.getClassPath()); - getLog().info("javaOut : " + options.getTargetDirectory()); - getLog().info("outClass : " + options.getJavacTargetDirectory()); - getLog().info("javacOpts: " + options.getJavacOpts()); - getLog().info("optiomize: " + options.getOptimize()); + getLog().info(options.toString()); getLog().info("includes : " + Arrays.toString(includes)); for (String file : files) { - getLog().info(file); + getLog().info("will generate "+file); } ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -197,7 +246,7 @@ } //fixme should remove this silly test when we will make real maven plugin tests :) - if (getPluginContext()!=null) { + if (getPluginContext() != null) { for (Object e : getPluginContext().keySet()) { getLog().info("pluginContext " + e + " : " + getPluginContext().get(e)); } @@ -208,6 +257,13 @@ init(); + if (files.length == 0) { + getLog().info("jaxx - no jaxx file to treate. "); + return; + } + + getLog().info("jaxx - will generate " + this.files.length + " jaxx file(s). "); + try { doExecute(); @@ -227,7 +283,7 @@ protected void fixCompileSourceRoots() { //fixme should remove this silly test when we will make real maven plugin tests :) - if (project!=null) { + if (project != null) { if (!project.getCompileSourceRoots().contains(outJava.getPath())) { project.addCompileSourceRoot(outJava.getPath()); } @@ -346,4 +402,23 @@ this.files = files; } + public boolean isForce() { + return force; + } + + public void setForce(boolean force) { + this.force = force; + } + + public boolean isI18nable() { + return i18nable; + } + + public void setI18nable(boolean i18nable) { + this.i18nable = i18nable; + } + + public MirroredFileUpdater getUpdater() { + return updater; + } } \ No newline at end of file Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -88,6 +88,8 @@ goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + expression + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); + goal.setForce(anno.force()); + goal.setI18nable(anno.i18nable()); //TODO Use the maven plexus TestCase inorder to include dependencies goal.setJavaOpts(anno.javaOpts()); log.info("setUp test " + getName()); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-07 18:59:47 UTC (rev 888) @@ -38,5 +38,9 @@ public boolean verbose() default false; + public boolean force() default true; + + public boolean i18nable() default false; + public String javaOpts() default ""; } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -3,6 +3,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import java.io.File; + public class CompilerTest extends AbstractCompilerTest { @CompileConfig(packageName = "InnerClasses", runJavac = true) @@ -23,7 +25,7 @@ goal.execute(); } - @CompileConfig(packageName = "CSSTests", verbose = false) + @CompileConfig(packageName = "CSSTests", verbose = false, i18nable = false) public void testCssTests() throws MojoExecutionException, MojoFailureException { goal.execute(); } @@ -67,5 +69,43 @@ goal.execute(); } + @CompileConfig(packageName = "force", verbose = false) + public void testForce() throws MojoExecutionException, MojoFailureException, InterruptedException { + // first round, with force option so will generate theonly JButton.jaxx file + goal.execute(); + String[] files = goal.getFiles(); + assertEquals(1, files.length); + File srcFile = new File(goal.getSrc(), files[0]); + + File dstFile = goal.getUpdater().getMirrorFile(srcFile); + + long oldTime = dstFile.lastModified(); + // second round, no force so will not the file + goal.setForce(false); + goal.execute(); + files = goal.getFiles(); + assertEquals(0, files.length); + + Thread.sleep(1000); + + assertEquals(oldTime, goal.getUpdater().getMirrorFile(srcFile).lastModified()); + + // three round : modify a source with no force option + srcFile.setLastModified(System.currentTimeMillis()); + + goal.execute(); + files = goal.getFiles(); + assertEquals(1, files.length); + + assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + + // last round, reforce file generation for an no modify source + goal.setForce(true); + goal.execute(); + files = goal.getFiles(); + assertEquals(1, files.length); + assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + } + } \ No newline at end of file Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -9,28 +9,43 @@ public class I18nTest extends AbstractCompilerTest { - @CompileConfig(packageName = "i18n.text", verbose = false) + @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = false) + public void testI18nTextNoI1_nabel() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setText(_(\"test.text\"));", false); + } + + @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = false) + public void testI18nTitleNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setTitle(_(\"test.title\"));", false); + } + + @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = false) + public void testI18nToolTipTextNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", false); + } + + @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = true) public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setText(_(\"test.text\"));"); + checkPattern("testId.setText(_(\"test.text\"));", true); } - @CompileConfig(packageName = "i18n.title", verbose = false) + @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setTitle(_(\"test.title\"));"); + checkPattern("testId.setTitle(_(\"test.title\"));", true); } - @CompileConfig(packageName = "i18n.tooltiptext", verbose = false) + @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));"); + checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); } - protected void checkPattern(String pattern) throws IOException { + protected void checkPattern(String pattern, boolean required) throws IOException { String[] files = goal.getFiles(); for (String file : files) { // check we have a the required testId.setTitle(_("test.title")); @@ -39,7 +54,7 @@ assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f); - assertTrue("could not find the pattern : " + pattern + " in file " + f, content.contains(pattern)); + assertEquals("could not find the pattern : " + pattern + " in file " + f, required, content.contains(pattern)); } }

1 0

r887 - in lutinjaxx/trunk/jaxx-core/src/main/java/jaxx: compiler tags tags/swing
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 18:59:01 +0000 (Tue, 07 Oct 2008) New Revision: 887 Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java Log: improve i18n with a dedicated I18nHelper class Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/I18nHelper.java 2008-10-07 18:59:01 UTC (rev 887) @@ -0,0 +1,70 @@ +package jaxx.compiler; + +import jaxx.tags.DefaultComponentHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Arrays; +import java.util.List; + +/** + * I18n methods to add {@link org.codelutin.i18n.I18n#_(String, Object[])} method on some attributes. + * + * Make sure to set an i18nable compiler to have his {@link CompilerOptions#isI18nable()} returning true. + * + * @author chemit + */ +public class I18nHelper { + + protected static final Log log = LogFactory.getLog(DefaultComponentHandler.class); + + public static final List<String> I18N_ATTRIBUTES = Arrays.asList("text", "title", "toolTipText"); + + /** + * Test if we have an active i18n attribute (says an i18n attribute on a i18neable compiler). + * + * @param attributeName name of attribute to test + * @param compiler current used compiler (contains options) + * @return <code>true</code> if wa have an active i18n attribute, <code>false</code> otherwise. + */ + public static boolean isI18nableAttribute(String attributeName, JAXXCompiler compiler) { + return compiler.getOptions().isI18nable() && isI18nAttribute(attributeName); + } + + /** + * Test if we have an i18n attribute. + * + * @param attributeName name of attribute to test + * @return <code>true</code> if wa have an active i18n attribute, <code>false</code> otherwise. + */ + public static boolean isI18nAttribute(String attributeName) { + return I18N_ATTRIBUTES.contains(attributeName); + } + /** + * Add the i18n on a attribute. + * + * Note: Be ware : no test is done here to ensure we are on a i18neable attribute for an i18nable compiler. + * + * Make sure with the method {@link jaxx.compiler.I18nHelper#isI18nableAttribute(String, JAXXCompiler)} returns + * <code>true</code< before using this method. + * + * @param widgetId the id of the widget + * @param attributeName the name of the attribute + * @param attributeValueCode the value code of the attribute value + * @param compiler the current used compile + * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise + */ + public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { + + if (log.isDebugEnabled()) { + log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); + } + if (attributeValueCode.contains("_(") && attributeValueCode.contains(")")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "' : ["+attributeValueCode+"]"); + } else { + attributeValueCode = "_(" + attributeValueCode + ")"; + } + + return attributeValueCode; + } +} Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-07 18:56:33 UTC (rev 886) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-10-07 18:59:01 UTC (rev 887) @@ -8,6 +8,7 @@ import jaxx.UnsupportedAttributeException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import org.apache.commons.logging.Log; @@ -22,8 +23,6 @@ import java.beans.IntrospectionException; import java.io.IOException; import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; public class DefaultComponentHandler extends DefaultObjectHandler { /** log */ @@ -31,8 +30,6 @@ private String containerDelegate; - private static final List<String> I18N_ATTRIBUTES = Arrays.asList("text", "title", "toolTipText"); - public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, Component.class); @@ -203,34 +200,14 @@ } } // ajout du support i18n - valueCode = addI18nInvocation(id, name, valueCode, compiler); + if (I18nHelper.isI18nableAttribute(name,compiler)) { + valueCode = I18nHelper.addI18nInvocation(id, name, valueCode, compiler); + } return super.getSetPropertyCode(id, name, valueCode, compiler); } - /** - * - * @param widgetId the id of the widget - * @param attributeName the name of the attribute - * @param attributeValueCode the value code of the attribute value - * @param compiler the current used compile - * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise - */ - public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { - if (I18N_ATTRIBUTES.contains(attributeName)) { - if (log.isDebugEnabled()) { - log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); - } - if (attributeValueCode.contains("_(") || attributeValueCode.contains(")")) { - compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "'"); - } else { - attributeValueCode = "_(" + attributeValueCode + ")"; - } - } - return attributeValueCode; - } - /** * Maps string values onto integers, so that int-valued enumeration properties can be specified by strings. For * example, when passed a key of 'alignment', this method should normally map the values 'left', 'center', and Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-07 18:56:33 UTC (rev 886) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/TabHandler.java 2008-10-07 18:59:01 UTC (rev 887) @@ -7,10 +7,10 @@ import jaxx.CompilerException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; import jaxx.tags.TagHandler; -import jaxx.tags.DefaultComponentHandler; import jaxx.types.TypeManager; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -63,16 +63,20 @@ return; } + String valueCode = TypeManager.getJavaCode(value); + // add i18n support - String i18nvalue = DefaultComponentHandler.addI18nInvocation(id,name,TypeManager.getJavaCode(value),compiler); + if (I18nHelper.isI18nableAttribute(name,compiler)) { + value = valueCode = I18nHelper.addI18nInvocation(id,name,valueCode,compiler); + } if (name.equals("title")) { - tabInfo.setTitle(i18nvalue); - compiledTabInfo.appendInitializationCode(id + ".setTitle(" + i18nvalue + ");"); + tabInfo.setTitle(value); + compiledTabInfo.appendInitializationCode(id + ".setTitle(" + valueCode + ");"); //compiledTabInfo.appendInitializationCode(id + ".setTitle(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("toolTipText")) { - tabInfo.setToolTipText(i18nvalue); - compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + i18nvalue + ");"); + tabInfo.setToolTipText(value); + compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + valueCode + ");"); //compiledTabInfo.appendInitializationCode(id + ".setToolTipText(" + TypeManager.getJavaCode(value) + ");"); } else if (name.equals("icon")) { Icon icon = (Icon) TypeManager.convertFromString(value, Icon.class);

1 0

r886 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 18:56:33 +0000 (Tue, 07 Oct 2008) New Revision: 886 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java Log: explicitly modify the file lastmodified when regenerated Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-07 18:35:38 UTC (rev 885) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-07 18:56:33 UTC (rev 886) @@ -389,6 +389,9 @@ } else { dest = new File(baseDir, outputClassName.substring(outputClassName.lastIndexOf(".") + 1) + ".java"); } + if (dest.exists() && !dest.setLastModified(System.currentTimeMillis())) { + log.warn("could not touch file "+dest); + } PrintWriter out = new PrintWriter(new FileWriter(dest)); createJavaSource(out); out.close();

1 0

r885 - in lutinjaxx/trunk: . jaxx-core jaxx-core/src/site jaxx-core/src/site/fr jaxx-core/src/site/fr/rst jaxx-swing-action jaxx-swing-action/src/site jaxx-swing-action/src/site/fr jaxx-swing-action/src/site/fr/rst jaxx-util jaxx-util/src/site jaxx-util/src/site/fr jaxx-util/src/site/fr/rst maven-jaxx-plugin maven-jaxx-plugin/src/site maven-jaxx-plugin/src/site/fr maven-jaxx-plugin/src/site/fr/rst maven-jaxx-plugin/src/test/java/testcases maven-jaxx-plugin/src/test/java/testcases/force src sr
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 18:35:38 +0000 (Tue, 07 Oct 2008) New Revision: 885 Added: lutinjaxx/trunk/jaxx-core/src/site/fr/ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-swing-action/src/site/fr/ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst lutinjaxx/trunk/jaxx-util/src/site/fr/ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx lutinjaxx/trunk/src/ lutinjaxx/trunk/src/site/ lutinjaxx/trunk/src/site/fr/ lutinjaxx/trunk/src/site/fr/rst/ lutinjaxx/trunk/src/site/fr/rst/Todo.rst lutinjaxx/trunk/src/site/fr/rst/index.rst lutinjaxx/trunk/src/site/site.xml Removed: lutinjaxx/trunk/jaxx-core/src/site/site.xml lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml Modified: lutinjaxx/trunk/jaxx-core/pom.xml lutinjaxx/trunk/jaxx-swing-action/pom.xml lutinjaxx/trunk/jaxx-util/pom.xml lutinjaxx/trunk/maven-jaxx-plugin/pom.xml lutinjaxx/trunk/pom.xml Log: make site works with a multi-module project Modified: lutinjaxx/trunk/jaxx-core/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-core/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-core/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -44,4 +44,13 @@ </dependency> </dependencies> + +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> </project> Added: lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-core +========= + +.. contents:: + + +Présentation +------------ + +Le compilateur Jaxx TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Deleted: lutinjaxx/trunk/jaxx-core/src/site/site.xml =================================================================== --- lutinjaxx/trunk/jaxx-core/src/site/site.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-core/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="LutinUtil"> - - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin Buix Jaxx</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/buix/jaxx" name="T�l�chargement"/> - </menu> - - <menu name="D�veloppeur"> - <item name="A faire" href="Todo.html"/> - </menu> - - ${reports} - - </body> -</project> Modified: lutinjaxx/trunk/jaxx-swing-action/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-swing-action/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -51,4 +51,14 @@ </dependency> </dependencies> + +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> + </project> Added: lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-swing-action +================= + +.. contents:: + + +Présentation +------------ + +Framework de gestion des actions et onglets TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Deleted: lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml =================================================================== --- lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-swing-action/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="LutinUtil"> - - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin Buix Jaxx</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/buix/jaxx" name="T�l�chargement"/> - </menu> - - <menu name="D�veloppeur"> - <item name="A faire" href="Todo.html"/> - </menu> - - ${reports} - - </body> -</project> Modified: lutinjaxx/trunk/jaxx-util/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -16,6 +16,7 @@ <packaging>jar</packaging> <version>0.5-SNAPSHOT</version> <description>Jaxx lutin library utility</description> +  <build> <plugins> @@ -26,4 +27,12 @@ </plugins> </build> +  +  +  + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> </project> Added: lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +to be done \ No newline at end of file Added: lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/jaxx-util/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +jaxx-util +========= + +.. contents:: + + +Présentation +------------ + +Ensemble de classe Java TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Modified: lutinjaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -51,6 +51,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <scope>compile</scope> + </dependency> + </dependencies>  @@ -84,7 +90,7 @@ <reporting> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> </plugin> @@ -94,12 +100,10 @@    + <scm> + <connection>${scm.connection.son}</connection> + <developerConnection>${scm.developerConnection.son}</developerConnection> + <url>${scm.url.son}</url> + </scm> -  -  - </project> Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +maven-jaxx-plugin +================= + +.. contents:: + + +Présentation +------------ + +Le plugin maven pour lancer le compilateur jaxx dans un projet maven TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Added: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Goals" href="plugin-info.html"/> + <item name="Détail goals"> + <item name="generate" href="generate-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + <menu name="Detail goals"> + <item name="generate" href="generate-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/text/JButton.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/force/JButton.jaxx 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1 @@ +<JButton id='testId' text='test.text'/> \ No newline at end of file Modified: lutinjaxx/trunk/pom.xml =================================================================== --- lutinjaxx/trunk/pom.xml 2008-10-06 14:59:44 UTC (rev 884) +++ lutinjaxx/trunk/pom.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -20,7 +20,7 @@ <modules> <module>jaxx-util</module> <module>jaxx-core</module> - <module>jaxx-swing-action</module> + <module>jaxx-swing-action</module> <module>maven-jaxx-plugin</module> </modules> @@ -56,17 +56,18 @@ <labs.project>buix</labs.project>  - <maven.scm.url>http://${labs.host}/plugins/scmsvn/viewcvs.php/${pom.artifactId}/trunk/?root=${labs.project} - </maven.scm.url> + <scm.url.son>http://${labs.host}/plugins/scmsvn/viewcvs.php/lutinjaxx/trunk/${pom.artifactId}/?root=${labs.project}</scm.url.son> -  - <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk - </maven.scm.developerConnection> +  + <scm.developerConnection.son> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/${pom.artifactId} + </scm.developerConnection.son> -  - <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${pom.artifactId}/trunk</maven.scm.connection> +  + <scm.connection.son> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/lutinjaxx/trunk/${pom.artifactId} + </scm.connection.son> - </properties> <build> @@ -93,6 +94,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <executions> + + <execution> + <phase>pre-site</phase> + </execution> + </executions> </plugin> </plugins> @@ -104,7 +111,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31</version> </dependency> <dependency> @@ -122,7 +129,7 @@ <groupId>org.codelutin</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${current.version}</version> - </dependency> + </dependency> <dependency> <groupId>com.sun</groupId> @@ -152,13 +159,20 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement>    - <scm> + <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> <url>${maven.scm.url}</url> Added: lutinjaxx/trunk/src/site/fr/rst/Todo.rst =================================================================== --- lutinjaxx/trunk/src/site/fr/rst/Todo.rst (rev 0) +++ lutinjaxx/trunk/src/site/fr/rst/Todo.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,4 @@ +TODO +==== + +a faire \ No newline at end of file Added: lutinjaxx/trunk/src/site/fr/rst/index.rst =================================================================== --- lutinjaxx/trunk/src/site/fr/rst/index.rst (rev 0) +++ lutinjaxx/trunk/src/site/fr/rst/index.rst 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,13 @@ +lutinjaxx +========= + +.. contents:: + + +Présentation +------------ + +Super pom du projet jaxx. + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Added: lutinjaxx/trunk/src/site/site.xml =================================================================== --- lutinjaxx/trunk/src/site/site.xml (rev 0) +++ lutinjaxx/trunk/src/site/site.xml 2008-10-07 18:35:38 UTC (rev 885) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project>

1 0

r884 - lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler
by sletellier＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: sletellier Date: 2008-10-06 14:59:44 +0000 (Mon, 06 Oct 2008) New Revision: 884 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java Log: Correction bug constructeur Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java 2008-10-06 14:50:36 UTC (rev 883) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/ScriptManager.java 2008-10-06 14:59:44 UTC (rev 884) @@ -176,27 +176,28 @@ } - private void processConstructor(String modifiers, SimpleNode node) { - assert node.getId() == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION : "expected node to be ConstructorDeclaration, found " + JavaParserTreeConstants.jjtNodeName[node.getId()] + " instead"; - assert node.getChild(0).getId() == JavaParserTreeConstants.JJTFORMALPARAMETERS : "expected node 0 to be FormalParameters, found " + JavaParserTreeConstants.jjtNodeName[node.getChild(1).getId()] + " instead"; - if (node.getChild(0).jjtGetNumChildren() == 0) { - compiler.reportError("The default no-argument constructor may not be redefined"); - } - else { - SimpleNode explicitConstructorInvocation = findExplicitConstructorInvocation(node); - if (explicitConstructorInvocation == null || explicitConstructorInvocation.getText().trim().startsWith("super(")) { - String code = "$initialize();" + JAXXCompiler.getLineSeparator(); - if (explicitConstructorInvocation == null) { - node.getChild(1).firstToken.image = code + node.getChild(1).firstToken.image; - } - else { - explicitConstructorInvocation.lastToken.image += code; - } - } - } - - compiler.bodyCode.append(modifiers).append(" ").append(node.getText()); - //compiler.bodyCode.append(";\n"); + private void processConstructor(String modifiers, SimpleNode node) { + assert node.getId() == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION : "expected node to be ConstructorDeclaration, found " + JavaParserTreeConstants.jjtNodeName[node.getId()] + " instead"; + assert node.getChild(0).getId() == JavaParserTreeConstants.JJTFORMALPARAMETERS : "expected node 0 to be FormalParameters, found " + JavaParserTreeConstants.jjtNodeName[node.getChild(1).getId()] + " instead"; + String code = ""; + if (node.getChild(0).jjtGetNumChildren() == 0) { + compiler.reportError("The default no-argument constructor may not be redefined"); + } + else { + SimpleNode explicitConstructorInvocation = findExplicitConstructorInvocation(node); + if (explicitConstructorInvocation == null || explicitConstructorInvocation.getText().trim().startsWith("super(")) { + code = "$initialize();" + JAXXCompiler.getLineSeparator(); + if (explicitConstructorInvocation == null) { + node.getChild(1).firstToken.image = node.getChild(1).firstToken.image; + } + else { + explicitConstructorInvocation.lastToken.image += code; + } + } + } + + compiler.bodyCode.append(modifiers).append(" ").append(node.getText().substring(0,node.getText().length()-1) + code + "}"); + //compiler.bodyCode.append(";\n"); } @@ -332,4 +333,4 @@ } } } -} \ No newline at end of file +}

1 0

r883 - lutinjaxx/trunk/jaxx-core
by tchemit＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: tchemit Date: 2008-10-06 14:50:36 +0000 (Mon, 06 Oct 2008) New Revision: 883 Modified: lutinjaxx/trunk/jaxx-core/changelog Log: changelog Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-06 14:50:20 UTC (rev 882) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-06 14:50:36 UTC (rev 883) @@ -1,5 +1,6 @@ ver-0-5 chemit 20081002 * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improvei18n integration (works now also for tabs) + * 20081002 [chemit] Improve i18n integration (works now also for tabs)

1 0