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

r1115 - in trunk/eugene/src/main/java/org/nuiton/eugene: . java
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 04:59:54 +0200 (Thu, 20 Oct 2011) New Revision: 1115 Url: http://nuiton.org/repositories/revision/eugene/1115 Log: generate fixed serialVersionUID for beanImpl + push the constant from topia to eugene Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 01:27:34 UTC (rev 1114) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 02:59:54 UTC (rev 1115) @@ -58,6 +58,8 @@ */ public class GeneratorUtil { + public static final String SERIAL_VERSION_UID = "serialVersionUID"; + /** * return parent package of given package (return given package if it is a root package) * eg : org.nuiton.eugene.models -> org.nuiton.eugene @@ -484,7 +486,7 @@ */ public static String getClassAttributesListDeclaration( ObjectModelClass clazz) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); Collection<ObjectModelAttribute> params = clazz.getAttributes(); for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext(); ) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 01:27:34 UTC (rev 1114) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 02:59:54 UTC (rev 1115) @@ -664,8 +664,12 @@ // Generate the serialVersionUID long serialVersionUID = GeneratorUtil.generateSerialVersionUID(input); - addConstant(output, "serialVersionUID", "long", serialVersionUID + "L", - ObjectModelModifier.PRIVATE); + addConstant(output, + GeneratorUtil.SERIAL_VERSION_UID, + "long", + serialVersionUID + "L", + ObjectModelModifier.PRIVATE + ); } /** @@ -712,6 +716,14 @@ // set the abstract resulClass as the resultClassImpl super class setSuperClass(resultClassImpl, input.getQualifiedName()); + + // add a fix serialVersionUID, since the class has no field nor method + addConstant(resultClassImpl, + GeneratorUtil.SERIAL_VERSION_UID, + "long", + "1L", + ObjectModelModifier.PRIVATE + ); return resultClassImpl; }

1 0

r1114 - in trunk: eugene/src/main/java/org/nuiton/eugene/java maven-eugene-plugin/src/it/evol-308 maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test maven-eugene-plugin/src/it/evol-308/src/main/xmi maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 03:27:34 +0200 (Thu, 20 Oct 2011) New Revision: 1114 Url: http://nuiton.org/repositories/revision/eugene/1114 Log: updates svn properties Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties trunk/maven-eugene-plugin/src/it/evol-308/pom.xml trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/maven-eugene-plugin/src/it/evol-308/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/pom.xml 2011-10-20 01:23:40 UTC (rev 1113) +++ trunk/maven-eugene-plugin/src/it/evol-308/pom.xml 2011-10-20 01:27:34 UTC (rev 1114) @@ -3,8 +3,8 @@ #%L EUGene :: Maven plugin - $Id: pom.xml 1079 2011-06-28 09:15:23Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/maven-eugene-plugin/src/it/evol-879/… $ + $Id$ + $HeadURL$ %% Copyright (C) 2006 - 2010 CodeLutin %% Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1113 - in trunk: eugene/src/main/java/org/nuiton/eugene/java maven-eugene-plugin/src/it/evol-308 maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test
by maven-release＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: maven-release Date: 2011-10-20 03:23:40 +0200 (Thu, 20 Oct 2011) New Revision: 1113 Url: http://nuiton.org/repositories/revision/eugene/1113 Log: add license headers Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2011-10-20 01:13:31 UTC (rev 1112) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2011-10-20 01:23:40 UTC (rev 1113) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 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.eugene.java; Modified: trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties 2011-10-20 01:13:31 UTC (rev 1112) +++ trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties 2011-10-20 01:23:40 UTC (rev 1113) @@ -1 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 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% +### invoker.goals=clean test \ No newline at end of file Modified: trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java 2011-10-20 01:13:31 UTC (rev 1112) +++ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java 2011-10-20 01:23:40 UTC (rev 1113) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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.eugene.test; Modified: trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java 2011-10-20 01:13:31 UTC (rev 1112) +++ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java 2011-10-20 01:23:40 UTC (rev 1113) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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.eugene.test; import org.junit.Assert; Modified: trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy 2011-10-20 01:13:31 UTC (rev 1112) +++ trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy 2011-10-20 01:23:40 UTC (rev 1113) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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% + */ outputDir = new File(basedir, 'target/generated-sources/java');

1 0

r1112 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 03:13:31 +0200 (Thu, 20 Oct 2011) New Revision: 1112 Url: http://nuiton.org/repositories/revision/eugene/1112 Log: pass to version 2.4.1-SNAPSHOT instead of 2.5-SNAPSHOT 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-10-20 01:06:54 UTC (rev 1111) +++ trunk/ant-eugene-task/pom.xml 2011-10-20 01:13:31 UTC (rev 1112) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-10-20 01:06:54 UTC (rev 1111) +++ trunk/eugene/pom.xml 2011-10-20 01:13:31 UTC (rev 1112) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-10-20 01:06:54 UTC (rev 1111) +++ trunk/maven-eugene-plugin/pom.xml 2011-10-20 01:13:31 UTC (rev 1112) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-20 01:06:54 UTC (rev 1111) +++ trunk/pom.xml 2011-10-20 01:13:31 UTC (rev 1112) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.4.1-SNAPSHOT</version> <modules> <module>eugene</module>

1 0

r1111 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 03:06:54 +0200 (Thu, 20 Oct 2011) New Revision: 1111 Url: http://nuiton.org/repositories/revision/eugene/1111 Log: Evolution #1779: Improve java generation (improve inner classes generation but still some stuff to do for body of all methods using the prefix variable :lot's of work...) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:40:41 UTC (rev 1110) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 01:06:54 UTC (rev 1111) @@ -159,6 +159,7 @@ /*{ { }*/ generateInnerClassifiers(output, input.getInnerClassifiers()); + preparePrefix(input); generateAttributes(output, input, input.getAttributes()); generateOperations(output, input, input.getOperations()); @@ -220,6 +221,7 @@ annotation = "@" + annotation.trim(); } if (element instanceof ObjectModelOperation) { +/*{<%=prefix%>}*/ annotation = " "+annotation; } /*{<%=annotation%>}*/

1 0

r1110 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 02:40:41 +0200 (Thu, 20 Oct 2011) New Revision: 1110 Url: http://nuiton.org/repositories/revision/eugene/1110 Log: Evolution #1779: Improve java generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:23:20 UTC (rev 1109) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:40:41 UTC (rev 1110) @@ -402,6 +402,10 @@ attrVisibility = ""; } + if (StringUtils.isNotEmpty(attrVisibility)) { + attrVisibility += " "; + } + String attrValue = StringUtils.isNotEmpty(attr.getDefaultValue()) ? // ANO#474 FD-20100408 : Don't do any simplification for // defaultValue, must be managed when the attribute is added @@ -444,7 +448,9 @@ } generateOperationDocumentation(output, op); - String opVisibility = !interfacez ? op.getVisibility()+" " : ""; + generateAnnotations(output, clazz, op); + + String opVisibility = !interfacez ? op.getVisibility() : ""; String opStatic = op.isStatic() ? "static " : ""; String opAbstract = op.isAbstract() ? "abstract " : ""; @@ -454,8 +460,10 @@ opReturn = GeneratorUtil.getSimpleName( returnParam.getType()) + " "; } + if (StringUtils.isNotEmpty(opVisibility)) { + opVisibility += " "; + } - generateAnnotations(output, clazz, op); /*{<%=prefix%> <%=opVisibility%><%=opStatic%><%=opAbstract%><%=opReturn%><%=opName%>(}*/ String comma = ""; Collection<ObjectModelParameter> params = op.getParameters();

1 0

