Author: tchemit Date: 2011-03-17 19:17:49 +0100 (Thu, 17 Mar 2011) New Revision: 2240 Url: http://nuiton.org/repositories/revision/jaxx/2240 Log: fixed Anomalie #1404: Using decorator='boxed' miss import jaxx.runtime.SwingUtil Added: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Test1.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java trunk/pom.xml Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2011-03-12 14:21:19 UTC (rev 2239) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2011-03-17 18:17:49 UTC (rev 2240) @@ -61,8 +61,10 @@ for (ChildRef child : parent.getChilds()) { if (child.getChild() == object) { String javaCode = child.getChildJavaCode(); + String type = + compiler.getImportManager().getType(SwingUtil.class); child.setChildJavaCode( - SwingUtil.class.getSimpleName() + + type + ".boxComponentWithJxLayer(" + javaCode + ")"); break; } Added: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java (rev 0) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java 2011-03-17 18:17:49 UTC (rev 2240) @@ -0,0 +1,46 @@ +/* + * #%L + * JAXX :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ +package org.nuiton.jaxx.plugin; + +import org.junit.Test; + +/** + * Test the bug describe here http://nuiton.org/issues/show/1404 + * + * @author tchemit <chemit@codelutin.com> + * @since 2.4.1 + */ +public class Bug1404Test extends JaxxBaseTest { + + @Test + public void Bug_1404() throws Exception { + + GenerateMojo mojo = getMojo(); + mojo.execute(); + assertNumberJaxxFiles(1); + + checkPattern(mojo, "import jaxx.runtime.SwingUtil;", true); + } +} \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml 2011-03-17 18:17:49 UTC (rev 2240) @@ -0,0 +1,53 @@ +<!-- + #%L + JAXX :: Maven plugin + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2011 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% + --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jaxx.test</groupId> + <artifactId>test</artifactId> + <version>0</version> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/target/test-classes</src> + <outJava>${basedir}/target/generated-sources/test-java</outJava> + <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> + <i18nable>true</i18nable> + <force>true</force> + <!--<verbose>true</verbose>--> + <resetAfterCompile>false</resetAfterCompile> + <includes> + <value>**/bug1404Test/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Test1.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Test1.jaxx (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Test1.jaxx 2011-03-17 18:17:49 UTC (rev 2240) @@ -0,0 +1,25 @@ +<!-- + #%L + JAXX :: Maven plugin + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2011 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% + --> +<JLabel implements="java.io.Serializable" text='test' decorator='boxed'/> \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Test1.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-12 14:21:19 UTC (rev 2239) +++ trunk/pom.xml 2011-03-17 18:17:49 UTC (rev 2240) @@ -448,8 +448,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge>