January 2010 - Eugene-commits - mailman.cloud.codelutin.com

r804 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-25 00:38:09 +0100 (Mon, 25 Jan 2010) New Revision: 804 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine-2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-22 13:06:21 UTC (rev 803) +++ trunk/pom.xml 2010-01-24 23:38:09 UTC (rev 804) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>eugene</artifactId> @@ -254,7 +254,7 @@ <nuiton-utils.version>1.1.1</nuiton-utils.version>  - <maven.site.locales>en,fr</maven.site.locales> + <siteLocales>en,fr</siteLocales> </properties> <build>

1 0

r803 - in trunk: eugene/src/main/java/org/nuiton/eugene/models/object maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator
by tchemit＠users.nuiton.org 22 Jan '10

22 Jan '10

Author: tchemit Date: 2010-01-22 14:06:21 +0100 (Fri, 22 Jan 2010) New Revision: 803 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java Log: suppression des entetes d'ide Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java 2010-01-19 17:33:23 UTC (rev 802) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java 2010-01-22 13:06:21 UTC (rev 803) @@ -18,11 +18,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * ##%* */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.nuiton.eugene.models.object; /** Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2010-01-19 17:33:23 UTC (rev 802) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2010-01-22 13:06:21 UTC (rev 803) @@ -18,11 +18,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * ##%* */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.nuiton.eugene.test.generator; import java.util.List;

1 0

r802 - trunk
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 18:33:23 +0100 (Tue, 19 Jan 2010) New Revision: 802 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 21:23:36 UTC (rev 801) +++ trunk/pom.xml 2010-01-19 17:33:23 UTC (rev 802) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </parent> <artifactId>eugene</artifactId> @@ -297,4 +297,3 @@ </scm> </project> -

1 0

r801 - in trunk/src/site: fr/rst rst
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 22:23:36 +0100 (Sun, 17 Jan 2010) New Revision: 801 Modified: trunk/src/site/fr/rst/index.rst trunk/src/site/rst/index.rst Log: Anomalie #228: Fix ant-eugene-plugin link on home page of site Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2010-01-17 21:10:22 UTC (rev 800) +++ trunk/src/site/fr/rst/index.rst 2010-01-17 21:23:36 UTC (rev 801) @@ -15,5 +15,5 @@ * `maven-eugene-plugin`_ .. _eugene-api: eugene/index.html -.. _ant-eugene-task: ant-eugenet-task/index.html +.. _ant-eugene-task: ant-eugene-task/index.html .. _maven-eugene-plugin: maven-eugene-plugin/index.html \ No newline at end of file Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-01-17 21:10:22 UTC (rev 800) +++ trunk/src/site/rst/index.rst 2010-01-17 21:23:36 UTC (rev 801) @@ -15,5 +15,5 @@ * `maven-eugene-plugin`_ .. _eugene-api: eugene/index.html -.. _ant-eugene-task: ant-eugenet-task/index.html +.. _ant-eugene-task: ant-eugene-task/index.html .. _maven-eugene-plugin: maven-eugene-plugin/index.html \ No newline at end of file

1 0

r800 - trunk/eugene/src/main/java/org/nuiton/eugene
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 22:10:22 +0100 (Sun, 17 Jan 2010) New Revision: 800 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/Template.java Log: Improve javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-17 20:55:45 UTC (rev 799) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-01-17 21:10:22 UTC (rev 800) @@ -580,7 +580,7 @@ /** * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. * See JUnit test for matching expressions. - * //@see org.nuiton.eugene.GeneratorUtilTest + * * @param str FullQualifiedName for an attribute type (for exemple) * @return the simple name associated to the str given */ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-01-17 20:55:45 UTC (rev 799) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-01-17 21:10:22 UTC (rev 800) @@ -89,7 +89,12 @@ public abstract void applyTemplate(M model, File destDir) throws IOException; - //TODO when deprecate methods, says what to use now or why it was deprecated for + + /** + * @param v override value + * @deprecated since 2.0.0, use a Properties object to add the {@link Template#PROP_OVERWRITE} value + * @see Template#setProperties(java.util.Properties) + */ @Deprecated public void setOverwrite(boolean v) { //overwrite = v; @@ -104,7 +109,11 @@ return properties.getProperty(PROP_ENCODING, ""); } - //TODO when deprecate methods, says what to use now or why it was deprecated for + /** + * @param encoding encoding value + * @deprecated since 2.0.0, use a Properties object to add the {@link Template#PROP_ENCODING} value + * @see Template#setProperties(java.util.Properties) + */ @Deprecated public void setEncoding(String encoding) { //this.encoding = encoding; @@ -153,6 +162,11 @@ return this.generatedPackages; } + /** + * @param lastModifiedSource lastModifiedSource value + * @deprecated since 2.0.0, use a Properties object to add the {@link Template#PROP_LAST_MODIFIED_SOURCE} value + * @see Template#setProperties(java.util.Properties) + */ @Deprecated public void setLastModifiedSource(long lastModifiedSource) { properties.setProperty(PROP_LAST_MODIFIED_SOURCE, String.valueOf(lastModifiedSource));

1 0

r799 - in trunk/eugene/src/main/java/org/nuiton/eugene: . java
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 21:55:45 +0100 (Sun, 17 Jan 2010) New Revision: 799 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java Log: Improve javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-01-17 20:50:08 UTC (rev 798) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-01-17 20:55:45 UTC (rev 799) @@ -76,7 +76,14 @@ /** Model */ protected M model; - //TODO when deprecate methods, says what to use now or why it was deprecated for + /** + * Old method from EUGene 1.0.1 used to generate files. Now, you have to use a Reader instead of + * directly use a Template. + * + * @param file list of tiles + * @param destDir destination folder + * @deprecated since 2.0.0 + */ @Deprecated public abstract void generate(File[] file, File destDir); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-01-17 20:50:08 UTC (rev 798) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-01-17 20:55:45 UTC (rev 799) @@ -72,6 +72,7 @@ * - initOutputGenerator : must be override to instanciate output Generator * - initOutputModel : must be override to instanciate output Model * </pre> + * * @param model input model * @since 2.0.0 */ @@ -90,6 +91,7 @@ /** * Initialization of the Output generator. Must be override to instanciate the Generator that will * make the generation of the Output model. + * * @return the output generator * @since 2.0.0 */ @@ -98,6 +100,7 @@ /** * Initialization of the Output model. Must be override to instanciate and initialize the output model. * For ObjectModel you can use, ObjectModelBuilder to build easily an empty ObjectModel. + * * @return the output model * @since 2.0.0 */ @@ -110,6 +113,7 @@ /** * Output properties for output generator. Initially set from build configuration. + * * @return output properties * @since 2.0.0 */ @@ -130,6 +134,7 @@ /** * Old method from previous EUGene 1.0.1 version. Used before creation of ModelReader. + * * @param file * @param destDir * @deprecated no need to manage list of files in input, prefer use input model. @@ -149,6 +154,7 @@ * on the output model of the previous one. In the simple other case, the current transformation transform the input model * into an output model. You must override {@link #initOutputModel} and {@link #initOutputTemplate } methods to initialize * output model and output template to apply (generally a generator). + * * @param model input model to transform and generate * @param destDir destination directory to put generated files * @throws IOException @@ -173,6 +179,7 @@ /** * Transformation method from an input Model. This method also initialize previous transformer, output model * and output generator with ${@link #init(org.nuiton.eugene.models.Model) } method. + * * @param model input model * @since 2.0.0 */ @@ -185,6 +192,7 @@ * Method to override for the transformation. Initialization (PreviousTransformer, OutputModel, OutputGenerator) * is made before transformation call. This method only transform an input model into an output model. * No generation is done neither outputGenerator call. + * * @since 2.0.0 */ protected abstract void transform(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:50:08 UTC (rev 798) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:55:45 UTC (rev 799) @@ -59,6 +59,7 @@ /** * Get the ImportsManager associated to the classifier. If not exist, it will be created. + * * @param classifier reference for the ImportsManager * @return the importsManager associated to the classifier (never null) */ @@ -78,6 +79,7 @@ /** * Get imports for a classifier. The ImportsManager must be defined in the model. + * * @param classifier reference for the imports * @return a List of String which contains all imports for the classifier */

1 0

r798 - trunk/eugene/src/test/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 21:50:08 +0100 (Sun, 17 Jan 2010) New Revision: 798 Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java Log: missing file for changing ImportsManager Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java 2010-01-17 20:43:08 UTC (rev 797) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java 2010-01-17 20:50:08 UTC (rev 798) @@ -27,9 +27,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.eugene.ImportsManager; import static org.junit.Assert.*; -import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl;

1 0

r797 - in trunk/eugene/src: main/java/org/nuiton/eugene/java test/java/org/nuiton/eugene test/java/org/nuiton/eugene/java
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 21:43:08 +0100 (Sun, 17 Jan 2010) New Revision: 797 Added: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java Removed: trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Log: Clean usage of ImportsManager + some javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java 2010-01-17 20:43:08 UTC (rev 797) @@ -22,13 +22,13 @@ private static final Log log = LogFactory.getLog(AnnotationsManagerExtension.class); /** - * Extension static used to identify ImportsManagerExtension in ObjectModel + * Extension static used to identify AnnotationsManagerExtension in ObjectModel */ public static final String OBJECTMODEL_EXTENSION = "annotations"; /** - * Map of ImportsManager with key equals to the classifier qualified name associated to - * the ImportsManager + * Map of AnotationsManager with key equals to the classifier qualified name associated to + * the AnotationsManager */ protected Map<String, AnnotationsManager> managers; @@ -52,10 +52,10 @@ } /** - * Get the ImportsManager associated to the classifier. If not exist, it will be created. + * Get the AnotationsManager associated to the classifier. If not exist, it will be created. * - * @param classifier reference for the ImportsManager - * @return the importsManager associated to the classifier (never null) + * @param classifier reference for the AnotationsManager + * @return the annotationsManager associated to the classifier (never null) */ public AnnotationsManager getManager(ObjectModelClassifier classifier) { Map<String, AnnotationsManager> managers = getManagers(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java 2010-01-17 20:43:08 UTC (rev 797) @@ -23,7 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.ImportsManager; import org.nuiton.eugene.models.object.ObjectModelClassifier; import java.util.HashMap; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-01-17 20:43:08 UTC (rev 797) @@ -27,8 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModelType; import org.nuiton.eugene.models.object.*; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.xml.*; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-01-17 20:43:08 UTC (rev 797) @@ -31,7 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.*; /** Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-01-17 20:43:08 UTC (rev 797) @@ -22,10 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelType; import org.nuiton.eugene.Template; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModelTransformer; import org.nuiton.eugene.models.object.*; /** Deleted: trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2010-01-17 20:28:34 UTC (rev 796) +++ trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java 2010-01-17 20:43:08 UTC (rev 797) @@ -1,106 +0,0 @@ -/* - * *##% - * EUGene :: EUGene - * Copyright (C) 2004 - 2009 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>. - * ##%* - */ -package org.nuiton.eugene; - -import java.io.Serializable; -import java.util.List; - -import junit.framework.TestCase; - -public class ImportsManagerTest extends TestCase { - - private ImportsManager mgr; - - @Override - protected void setUp() throws Exception { - mgr = new ImportsManager(); - } - - public void testAddImport() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs - - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Toto")); - - assertTrue(mgr.addImport(Serializable.class)); - assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); - } - - public void testGetType() throws Exception { - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); - assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs - - assertEquals("void", mgr.getType("void")); - assertEquals("boolean", mgr.getType("boolean")); - assertEquals("Byte", mgr.getType("Byte")); - assertEquals("Toto", mgr.getType("java.lang.Toto")); - assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); - } - - public void testGetImports() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); - List<String> imports = mgr.getImports("org.nuiton.eugene"); - assertEquals(1, imports.size()); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); - - imports = mgr.getImports("org.nuiton"); - assertEquals(3, imports.size()); - // Check using alphabetic sort - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); - - imports = mgr.getImports("org.chorem"); - assertEquals(3, imports.size()); - - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - - assertTrue(mgr.addImport("java.lang.String")); - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - - } - -} Copied: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java (from rev 795, trunk/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java) =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java (rev 0) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java 2010-01-17 20:43:08 UTC (rev 797) @@ -0,0 +1,106 @@ +/* + * *##% + * EUGene :: EUGene + * Copyright (C) 2004 - 2009 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>. + * ##%* + */ +package org.nuiton.eugene.java; + +import java.io.Serializable; +import java.util.List; + +import junit.framework.TestCase; + +public class ImportsManagerTest extends TestCase { + + private ImportsManager mgr; + + @Override + protected void setUp() throws Exception { + mgr = new ImportsManager(); + } + + public void testAddImport() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs + + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Toto")); + + assertTrue(mgr.addImport(Serializable.class)); + assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); + } + + public void testGetType() throws Exception { + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); + assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs + + assertEquals("void", mgr.getType("void")); + assertEquals("boolean", mgr.getType("boolean")); + assertEquals("Byte", mgr.getType("Byte")); + assertEquals("Toto", mgr.getType("java.lang.Toto")); + assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); + } + + public void testGetImports() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); + List<String> imports = mgr.getImports("org.nuiton.eugene"); + assertEquals(1, imports.size()); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); + + imports = mgr.getImports("org.nuiton"); + assertEquals(3, imports.size()); + // Check using alphabetic sort + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); + + imports = mgr.getImports("org.chorem"); + assertEquals(3, imports.size()); + + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + + assertTrue(mgr.addImport("java.lang.String")); + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + + } + +} Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + /branches/1.0.1-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:652-681 /branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:682-754