r1109 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 02:23:20 +0200 (Thu, 20 Oct 2011) New Revision: 1109 Url: http://nuiton.org/repositories/revision/eugene/1109 Log: Evolution #1779: Improve java generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:15:43 UTC (rev 1108) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:23:20 UTC (rev 1109) @@ -392,8 +392,8 @@ String attrName = attr.getName(); String attrVisibility = attr.getVisibility(); String attrType = GeneratorUtil.getSimpleName(attr.getType()); - String attrStatic = attr.isStatic() ? " static" : ""; - String attrFinal = attr.isFinal() ? " final" : ""; + String attrStatic = attr.isStatic() ? "static " : ""; + String attrFinal = attr.isFinal() ? "final " : ""; if (clazz instanceof ObjectModelInterface) { //tchemit 20100507 no modifier for constants in interfaces @@ -409,7 +409,7 @@ " = " + attr.getDefaultValue() : ""; // " = " + GeneratorUtil.getSimpleName(attr.getDefaultValue()) : ""; -/*{<%=prefix%> <%=attrVisibility%><%=attrStatic%><%=attrFinal%> <%=attrType%> <%=attrName%><%=attrValue%>; +/*{<%=prefix%> <%=attrVisibility%><%=attrStatic%><%=attrFinal%><%=attrType%> <%=attrName%><%=attrValue%>; }*/ } }

1 0

r1108 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 20 Oct '11

20 Oct '11

