October 2012 - Eugene-commits - mailman.cloud.codelutin.com

r1198 - trunk
by tchemit＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:43:35 +0100 (Tue, 30 Oct 2012) New Revision: 1198 Url: http://nuiton.org/repositories/revision/eugene/1198 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-29 16:31:45 UTC (rev 1197) +++ trunk/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <artifactId>eugene</artifactId>

1 0

r1197 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 29 Oct '12

29 Oct '12

Author: tchemit Date: 2012-10-29 17:31:45 +0100 (Mon, 29 Oct 2012) New Revision: 1197 Url: http://nuiton.org/repositories/revision/eugene/1197 Log: refs #2385: Improve JavaBean generation template (prefer use getOrNull method instead of get) Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:29:21 UTC (rev 1196) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-29 16:31:45 UTC (rev 1197) @@ -429,7 +429,7 @@ addParameter(operation, "int", "index"); setOperationBody(operation, "" /*{ - <%=simpleType%> o = CollectionUtil.get(<%=attrName%>, index); + <%=simpleType%> o = CollectionUtil.getOrNull(<%=attrName%>, index); return o; }*/ );

1 0

r1196 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 13:29:21 +0100 (Sun, 28 Oct 2012) New Revision: 1196 Url: http://nuiton.org/repositories/revision/eugene/1196 Log: refs #2385: Improve JavaBean generation template Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:28:48 UTC (rev 1195) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:29:21 UTC (rev 1196) @@ -34,6 +34,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.util.CollectionUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -162,13 +163,14 @@ // Add property change support createPropertyChangeSupport(output); } + } - boolean hasAMultipleProperty = containsMutiple(properties); + boolean hasAMultipleProperty = containsMutiple(properties); - // Add helper operations - if (hasAMultipleProperty) { - createGetChildMethod(output); - } + // Add helper operations + if (hasAMultipleProperty) { + + addImport(output, CollectionUtil.class); } } @@ -401,13 +403,13 @@ String attrType, String methodPrefix) { - ObjectModelOperation getter = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName(methodPrefix , attrName), attrType, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getter, "" + setOperationBody(operation, "" /*{ return <%=attrName%>; }*/ @@ -418,16 +420,16 @@ String attrName, String attrType, String simpleType) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("get", attrName), attrType, ObjectModelJavaModifier.PUBLIC ); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" + addParameter(operation, "int", "index"); + setOperationBody(operation, "" /*{ - <%=simpleType%> o = getChild(<%=attrName%>, index); + <%=simpleType%> o = CollectionUtil.get(<%=attrName%>, index); return o; }*/ ); @@ -435,13 +437,13 @@ protected void createIsEmptyMethod(ObjectModelClass output, String attrName) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("is", attrName)+"Empty", boolean.class, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getChild, "" + setOperationBody(operation, "" /*{ return <%=attrName%> == null || <%=attrName%>.isEmpty(); }*/ @@ -450,13 +452,13 @@ protected void createSizeMethod(ObjectModelClass output, String attrName) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("size", attrName), int.class, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getChild, "" + setOperationBody(operation, "" /*{ return <%=attrName%> == null ? 0 : <%=attrName%>.size(); }*/ @@ -467,13 +469,13 @@ String attrType, String constantName, boolean usePCS) { - ObjectModelOperation addChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("add", attrName), "void", ObjectModelJavaModifier.PUBLIC ); - addParameter(addChild, attrType, attrName); + addParameter(operation, attrType, attrName); String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" @@ -487,7 +489,7 @@ }*/ ); } - setOperationBody(addChild, buffer.toString()); + setOperationBody(operation, buffer.toString()); } protected void createAddAllChildrenMethod(ObjectModelClass output, @@ -495,13 +497,13 @@ String attrType, String constantName, boolean usePCS) { - ObjectModelOperation addAllChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("addAll", attrName), "void", ObjectModelJavaModifier.PUBLIC ); - addParameter(addAllChild, "java.util.Collection<" + attrType + ">", attrName); + addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" @@ -515,7 +517,7 @@ }*/ ); } - setOperationBody(addAllChild, buffer.toString()); + setOperationBody(operation, buffer.toString()); } protected void createRemoveChildMethod(ObjectModelClass output, @@ -669,36 +671,6 @@ } } - protected void createGetChildMethod(ObjectModelClass output) { - ObjectModelOperation getChild = addOperation( - output, - "getChild", "<T> T", - ObjectModelJavaModifier.PROTECTED - ); - addParameter(getChild, "java.util.Collection<T>", "childs"); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - T result = null; - if (childs != null) { - if (childs instanceof List) { - result = ((List<T>) childs).get(index); - } else { - int i = 0; - for (T o : childs) { - if (index == i) { - result = o; - break; - } - i++; - } - } - } - return result; - }*/ - ); - } - protected void addSerializable(ObjectModelClass input, ObjectModelClass output, boolean interfaceFound) {

