February 2011 - Eugene-commits - mailman.cloud.codelutin.com

r1054 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:09:43 +0100 (Wed, 16 Feb 2011) New Revision: 1054 Url: http://nuiton.org/repositories/revision/eugene/1054 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 12:09:47 UTC (rev 1053) +++ trunk/pom.xml 2011-02-16 21:09:43 UTC (rev 1054) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>eugene</artifactId>

1 0

r1053 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:09:47 +0100 (Thu, 10 Feb 2011) New Revision: 1053 Url: http://nuiton.org/repositories/revision/eugene/1053 Log: Update mavenpom4redmineAndCentral to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:38:00 UTC (rev 1052) +++ trunk/pom.xml 2011-02-10 12:09:47 UTC (rev 1053) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>eugene</artifactId> @@ -462,12 +462,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd" /> + <include name="**/*.xsd"/> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd" /> + <include name="**/*.dtd"/> </fileset> </copy> </tasks>

1 0

r1052 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by hudson＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: hudson Date: 2011-02-09 09:38:00 +0100 (Wed, 09 Feb 2011) New Revision: 1052 Url: http://nuiton.org/repositories/revision/eugene/1052 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2011-02-09 08:37:59 UTC (rev 1051) +++ trunk/ant-eugene-task/pom.xml 2011-02-09 08:38:00 UTC (rev 1052) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-02-09 08:37:59 UTC (rev 1051) +++ trunk/eugene/pom.xml 2011-02-09 08:38:00 UTC (rev 1052) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-02-09 08:37:59 UTC (rev 1051) +++ trunk/maven-eugene-plugin/pom.xml 2011-02-09 08:38:00 UTC (rev 1052) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:37:59 UTC (rev 1051) +++ trunk/pom.xml 2011-02-09 08:38:00 UTC (rev 1052) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.3.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.3.2 + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.3.2</url> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> <profiles>

1 0

r1051 - in tags: . eugene-2.3.2
by hudson＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: hudson Date: 2011-02-09 09:37:59 +0100 (Wed, 09 Feb 2011) New Revision: 1051 Url: http://nuiton.org/repositories/revision/eugene/1051 Log: [maven-release-plugin] copy for tag eugene-2.3.2 Added: tags/eugene-2.3.2/ Property changes on: tags/eugene-2.3.2 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r1050 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by hudson＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: hudson Date: 2011-02-09 09:37:58 +0100 (Wed, 09 Feb 2011) New Revision: 1050 Url: http://nuiton.org/repositories/revision/eugene/1050 Log: [maven-release-plugin] prepare release eugene-2.3.2 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2011-02-09 08:09:00 UTC (rev 1049) +++ trunk/ant-eugene-task/pom.xml 2011-02-09 08:37:58 UTC (rev 1050) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-02-09 08:09:00 UTC (rev 1049) +++ trunk/eugene/pom.xml 2011-02-09 08:37:58 UTC (rev 1050) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-02-09 08:09:00 UTC (rev 1049) +++ trunk/maven-eugene-plugin/pom.xml 2011-02-09 08:37:58 UTC (rev 1050) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:09:00 UTC (rev 1049) +++ trunk/pom.xml 2011-02-09 08:37:58 UTC (rev 1050) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.3.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.3.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.3.2</url> </scm> <profiles> @@ -462,12 +462,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd"/> + <include name="**/*.xsd" /> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd"/> + <include name="**/*.dtd" /> </fileset> </copy> </tasks>

1 0

r1049 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:09:00 +0100 (Wed, 09 Feb 2011) New Revision: 1049 Url: http://nuiton.org/repositories/revision/eugene/1049 Log: Evolution #1302: Updates to mavenpom 2.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 15:13:03 UTC (rev 1048) +++ trunk/pom.xml 2011-02-09 08:09:00 UTC (rev 1049) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <artifactId>eugene</artifactId>

1 0

r1048 - trunk
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 16:13:03 +0100 (Thu, 03 Feb 2011) New Revision: 1048 Url: http://nuiton.org/repositories/revision/eugene/1048 Log: Evolution #1283: Updates to processor 1.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 11:28:25 UTC (rev 1047) +++ trunk/pom.xml 2011-02-03 15:13:03 UTC (rev 1048) @@ -364,7 +364,7 @@  <projectId>eugene</projectId> - <processorPluginVersion>1.2</processorPluginVersion> + <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.3</nuitonI18nVersion>

1 0

r1047 - trunk
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 12:28:25 +0100 (Thu, 03 Feb 2011) New Revision: 1047 Url: http://nuiton.org/repositories/revision/eugene/1047 Log: Evolution #1283: Updates to processor 1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-01 17:26:36 UTC (rev 1046) +++ trunk/pom.xml 2011-02-03 11:28:25 UTC (rev 1047) @@ -364,7 +364,7 @@  <projectId>eugene</projectId> - <processorPluginVersion>1.1</processorPluginVersion> + <processorPluginVersion>1.2</processorPluginVersion> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.3</nuitonI18nVersion>

1 0

r1046 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 01 Feb '11

01 Feb '11

Author: tchemit Date: 2011-02-01 18:26:36 +0100 (Tue, 01 Feb 2011) New Revision: 1046 Url: http://nuiton.org/repositories/revision/eugene/1046 Log: can split fqns without any generics... Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-02-01 16:43:24 UTC (rev 1045) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-02-01 17:26:36 UTC (rev 1046) @@ -338,16 +338,8 @@ return null; } - int firstPartIndex = fqns.indexOf('<'); - if (firstPartIndex == -1) { - - // no generics, just return the fqn - return new String[]{fqns}; - } - List<String> parts = new ArrayList<String>(); - // there is others generics in generics, worse case... int begin = 0; int count = 0;

1 0

r1045 - in trunk/eugene/src: main/java/org/nuiton/eugene/java/extension test/java/org/nuiton/eugene/java/extension
by tchemit＠users.nuiton.org 01 Feb '11

01 Feb '11

Author: tchemit Date: 2011-02-01 17:43:24 +0100 (Tue, 01 Feb 2011) New Revision: 1045 Url: http://nuiton.org/repositories/revision/eugene/1045 Log: add array support in ImportManager Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java 2011-01-31 18:08:12 UTC (rev 1044) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java 2011-02-01 16:43:24 UTC (rev 1045) @@ -130,6 +130,14 @@ // was not imported return false; } + + if (fqn.endsWith("[]")) { + + // fqn contains an array definition + String simpleFQN = fqn.substring(0, fqn.length() - 2); + return addImport(simpleFQN); + } + if (JavaGeneratorUtil.containsGenerics(fqn)) { // Generics case : @@ -168,6 +176,20 @@ * If there is a conflict, returns the fully qualified name, otherwise * returns the simple name * + * @param clazz the clazz to add + * @return the fqn or simple name according to in-place imports + * @since 2.3.2 + */ + public String getType(Class<?> clazz) { + String type = getType(clazz.getName()); + return type; + } + + /** + * 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 */ @@ -187,7 +209,7 @@ // There is a conflict, do not use simple name return fqn; - } + } // No conflict, use simple name int packageEndIndex = getLastDotIndex(fqn); if (packageEndIndex == -1) { Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java 2011-01-31 18:08:12 UTC (rev 1044) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java 2011-02-01 16:43:24 UTC (rev 1045) @@ -30,6 +30,7 @@ import org.junit.Before; import org.junit.Test; +import java.io.File; import java.io.Serializable; import java.util.List; @@ -106,6 +107,9 @@ Assert.assertTrue(mgr.addImport(Serializable.class)); Assert.assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); + + Assert.assertTrue(mgr.addImport(File.class.getName() + "[]")); + Assert.assertTrue(mgr.addImport(File.class)); // was already import just above } @Test @@ -122,6 +126,9 @@ Assert.assertEquals("Byte", mgr.getType("Byte")); Assert.assertEquals("Toto", mgr.getType("java.lang.Toto")); Assert.assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); // Conflict, package differs + + Assert.assertEquals("File[]", mgr.getType(File.class.getName() + "[]")); + Assert.assertEquals("File", mgr.getType(File.class.getName())); } @Test @@ -141,7 +148,7 @@ Assert.assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); } -@Test + @Test public void testGetImportsWithGeneric() throws Exception { Assert.assertTrue(mgr.addImport("org.nuiton.eugene.Toto<String, java.util.File>")); List<String> imports = mgr.getImports("org.nuiton.eugene"); @@ -149,7 +156,7 @@ Assert.assertEquals("java.util.File", imports.get(0)); } - + @Test public void testGetImports() throws Exception { Assert.assertTrue(mgr.addImport("org.nuiton.eugene.Toto"));

1 0