Author: tchemit Date: 2011-10-20 02:15:43 +0200 (Thu, 20 Oct 2011) New Revision: 1108 Url: http://nuiton.org/repositories/revision/eugene/1108 Log: Evolution #1779: Improve java generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-14 14:21:35 UTC (rev 1107) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-10-20 00:15:43 UTC (rev 1108) @@ -31,7 +31,10 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; +import java.util.List; import java.util.Set; + +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -112,8 +115,8 @@ // Imports, package et documentation generateHeader(output, input); - String abstractStr = input.isAbstract() ? " abstract " : " "; - String staticStr = input.isStatic() ? " static " : " "; + String abstractStr = input.isAbstract() ? " abstract" : ""; + String staticStr = input.isStatic() ? " static" : ""; String className = input.getName(); String extend = ""; @@ -140,7 +143,7 @@ } generateAnnotations(output, input, input); -/*{<%=prefix%>public<%=staticStr%><%=abstractStr%>class <%=className%>}*/ +/*{<%=prefix%>public<%=staticStr%><%=abstractStr%> class <%=className%>}*/ /* * Définition de la super classe : il ne doit y avoir qu'une @@ -154,14 +157,12 @@ } /*{ { - }*/ generateInnerClassifiers(output, input.getInnerClassifiers()); generateAttributes(output, input, input.getAttributes()); generateOperations(output, input, input.getOperations()); -/*{ -<%=prefix%>} //<%=className%> +/*{<%=prefix%>} //<%=className%> }*/ } @@ -198,12 +199,10 @@ /*{ extends <%=extend%>}*/ } /*{ { - }*/ generateAttributes(output, input, input.getAttributes()); generateOperations(output, input, input.getOperations()); -/*{ -<%=prefix%>} //<%=interfaceName%> +/*{<%=prefix%>} //<%=interfaceName%> }*/ } @@ -223,13 +222,12 @@ if (element instanceof ObjectModelOperation) { annotation = " "+annotation; } +/*{<%=annotation%>}*/ + if (element instanceof ObjectModelClassifier || element instanceof ObjectModelOperation) { /*{ -<%=annotation%>}*/ - } - if (element instanceof ObjectModelClassifier) { -/*{ }*/ } + } } public void generateFromEnumeration(Writer output, @@ -260,12 +258,10 @@ if (extend.length() > 0) { /*{ implements <%=extend%> { - }*/ } else { /*{ { - }*/ } // generation of literal @@ -281,8 +277,7 @@ } generateAttributes(output, input, input.getAttributes()); generateOperations(output, input, input.getOperations()); -/*{ -<%=prefix%>} //<%=enumzName%> +/*{<%=prefix%>} //<%=enumzName%> }*/ } @@ -352,11 +347,15 @@ ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class); - for (String imports : managers.getImports(classifier)) { -/*{import <%=imports%>; + List<String> imports = managers.getImports(classifier); + for (String singleImport : imports) { +/*{import <%=singleImport%>; }*/ } - + if (CollectionUtils.isNotEmpty(imports)) { +/*{ +}*/ + } } /** @@ -371,17 +370,22 @@ Collection<ObjectModelAttribute> attributes) throws IOException { - if (!attributes.isEmpty()) { -/*{}*/ - } + for (ObjectModelAttribute attr : attributes) { - if (attr.getDocumentation() != null && - !attr.getDocumentation().isEmpty()) { +/*{ +}*/ + String documentation = attr.getDocumentation(); + if (StringUtils.isNotEmpty(documentation)) { /*{<%=prefix%> /** -<%=prefix%> * <%=attr.getDocumentation()%> -<%=prefix%> *) }*/ + String[] lines = documentation.split("\n"); + for (String line : lines) { +/*{<%=prefix%> * <%=line%> +}*/ + } +/*{<%=prefix%> *) +}*/ } generateAnnotations(output, clazz, attr); @@ -438,26 +442,9 @@ generateBlock(output, clazz, op); continue; } -/*{<%=prefix%> /** -<%=prefix%> * <%=opName%> : -<%=prefix%>}*/ - if (op.getDocumentation() != null && - !op.getDocumentation().isEmpty()) { - String opDocumentation = op.getDocumentation(); -/*{<%=prefix%> * <%=opDocumentation%> -}*/ - } - Collection<ObjectModelParameter> params = op.getParameters(); - for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramDocumentation = param.getDocumentation(); - if (paramDocumentation == null) { - paramDocumentation = ""; - } -/*{<%=prefix%> * @param <%=paramName%> <%=paramDocumentation%> -}*/ - } - String opVisibility = !interfacez ? op.getVisibility() : ""; + generateOperationDocumentation(output, op); + + String opVisibility = !interfacez ? op.getVisibility()+" " : ""; String opStatic = op.isStatic() ? "static " : ""; String opAbstract = op.isAbstract() ? "abstract " : ""; @@ -466,27 +453,12 @@ if (returnParam != null) { opReturn = GeneratorUtil.getSimpleName( returnParam.getType()) + " "; - if (!opReturn.contains("void")) { - String paramDocumentation = returnParam.getDocumentation(); - if (paramDocumentation == null) { - paramDocumentation = opReturn; - } -/*{<%=prefix%> * @return <%=paramDocumentation%> -}*/ - } } - Set<String> exceptions = op.getExceptions(); - for (String exception : exceptions) { - String exceptionName = GeneratorUtil.getSimpleName(exception); -/*{<%=prefix%> * @throws <%=exceptionName%> -}*/ - } -/*{<%=prefix%> *) -}*/ generateAnnotations(output, clazz, op); -/*{<%=prefix%> <%=opVisibility%> <%=opStatic%><%=opAbstract%><%=opReturn%><%=opName%>(}*/ +/*{<%=prefix%> <%=opVisibility%><%=opStatic%><%=opAbstract%><%=opReturn%><%=opName%>(}*/ String comma = ""; + Collection<ObjectModelParameter> params = op.getParameters(); for (ObjectModelParameter param : params) { String paramName = param.getName(); String paramType = GeneratorUtil.getSimpleName(param.getType()); @@ -496,6 +468,7 @@ /*{)}*/ comma = " throws "; + Set<String> exceptions = op.getExceptions(); for (String exception : exceptions) { String exceptionName = GeneratorUtil.getSimpleName(exception); /*{<%=comma%><%=exceptionName%>}*/ @@ -516,13 +489,66 @@ } } - protected void generateBlock(Writer output,ObjectModelClassifier clazz, + protected void generateOperationDocumentation(Writer output, + ObjectModelOperation op) throws IOException { + String documentation = op.getDocumentation(); + if (StringUtils.isEmpty(documentation)) { + + // no documentation for this operation + return; + } +/*{<%=prefix%> /** +<%=prefix%>}*/ + + String[] documentationLines = documentation.split("\n"); + for (String documentationLine : documentationLines) { +/*{<%=prefix%> * <%=documentationLine%> +}*/ + } + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + String paramName = param.getName(); + String paramDocumentation = param.getDocumentation(); + if (paramDocumentation == null) { + paramDocumentation = ""; + } +/*{<%=prefix%> * @param <%=paramName%> <%=paramDocumentation%> +}*/ + } + + ObjectModelParameter returnParam = op.getReturnParameter(); + String opReturn = ""; + if (returnParam != null) { + opReturn = GeneratorUtil.getSimpleName( + returnParam.getType()) + " "; + if (!opReturn.contains("void")) { + String paramDocumentation = returnParam.getDocumentation(); + if (paramDocumentation == null) { + paramDocumentation = ""; + } +/*{<%=prefix%> * @return <%=paramDocumentation%> +}*/ + } + } + Set<String> exceptions = op.getExceptions(); + for (String exception : exceptions) { + String exceptionName = GeneratorUtil.getSimpleName(exception); +/*{<%=prefix%> * @throws <%=exceptionName%> +}*/ + } +/*{<%=prefix%> *) +}*/ + + } + protected void generateBlock(Writer output, + ObjectModelClassifier clazz, ObjectModelOperation op) throws IOException { String opStatic = op.isStatic() ? "static " : " "; -/*{<%=prefix%><%=opStatic%>{ - <%=prefix%><%=op.getBodyCode()%> - <%=prefix%>} +/*{<%=prefix%> <%=opStatic%>{ +<%=prefix%> <%=op.getBodyCode()%> +<%=prefix%> } + }*/ }