1 0

r1195 - trunk
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 13:28:48 +0100 (Sun, 28 Oct 2012) New Revision: 1195 Url: http://nuiton.org/repositories/revision/eugene/1195 Log: refs #2387: Updates nuiton-utils to 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-28 10:40:57 UTC (rev 1194) +++ trunk/pom.xml 2012-10-28 12:28:48 UTC (rev 1195) @@ -397,7 +397,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r1194 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 11:40:57 +0100 (Sun, 28 Oct 2012) New Revision: 1194 Url: http://nuiton.org/repositories/revision/eugene/1194 Log: fixes #2385: Improve JavaBean generation template Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 09:06:36 UTC (rev 1193) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 10:40:57 UTC (rev 1194) @@ -457,9 +457,9 @@ ObjectModelJavaModifier.PUBLIC ); setOperationBody(getChild, "" - /*{ - return <%=attrName%> == null ? 0 : <%=attrName%>.size(); - }*/ + /*{ + return <%=attrName%> == null ? 0 : <%=attrName%>.size(); + }*/ ); } protected void createAddChildMethod(ObjectModelClass output, @@ -483,8 +483,7 @@ ); if (usePCS) { buffer.append("" - /*{ - firePropertyChange(<%=constantName%>, null, <%=attrName%>); + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); }*/ ); } @@ -512,8 +511,7 @@ ); if (usePCS) { buffer.append("" - /*{ - firePropertyChange(<%=constantName%>, null, <%=attrName%>); + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); }*/ ); } @@ -536,8 +534,7 @@ StringBuilder buffer = new StringBuilder(); buffer.append("" /*{ - boolean removed = <%=methodName%>().remove(<%=attrName%>); - }*/ + boolean removed = <%=methodName%>().remove(<%=attrName%>);}*/ ); if (usePCS) { @@ -545,8 +542,7 @@ /*{ if (removed) { firePropertyChange(<%=constantName%>, <%=attrName%>, null); - } - }*/ + }}*/ ); } buffer.append("" @@ -574,8 +570,7 @@ String methodName = getJavaBeanMethodName("get", attrName); buffer.append("" /*{ - boolean removed = <%=methodName%>().removeAll(<%=attrName%>); - }*/ + boolean removed = <%=methodName%>().removeAll(<%=attrName%>);}*/ ); if (usePCS) { @@ -583,8 +578,7 @@ /*{ if (removed) { firePropertyChange(<%=constantName%>, <%=attrName%>, null); - } - }*/ + }}*/ ); } buffer.append("" @@ -613,11 +607,6 @@ buffer.append("" /*{ boolean contains = <%=methodName%>().contains(<%=attrName%>); - }*/ - ); - - buffer.append("" - /*{ return contains; }*/ ); @@ -642,11 +631,6 @@ buffer.append("" /*{ boolean contains = <%=methodName%>().containsAll(<%=attrName%>); - }*/ - ); - - buffer.append("" - /*{ return contains; }*/ ); @@ -695,16 +679,22 @@ addParameter(getChild, "int", "index"); setOperationBody(getChild, "" /*{ + T result = null; if (childs != null) { - int i = 0; - for (T o : childs) { - if (index == i) { - return o; + if (childs instanceof List) { + result = ((List<T>) childs).get(index); + } else { + int i = 0; + for (T o : childs) { + if (index == i) { + result = o; + break; + } + i++; } - i++; } } - return null; + return result; }*/ ); }

