Author: tchemit Date: 2008-12-10 17:34:49 +0000 (Wed, 10 Dec 2008) New Revision: 1072 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1751.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test1.jaxx lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test2.jaxx lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test3.jaxx Modified: lutinjaxx/trunk/jaxx-core/changelog.txt lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultObjectHandler.java lutinjaxx/trunk/pom.xml Log: fix bug 1751 a return instead of a continue... go back to previous version to redo the release Modified: lutinjaxx/trunk/jaxx-core/changelog.txt =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-10 13:43:46 UTC (rev 1071) +++ lutinjaxx/trunk/jaxx-core/changelog.txt 2008-12-10 17:34:49 UTC (rev 1072) @@ -1,5 +1,8 @@ - 0.7 chemit 200812?? -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) +0.8 ??? 2009???? + +0.7 chemit 20081210 +* 20081210 [chemit] - fix bug 1751 +* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) * 20081208 [chemit] - javabBean attribute use to initialize bean - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - introduce MultiJXPathDecorator Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultObjectHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultObjectHandler.java 2008-12-10 13:43:46 UTC (rev 1071) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/DefaultObjectHandler.java 2008-12-10 17:34:49 UTC (rev 1072) @@ -667,7 +667,7 @@ if (!value.isEmpty()) { object.setJavaBeanInitCode(value); } - return; + continue; } if (name.equals("implements")) { if (object != compiler.getRootObject()) { @@ -677,7 +677,7 @@ } String[] interfaces = value.split(","); compiler.setExtraInterfaces(interfaces); - return; + continue; } if (isEventHandlerName(name)) { Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java (from rev 1060, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1750Test.java) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java 2008-12-10 17:34:49 UTC (rev 1072) @@ -0,0 +1,20 @@ +package org.codelutin.jaxx; + +import jaxx.Base64Coder; +import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.JAXXCompilerHelper; +import jaxx.runtime.JAXXObjectDescriptor; +import jaxx.runtime.Util; + +/** @author chemit */ +public class Bug1751Test extends JaxxBaseTest { + + public void testBug_1751() throws Exception { + mojo.execute(); + assertEquals(3, mojo.getFiles().length); + + checkPattern(mojo, "implements java.io.Serializable", true, mojo.getFiles()); + checkPattern(mojo, "label.setText(_(\"test\"))", true, mojo.getFiles()); + } + +} \ No newline at end of file Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1751.xml (from rev 1060, lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1750.xml) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1751.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/Bug_1751.xml 2008-12-10 17:34:49 UTC (rev 1072) @@ -0,0 +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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/generated-sources/it-1751/java</outJava> + <outResource>${basedir}/target/generated-sources/it-1751/resources</outResource> + <i18nable>true</i18nable> + <force>true</force> + <verbose>true</verbose> + <resetAfterCompile>false</resetAfterCompile> + <includes> + <value>**/bug_1751/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test1.jaxx =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test1.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test1.jaxx 2008-12-10 17:34:49 UTC (rev 1072) @@ -0,0 +1 @@ +<JLabel id='label' implements="java.io.Serializable" text='test'/> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test2.jaxx =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test2.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test2.jaxx 2008-12-10 17:34:49 UTC (rev 1072) @@ -0,0 +1 @@ +<JLabel id='label' text='test' implements="java.io.Serializable"/> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test3.jaxx =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test3.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/bug_1751/Test3.jaxx 2008-12-10 17:34:49 UTC (rev 1072) @@ -0,0 +1 @@ +<JLabel implements="java.io.Serializable" text='test' id='label'/> \ No newline at end of file Modified: lutinjaxx/trunk/pom.xml =================================================================== --- lutinjaxx/trunk/pom.xml 2008-12-10 13:43:46 UTC (rev 1071) +++ lutinjaxx/trunk/pom.xml 2008-12-10 17:34:49 UTC (rev 1072) @@ -32,7 +32,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>lutinjaxx</name> - <version>0.8-SNAPSHOT</version> + <version>0.7-SNAPSHOT</version> <description>Jaxx lutin library main pom</description> <inceptionYear>2008</inceptionYear>