1 0

r796 - in trunk/eugene/src/main/java/org/nuiton/eugene: . java
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 21:28:34 +0100 (Sun, 17 Jan 2010) New Revision: 796 Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java Log: - Move ImportsManager (the old one is deprecated) - Add package-info for org.nuiton.eugene.java package Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java 2010-01-17 18:35:57 UTC (rev 795) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java 2010-01-17 20:28:34 UTC (rev 796) @@ -34,8 +34,9 @@ * generated code. * * @author thimel, chemit - * TODO-TC20091217 Move this to java package, this is specific to java generation + * @deprecated This class was moved to {@link org.nuiton.eugene.java} package */ +@Deprecated public class ImportsManager { private static Set<String> primitiveTypes; Copied: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java (from rev 795, trunk/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java) =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java 2010-01-17 20:28:34 UTC (rev 796) @@ -0,0 +1,182 @@ +/* + * *##% + * EUGene :: EUGene + * Copyright (C) 2004 - 2009 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>. + * ##%* + */ +package org.nuiton.eugene.java; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Class used in generators that allows to manage easily imports. A first-pass + * allow to register imports, and in a second-pass, returns the type to use in + * generated code. + * + * @author thimel, chemit + * @version $Revision$ + + * Mise a jour: $Date$ par : + * $Author$ + * @since 2.0.0 + */ +public class ImportsManager { + + private static Set<String> primitiveTypes; + + static { + primitiveTypes = new HashSet<String>(); + + primitiveTypes.add("byte"); + primitiveTypes.add("Byte"); + primitiveTypes.add("short"); + primitiveTypes.add("Short"); + primitiveTypes.add("int"); + primitiveTypes.add("Integer"); + primitiveTypes.add("long"); + primitiveTypes.add("Long"); + primitiveTypes.add("float"); + primitiveTypes.add("Float"); + primitiveTypes.add("double"); + primitiveTypes.add("Double"); + + primitiveTypes.add("char"); + primitiveTypes.add("Char"); + primitiveTypes.add("String"); + + primitiveTypes.add("boolean"); + primitiveTypes.add("Boolean"); + + primitiveTypes.add("void"); + + } + private Map<String, String> imports = new HashMap<String, String>(); + private State state = State.FILLING; + + /** + * From the given class, add it to the imports list. + * @param clazz the class to import + * @return true if import add was successful + * @see ImportsManager#addImport(String) + */ + public boolean addImport(Class<?> clazz) { + return addImport(clazz.getName()); + } + + /** + * From the given fqn (fully qualified name), add it to the imports list. + * If there is a conflict adding this import, will return false. + * If reading of the imports has started, this method will return false, + * unless type does not need to be imported. + * @param fqn the fully qualified name to import + * @return true if import add was successful + */ + public boolean addImport(String fqn) { + // if no package don't include it + if (fqn.indexOf(".") == -1) { + return true; + } + + // Exclude java.lang classes + if (fqn == null || fqn.trim().isEmpty() || + (fqn.startsWith("java.lang.") && fqn.lastIndexOf(".") == 9)) { + return true; + } + // Exclude primitive types + if (primitiveTypes.contains(fqn)) { + return true; + } + // Reject generics + if (fqn.indexOf("<") != -1 || fqn.indexOf(">") != -1) { + return false; + } + String name = fqn.substring(fqn.lastIndexOf(".") + 1); + String inPlaceFqn = imports.get(name); + if (inPlaceFqn == null) { + // Someone has started to read imports, impossible to add some more + if (state == State.READING) { + return false; + } else { + imports.put(name, fqn); + return true; + } + } + // if fqn is not the same, return false. Otherwise, no need to override. + return inPlaceFqn.equals(fqn); + } + + /** + * Accorging to the already added types, returns the type to write in file. + * If there is a conflict, returns the fully qualified name, otherwise + * returns the simple name + * @param fqn the fully qualified name to add + * @return the fqn or simple name according to in-place imports + */ + public String getType(String fqn) { + boolean importResult = addImport(fqn); + if (!importResult) { + // There is a conflict, do not use simple name + return fqn; + } else { + // No conflict, use simple name + int packageEndIndex = fqn.lastIndexOf("."); + if (packageEndIndex == -1) { + return fqn; + } else { + return fqn.substring(packageEndIndex + 1); + } + } + } + + /** + * List the imports. This method will remove the useless imports according + * to the given packageName (no need to import a class in the same package) + * @param packageName the current package name (to avoid useless imports) + * @return the imports alphabeticaly sorted + */ + public List<String> getImports(String packageName) { + state = State.READING; + List<String> result = new ArrayList<String>(); + for (String fqn : imports.values()) { + if (!(fqn.lastIndexOf(".") == packageName.length() && fqn.startsWith(packageName + "."))) { + result.add(fqn); + } + } + Collections.sort(result); + return result; + } + + /** + * Method to reset imports list. If imports has been listed, it becomes back + * possible to add imports. + */ + public void clearImports() { + imports.clear(); + state = State.FILLING; + } + + private enum State { + + FILLING, READING + } +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:652-681 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:682-754 Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java 2010-01-17 20:28:34 UTC (rev 796) @@ -0,0 +1,31 @@ +/* + * *##% + * EUGene :: EUGene + * Copyright (C) 2004 - 2009 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>. + * ##%* + */ +/** + * Eugene java package : all specific class for Java generation. + * <pre> + * - ObjectModel Extensions : {@link org.nuiton.eugene.java.AnnotationsManager } and {@link org.nuiton.eugene.java.ImportsManager } + * - Builder : {@link org.nuiton.eugene.java.JavaBuilder } used to fill an ObjectModel in a Java way + * - Transformer : {@link org.nuiton.eugene.java.ObjectModelTransformerToJava } used to transform an xmi ObjectModel to a java one + * - Generator : {@link org.nuiton.eugene.java.JavaGenerator } is a template used to write java files (processed by Nuiton-processor) + * </pre> + */ +package org.nuiton.eugene.java; + Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r795 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 19:35:57 +0100 (Sun, 17 Jan 2010) New Revision: 795 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-01-17 18:35:54 UTC (rev 794) +++ trunk/ant-eugene-task/pom.xml 2010-01-17 18:35:57 UTC (rev 795) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3</version> + <version>2.0.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-01-17 18:35:54 UTC (rev 794) +++ trunk/eugene/pom.xml 2010-01-17 18:35:57 UTC (rev 795) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3</version> + <version>2.0.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-01-17 18:35:54 UTC (rev 794) +++ trunk/maven-eugene-plugin/pom.xml 2010-01-17 18:35:57 UTC (rev 795) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3</version> + <version>2.0.0-beta-4-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 18:35:54 UTC (rev 794) +++ trunk/pom.xml 2010-01-17 18:35:57 UTC (rev 795) @@ -13,7 +13,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.0-beta-3</version> + <version>2.0.0-beta-4-SNAPSHOT</version> <modules> <module>eugene</module> @@ -291,9 +291,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.0.0-beta-3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.0.0-beta-3</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0