1 0

r1193 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 10:06:36 +0100 (Sun, 28 Oct 2012) New Revision: 1193 Url: http://nuiton.org/repositories/revision/eugene/1193 Log: fixes #2384: Wrong code form method isXXXEmpty in generated bean Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 09:06:16 UTC (rev 1192) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 09:06:36 UTC (rev 1193) @@ -443,7 +443,7 @@ ); setOperationBody(getChild, "" /*{ - return <%=attrName%> != null && !<%=attrName%>.isEmpty(); + return <%=attrName%> == null || <%=attrName%>.isEmpty(); }*/ ); }

1 0

r1192 - in trunk: . eugene eugene-java-templates eugene-maven-plugin
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 10:06:16 +0100 (Sun, 28 Oct 2012) New Revision: 1192 Url: http://nuiton.org/repositories/revision/eugene/1192 Log: move to version 2.5.5.1-SNAPSHOT Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-10-26 11:43:16 UTC (rev 1191) +++ trunk/eugene/pom.xml 2012-10-28 09:06:16 UTC (rev 1192) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2012-10-26 11:43:16 UTC (rev 1191) +++ trunk/eugene-java-templates/pom.xml 2012-10-28 09:06:16 UTC (rev 1192) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-10-26 11:43:16 UTC (rev 1191) +++ trunk/eugene-maven-plugin/pom.xml 2012-10-28 09:06:16 UTC (rev 1192) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:43:16 UTC (rev 1191) +++ trunk/pom.xml 2012-10-28 09:06:16 UTC (rev 1192) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.5.1-SNAPSHOT</version> <modules> <module>eugene</module>

1 0

r1191 - trunk
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:43:16 +0200 (Fri, 26 Oct 2012) New Revision: 1191 Url: http://nuiton.org/repositories/revision/eugene/1191 Log: Update mavenpom4redmineAndCentral to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-25 15:06:59 UTC (rev 1190) +++ trunk/pom.xml 2012-10-26 11:43:16 UTC (rev 1191) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <artifactId>eugene</artifactId> @@ -529,12 +529,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

r1190 - in trunk: . eugene eugene-java-templates eugene-maven-plugin
by maven-release＠users.nuiton.org 25 Oct '12

25 Oct '12

Author: maven-release Date: 2012-10-25 17:06:59 +0200 (Thu, 25 Oct 2012) New Revision: 1190 Url: http://nuiton.org/repositories/revision/eugene/1190 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-10-25 15:06:55 UTC (rev 1189) +++ trunk/eugene/pom.xml 2012-10-25 15:06:59 UTC (rev 1190) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2012-10-25 15:06:55 UTC (rev 1189) +++ trunk/eugene-java-templates/pom.xml 2012-10-25 15:06:59 UTC (rev 1190) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-10-25 15:06:55 UTC (rev 1189) +++ trunk/eugene-maven-plugin/pom.xml 2012-10-25 15:06:59 UTC (rev 1190) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-25 15:06:55 UTC (rev 1189) +++ trunk/pom.xml 2012-10-25 15:06:59 UTC (rev 1190) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.5.5</version> + <version>2.6-SNAPSHOT</version> <modules> <module>eugene</module> @@ -462,11 +462,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5.5</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5.5 + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.5.5</url> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> <distributionManagement>

1 0

r1189 - in tags: . eugene-2.5.5
by maven-release＠users.nuiton.org 25 Oct '12

25 Oct '12

Author: maven-release Date: 2012-10-25 17:06:55 +0200 (Thu, 25 Oct 2012) New Revision: 1189 Url: http://nuiton.org/repositories/revision/eugene/1189 Log: [maven-release-plugin] copy for tag eugene-2.5.5 Added: tags/eugene-2.5.5/ Property changes on: tags/eugene-2.5.5 ___________________________________________________________________ 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 /branches/eugene-2.4.3:1151-1173

1 0