1 0

r1107 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 14 Oct '11

14 Oct '11

Author: tchemit Date: 2011-10-14 16:21:35 +0200 (Fri, 14 Oct 2011) New Revision: 1107 Url: http://nuiton.org/repositories/revision/eugene/1107 Log: fix + improve bean generator Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-13 15:45:26 UTC (rev 1106) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-14 14:21:35 UTC (rev 1107) @@ -28,12 +28,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -65,14 +65,24 @@ @Override public void transformFromClass(ObjectModelClass input) { - if (!canGenerate(input)) { - if (log.isDebugEnabled()) { - log.debug("Skip generation for " + input.getQualifiedName()); - } + if (!JavaGeneratorUtil.hasBeanStereotype(input)) { + + // not a bean return; } + if (canGenerateImpl(input)) { + + generateImpl(input); + } + + if (!canGenerateAbstract(input)) { + + // nothing more to do + return; + } + ObjectModelClass output = createAbstractClass(input.getName(), input.getPackageName()); @@ -85,33 +95,20 @@ generateI18nBlock(input, output, i18nPrefix); } - ObjectModelClass ouputImpl = generateImpl(input, output); - String noPCSTagValue = JavaGeneratorUtil.getNoPCSTagValue(model, input); boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || !"true".equals(noPCSTagValue.trim()); - if (log.isDebugEnabled()) { - if (ouputImpl == null) { - log.debug("will generate impl " + - output.getQualifiedName()); - } else { - log.debug("do not generate existing impl " + - output.getQualifiedName()); - } - } - String prefix = getConstantPrefix(input, DEFAULT_CONSTANT_PREFIX); setConstantPrefix(prefix); - addSuperClass(input, output, ouputImpl); + addSuperClass(input, output); boolean serializableFound = addInterfaces(input, output); - addSerializable(output, serializableFound); + addSerializable(input, output, serializableFound); - Set<String> constantNames = addConstantsFromDependency(input, output); // Get available properties @@ -146,6 +143,27 @@ } } + protected boolean canGenerateAbstract(ObjectModelClass input) { + boolean b = !isInClassPath(input); + return b; + } + + protected boolean canGenerateImpl(ObjectModelClass input) { + String fqn = input.getQualifiedName() + "Impl"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + + boolean hasOperations = !input.getAllOtherOperations(true).isEmpty() || + !input.getOperations().isEmpty(); + + // generate only if no user operations found + return !hasOperations; + } + protected void createPropertyConstant(ObjectModelClass output, ObjectModelAttribute attr, String prefix, @@ -636,13 +654,18 @@ ); } - protected void addSerializable(ObjectModelClass output,boolean interfaceFound) { + protected void addSerializable(ObjectModelClass input, + ObjectModelClass output, + boolean interfaceFound) { if (!interfaceFound) { addInterface(output, Serializable.class); } - // Maybe generate the UID for each different generation ? - addConstant(output, "serialVersionUID", "long", "1L", - ObjectModelModifier.PRIVATE); + + // Generate the serialVersionUID + long serialVersionUID = GeneratorUtil.generateSerialVersionUID(input); + + addConstant(output, "serialVersionUID", "long", serialVersionUID + "L", + ObjectModelModifier.PRIVATE); } /** @@ -668,58 +691,30 @@ } protected void addSuperClass(ObjectModelClass input, - ObjectModelClass output, - ObjectModelClass outputImpl) { + ObjectModelClass output) { // Set superclass - if (outputImpl == null) { - Iterator<ObjectModelClass> j = input.getSuperclasses().iterator(); - if (j.hasNext()) { - ObjectModelClass p = j.next(); - // We want to set the inheritance to the implementation class of the father - // Ex for model : A -> B (a inherits B) we want : A -> BImpl -> B - String qualifiedName = p.getQualifiedName() + "Impl"; - setSuperClass(output, qualifiedName); - } + Iterator<ObjectModelClass> j = input.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + // We want to set the inheritance to the implementation class of the father + // Ex for model : A -> B (a inherits B) we want : A -> BImpl -> B + String qualifiedName = p.getQualifiedName() + "Impl"; + setSuperClass(output, qualifiedName); } } - protected ObjectModelClass generateImpl(ObjectModelClass input, - ObjectModelClass output) { + protected ObjectModelClass generateImpl(ObjectModelClass input) { - // Get name for Impl class - String fqn = input.getQualifiedName() + "Impl"; + ObjectModelClass resultClassImpl = createClass( + input.getName() + "Impl", + input.getPackageName() + ); - if (!isInClassPath(fqn)) { - - // already in class-path - return null; - } - - // Does bean own operations ? - boolean hasOperations = !input.getAllOtherOperations(true).isEmpty() || - !input.getOperations().isEmpty(); - - ObjectModelClass resultClassImpl = null; - // Generate the Impl class if not already exist in classpath and no operation is defined in model - if (!hasOperations) { - String implName = input.getName() + "Impl"; - resultClassImpl = createClass(implName, input.getPackageName()); - // set the abstract resulClass as the resultClassImpl super class - setSuperClass(resultClassImpl, output.getQualifiedName()); - } + // set the abstract resulClass as the resultClassImpl super class + setSuperClass(resultClassImpl, input.getQualifiedName()); return resultClassImpl; } - protected boolean canGenerate(ObjectModelClass input) { - boolean b = JavaGeneratorUtil.hasBeanStereotype(input); - if (b) { - - // check if not found in class-path - b = !isInClassPath(input); - } - return b; - } - protected void createPropertyChangeSupport(ObjectModelClass output) { addAttribute(output,

1 0

r1106 - in trunk: eugene/src/main/java/org/nuiton/eugene/java maven-eugene-plugin/src/it/evol-308/src/main/xmi
by tchemit＠users.nuiton.org 13 Oct '11

13 Oct '11

Author: tchemit Date: 2011-10-13 17:45:26 +0200 (Thu, 13 Oct 2011) New Revision: 1106 Url: http://nuiton.org/repositories/revision/eugene/1106 Log: fix it model fix bad boolean test Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2011-10-13 13:34:53 UTC (rev 1105) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2011-10-13 15:45:26 UTC (rev 1106) @@ -131,7 +131,7 @@ if (b) { // only generate when no stereotype are on interface ? Strange !? - b = !input.getStereotypes().isEmpty(); + b = input.getStereotypes().isEmpty(); } return b; } Modified: trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo =================================================================== (Binary files differ)

1 0