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

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

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

13 Oct '11

Author: tchemit Date: 2011-10-13 15:34:53 +0200 (Thu, 13 Oct 2011) New Revision: 1105 Url: http://nuiton.org/repositories/revision/eugene/1105 Log: add javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-10-13 13:31:03 UTC (rev 1104) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-10-13 13:34:53 UTC (rev 1105) @@ -852,10 +852,28 @@ buffer.append("\");"); } + /** + * Checks if the classifier fully qualified name is in class-path and log a + * message that fqn will not generated if found + * + * @param classifier classifier to test + * @return {@code true} if fqn of classifier was found in class-path, + * {@code false} otherwise. + * @since 2.5 + */ protected boolean isInClassPath(ObjectModelClassifier classifier) { return isInClassPath(classifier.getQualifiedName()); } - + + /** + * Checks if the given fully qualified name is in class-path and log a + * message that fqn will not generated if found. + * + * @param fqn fully qualified name to test + * @return {@code true} if fqn was found in class-path, + * {@code false} otherwise. + * @since 2.5 + */ protected boolean isInClassPath(String fqn) { URL fileLocation = getFileInClassPath(fqn);

1 0

r1104 - in trunk: eugene/src/main/java/org/nuiton/eugene 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 15:31:03 +0200 (Thu, 13 Oct 2011) New Revision: 1104 Url: http://nuiton.org/repositories/revision/eugene/1104 Log: Evolution #1771: Add an option to never generate a class already defined in classpath Evolution #1772: Generate enumerations present in model Added: trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2011-10-12 18:54:15 UTC (rev 1103) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2011-10-13 13:31:03 UTC (rev 1104) @@ -73,13 +73,13 @@ String STEREOTYPE_ORDERED = "ordered"; /** - * Stereotype for enumeration objects to place on a classifier. + * Stereotype to skip generation for some transformer. * * @see JavaEnumerationTransformer - * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) + * @see JavaGeneratorUtil#hasSkipStereotype(ObjectModelClassifier) */ @StereotypeDefinition(target = ObjectModelClassifier.class, - documentation = "To specify that a class is a enumeration to generate") - String STEREOTYPE_ENUMERATION = "enumeration"; + documentation = "To specify that a classifier should not been generated.") + String STEREOTYPE_SKIP= "skip"; } 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-12 18:54:15 UTC (rev 1103) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-13 13:31:03 UTC (rev 1104) @@ -28,11 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -693,16 +689,12 @@ // Get name for Impl class String fqn = input.getQualifiedName() + "Impl"; - URL location = getFileInClassPath(fqn); - if (location != null) { + if (!isInClassPath(fqn)) { - if (isVerbose()) { - log.info("Will not generate ["+fqn+"] which exists : "+location); - } - // file already found in class-path, do not generate it + // already in class-path return null; } - + // Does bean own operations ? boolean hasOperations = !input.getAllOtherOperations(true).isEmpty() || !input.getOperations().isEmpty(); @@ -719,7 +711,13 @@ } protected boolean canGenerate(ObjectModelClass input) { - return JavaGeneratorUtil.hasBeanStereotype(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) { 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-12 18:54:15 UTC (rev 1103) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2011-10-13 13:31:03 UTC (rev 1104) @@ -48,7 +48,7 @@ } protected boolean canGenerate(ObjectModelEnumeration input) { - boolean b = JavaGeneratorUtil.hasEnumerationStereotype(input); + boolean b = !JavaGeneratorUtil.hasSkipStereotype(input); if (b) { // check if not found in class-path Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-10-12 18:54:15 UTC (rev 1103) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-10-13 13:31:03 UTC (rev 1104) @@ -131,15 +131,15 @@ /** * Check if the given classifier has the - * {@link EugeneStereoTypes#STEREOTYPE_ENUMERATION} stereotype. + * {@link EugeneStereoTypes#STEREOTYPE_SKIP} stereotype. * * @param classifier classifier to test * @return {@code true} if stereotype was found, {@code false otherwise} - * @see EugeneStereoTypes#STEREOTYPE_ENUMERATION + * @see EugeneStereoTypes#STEREOTYPE_SKIP * @since 2.5 */ - public static boolean hasEnumerationStereotype(ObjectModelClassifier classifier) { - return classifier.hasStereotype(EugeneStereoTypes.STEREOTYPE_ENUMERATION); + public static boolean hasSkipStereotype(ObjectModelClassifier classifier) { + return classifier.hasStereotype(EugeneStereoTypes.STEREOTYPE_SKIP); } /** 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-12 18:54:15 UTC (rev 1103) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2011-10-13 13:31:03 UTC (rev 1104) @@ -54,8 +54,9 @@ @Override public void transformFromInterface(ObjectModelInterface input) { - // Can only generate an interface with no stereotypes - if (!input.getStereotypes().isEmpty()) { + boolean canGenerate = canGenerate(input); + if (!canGenerate) { + return; } @@ -122,4 +123,17 @@ ); } + protected boolean canGenerate(ObjectModelInterface input) { + + // check if not found in class-path + boolean b = !isInClassPath(input); + + if (b) { + + // only generate when no stereotype are on interface ? Strange !? + b = !input.getStereotypes().isEmpty(); + } + return b; + } + } Added: trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo =================================================================== (Binary files differ) Property changes on: trunk/maven-eugene-plugin/src/it/evol-308/src/main/xmi/model.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

12 Oct '11

Author: tchemit Date: 2011-10-12 20:54:15 +0200 (Wed, 12 Oct 2011) New Revision: 1103 Url: http://nuiton.org/repositories/revision/eugene/1103 Log: Evolution #1772: Generate enumerations present in model Evolution #1771: Add an option to never generate a class already defined in classpath Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java trunk/maven-eugene-plugin/src/it/evol-308/ 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/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/ 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/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/ 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/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/maven-eugene-plugin/pom.xml Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2011-09-22 17:23:25 UTC (rev 1102) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -25,6 +25,7 @@ package org.nuiton.eugene; import org.nuiton.eugene.java.JavaBeanTransformer; +import org.nuiton.eugene.java.JavaEnumerationTransformer; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -71,4 +72,14 @@ documentation = "To specify that a attribute is ordered") String STEREOTYPE_ORDERED = "ordered"; + /** + * Stereotype for enumeration objects to place on a classifier. + * + * @see JavaEnumerationTransformer + * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) + */ + @StereotypeDefinition(target = ObjectModelClassifier.class, + documentation = "To specify that a class is a enumeration to generate") + String STEREOTYPE_ENUMERATION = "enumeration"; + } Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1,59 @@ +package org.nuiton.eugene.java; + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; + +import java.util.Collection; + +/** + * JavaEnumerationTransformer generates a enumeration for enuration with + * stereotype enumeration. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaEnumerationTransformer" + * @since 2.5 + */ +public class JavaEnumerationTransformer extends ObjectModelTransformerToJava { + + private static final Log log = + LogFactory.getLog(JavaEnumerationTransformer.class); + + @Override + public void transformFromEnumeration(ObjectModelEnumeration input) { + if (!canGenerate(input)) { + + if (log.isDebugEnabled()) { + log.debug("Skip generation for " + input.getQualifiedName()); + } + return; + } + + ObjectModelEnumeration output = + createEnumeration(input.getName(), input.getPackageName()); + + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); + } + + Collection<String> literals = input.getLiterals(); + + for (String literal : literals) { + addLiteral(output, literal); + } + } + + protected boolean canGenerate(ObjectModelEnumeration input) { + boolean b = JavaGeneratorUtil.hasEnumerationStereotype(input); + if (b) { + + // check if not found in class-path + b = !isInClassPath(input); + } + return b; + } +} \ No newline at end of file Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-09-22 17:23:25 UTC (rev 1102) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -130,6 +130,19 @@ } /** + * Check if the given classifier has the + * {@link EugeneStereoTypes#STEREOTYPE_ENUMERATION} stereotype. + * + * @param classifier classifier to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see EugeneStereoTypes#STEREOTYPE_ENUMERATION + * @since 2.5 + */ + public static boolean hasEnumerationStereotype(ObjectModelClassifier classifier) { + return classifier.hasStereotype(EugeneStereoTypes.STEREOTYPE_ENUMERATION); + } + + /** * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur * le model. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-09-22 17:23:25 UTC (rev 1102) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -33,28 +33,12 @@ import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.Template; import org.nuiton.eugene.java.extension.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelElement; -import org.nuiton.eugene.models.object.ObjectModelEnumeration; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.object.ObjectModelTransformer; -import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.eugene.models.object.*; import org.nuiton.i18n.I18n; import java.beans.Introspector; import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * Created: 28 oct. 2009 @@ -66,7 +50,9 @@ private static final Log log = LogFactory.getLog(ObjectModelTransformerToJava.class); - /** internal builder */ + /** + * internal builder + */ protected JavaBuilder builder; private String constantPrefix; @@ -102,11 +88,11 @@ } for (ObjectModelAttribute attribute : clazz.getAttributes()) { log.debug(" attribute : " + attribute.getType() + - " " + attribute.getName()); + " " + attribute.getName()); } for (ObjectModelOperation operation : clazz.getOperations()) { log.debug(" operation : " + operation.getReturnType() + - " " + operation.getName()); + " " + operation.getName()); } } } @@ -373,7 +359,7 @@ /** * Adds a navigable flag to the given {@code attribute}. * - * @param attribute the attribute on which the navigable flag will be setted + * @param attribute the attribute on which the navigable flag will be setted * @param navigable the navigable flag to set * @since 2.3 */ @@ -401,13 +387,13 @@ /** * add an operation to the classifier with the form of a simple block * of code. - * + * * use it to add a "static {}" block into an classifier, then use * setOperationBody with the returned value of this method to complete * the creation of the static block - * + * * @param classifier the classifier where the block will be added - * @param modifiers modifiers for the block + * @param modifiers modifiers for the block * @return the block added */ public ObjectModelOperation addBlock(ObjectModelClassifier classifier, @@ -431,10 +417,10 @@ * name, returnType, parameters, exceptions and tagValues will be cloned. * You can specify {@code modifiers} for the result operation. * - * @param source operation to clone - * @param destination classifier where result operation will be added + * @param source operation to clone + * @param destination classifier where result operation will be added * @param cloneDocumentation flag to add documentation if some found in model - * @param modifiers extra modifiers + * @param modifiers extra modifiers * @return the new operation created in destination classifier * @since 2.1.2 */ @@ -473,11 +459,11 @@ * Clone the {@code source} operation into the {@code destination} classifier. * whole signature, tagValues and body code will be cloned. You can specify * {@code modifiers} for the result operation. - * - * @param source operation to clone - * @param destination classifier where result operation will be added + * + * @param source operation to clone + * @param destination classifier where result operation will be added * @param cloneDocumentation flag to add documentation if some found in model - * @param modifiers extra modifiers + * @param modifiers extra modifiers * @return the new operation created in destination classifier * @since 2.1.2 */ @@ -508,11 +494,11 @@ /** * clone a given attribute into a classifier of the output model - * - * @param source the original attribute - * @param destination classifier where the clone will be added + * + * @param source the original attribute + * @param destination classifier where the clone will be added * @param cloneDocumentation flag to add documentation if some found in model - * @param modifiers extra modifiers + * @param modifiers extra modifiers * @return the clone attribute * @since 2.1.2 */ @@ -522,8 +508,8 @@ ObjectModelModifier... modifiers) { ObjectModelAttribute outputAttribute = addAttribute(destination, - source.getName(), source.getType(), - source.getDefaultValue(), modifiers); + source.getName(), source.getType(), + source.getDefaultValue(), modifiers); cloneTagValues(source, outputAttribute); @@ -537,7 +523,7 @@ setMinMultiplicity(outputAttribute, source.getMinMultiplicity()); setMaxMultiplicity(outputAttribute, source.getMaxMultiplicity()); - setNavigable(outputAttribute,source.isNavigable()); + setNavigable(outputAttribute, source.isNavigable()); return outputAttribute; } @@ -546,7 +532,7 @@ * Copy all tag values fro the given {@code source} to the given * {@code destination}. * - * @param source the source element + * @param source the source element * @param destination the destination element * @since 2.3 */ @@ -554,12 +540,11 @@ ObjectModelElement destination) { Map<String, String> tags = source.getTagValues(); for (Map.Entry<String, String> entry : tags.entrySet()) { - addTagValue(destination,entry.getKey(),entry.getValue()); + addTagValue(destination, entry.getKey(), entry.getValue()); } } /** - * * @param source * @param destination * @since 2.3 @@ -569,22 +554,22 @@ Collection<String> stereotypes = source.getStereotypes(); for (String stereotype : stereotypes) { - addStereotype(destination,stereotype); + addStereotype(destination, stereotype); } } - + /** * copy attributes, interfaces declartion and operation of a given classifier * into another classifier. - * + * * class-specific, enumeration-specific and interface-specific features * of the given classifier will not be present in the clone. * To copy those specific elements, use + * + * @param source the classifier to clone from the source model + * @param destination where to clone the given source one + * @param copyDocumentation flag to add documentation if some found in model * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} - * - * @param source the classifier to clone from the source model - * @param destination where to clone the given source one - * @param copyDocumentation flag to add documentation if some found in model * @since 2.1.2 * @deprecated since 2.3, prefer use the {@link #cloneClass(ObjectModelClass, boolean)} method */ @@ -599,20 +584,20 @@ /** * copy attributes, interfaces declartion and operation of a given classifier * into another classifier. - * + * * class-specific, enumeration-specific and interface-specific features * of the given classifier will not be present in the clone. * To copy those specific elements, use - * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} * - * @param source the classifier to clone from the source model - * @param destination where to clone the given source one + * @param source the classifier to clone from the source model + * @param destination where to clone the given source one * @param copyDocumentation flag to add documentation if some found in model + * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} * @since 2.3 */ protected void cloneClassifier(ObjectModelClassifier source, - ObjectModelClassifier destination, - boolean copyDocumentation) { + ObjectModelClassifier destination, + boolean copyDocumentation) { cloneTagValues(source, destination); @@ -636,8 +621,8 @@ * creates a clone of the given {@code source} class in the output model * and clones attributes, inheritence declarations and operations into the * clone - * - * @param source the class to clone from the source model + * + * @param source the class to clone from the source model * @param cloneDocumentation flag to add documentation if some found in model * @return the clone of the given class * @since 2.1.2 @@ -646,7 +631,7 @@ boolean cloneDocumentation) { ObjectModelClass outputClass = createClass(source.getName(), source.getPackageName()); - + cloneClassifier(source, outputClass, cloneDocumentation); if (source.getSuperclasses().size() > 1) { @@ -655,7 +640,7 @@ for (ObjectModelClass superClass : source.getSuperclasses()) { setSuperClass(outputClass, superClass.getQualifiedName()); - + // TODO 20100812 bleny is there something to do with discriminator for superClass ? } @@ -664,8 +649,8 @@ ObjectModelClassifier innerClassifierClone = cloneClassifier(classifier, cloneDocumentation); addInnerClassifier(outputClass, - ObjectModelType.OBJECT_MODEL_CLASSIFIER, - innerClassifierClone.getName()); + ObjectModelType.OBJECT_MODEL_CLASSIFIER, + innerClassifierClone.getName()); } } return outputClass; @@ -675,8 +660,8 @@ * creates a clone of the given {@code source} interface in the output model * and clones attributes, inheritence declaration and operations into the * clone - * - * @param source the interface to clone from the source model + * + * @param source the interface to clone from the source model * @param cloneDocumentation flag to add documentation if some found in model * @return the clone of the given interface * @since 2.1.2 @@ -685,10 +670,10 @@ boolean cloneDocumentation) { ObjectModelInterface outputInterface = createInterface(source.getName(), source.getPackageName()); - + cloneClassifier(source, outputInterface, cloneDocumentation); // nothing more to do. copyClassifier already done the job - + return outputInterface; } @@ -696,8 +681,8 @@ * creates a clone of the given {@code source} enumeration in the output * model and clones attributes, inheritence declaration, operations and * literals into the clone - * - * @param source the enumeration to clone from the source model + * + * @param source the enumeration to clone from the source model * @param cloneDocumentation flag to add documentation if some found in model * @return the clone of the given enumeration * @since 2.1.2 @@ -705,25 +690,25 @@ public ObjectModelEnumeration cloneEnumeration(ObjectModelEnumeration source, boolean cloneDocumentation) { ObjectModelEnumeration outputEnumeration = - createEnumeration(source.getName(), source.getPackageName()); + createEnumeration(source.getName(), source.getPackageName()); cloneClassifier(source, outputEnumeration, cloneDocumentation); - + for (String literal : source.getLiterals()) { addLiteral(outputEnumeration, literal); } - + return outputEnumeration; } /** * creates a clone of the given {@code source} classifier in the output * model and clones attributes, inheritence declaration and operations - * + * * class-specific, enumeration-specific and interface-specific features * of the given classifier will be present in the clone - * - * @param source the classifier to clone from the source model + * + * @param source the classifier to clone from the source model * @param cloneDocumentation flag to add documentation if some found in model * @return the clone of the given classifier * @since 2.1.2 @@ -736,7 +721,7 @@ } else if (source.isClass()) { clone = cloneClass((ObjectModelClass) source, cloneDocumentation); } else if (source.isEnum()) { - clone = cloneEnumeration((ObjectModelEnumeration) source, cloneDocumentation); + clone = cloneEnumeration((ObjectModelEnumeration) source, cloneDocumentation); } else { // should never occur log.error("strange classifier " + source); @@ -792,10 +777,10 @@ String constantName = getConstantName(literal); addConstant(output, - constantName, - String.class, - "\"" + literal + "\"", - ObjectModelModifier.PUBLIC + constantName, + String.class, + "\"" + literal + "\"", + ObjectModelModifier.PUBLIC ); constantNames.add(constantName); } @@ -832,9 +817,9 @@ /** * Generates a static block with I18n keys for each navigable attributes * prefixed by the given {@code i18nPrefix}. - * - * @param input the input classifier - * @param output the output classifier (to generate) + * + * @param input the input classifier + * @param output the output classifier (to generate) * @param i18nPrefix the i81n prefix to use */ protected void generateI18nBlock(ObjectModelClassifier input, @@ -860,11 +845,37 @@ } protected void addI18n(StringBuilder buffer, String i18nPrefix, - String suffix) { + String suffix) { buffer.append("\n I18n.n_(\""); buffer.append(i18nPrefix); buffer.append(suffix); buffer.append("\");"); } + protected boolean isInClassPath(ObjectModelClassifier classifier) { + return isInClassPath(classifier.getQualifiedName()); + } + + protected boolean isInClassPath(String fqn) { + + URL fileLocation = getFileInClassPath(fqn); + + if (fileLocation != null) { + + // there is already a existing file in class-path, skip + + if (isVerbose()) { + + log.info("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); + } else { + + log.info("Will not generate [" + fqn + "], already found in class-path."); + } + + return true; + } + + // is not found + return false; + } } Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-09-22 17:23:25 UTC (rev 1102) +++ trunk/maven-eugene-plugin/pom.xml 2011-10-12 18:54:15 UTC (rev 1103) @@ -221,13 +221,14 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>evol-879/zargo/pom.xml</pomInclude> - <pomInclude>evol-879/xmi/pom.xml</pomInclude> - <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> - <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> - <pomInclude>smart-generate/all/pom.xml</pomInclude> - <pomInclude>smart-generate/generators/pom.xml</pomInclude> + <pomInclude>evol-308/pom.xml</pomInclude> +  +  +  +  +  +  +    </pomIncludes> Added: trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties (rev 0) +++ trunk/maven-eugene-plugin/src/it/evol-308/invoker.properties 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1 @@ +invoker.goals=clean test \ No newline at end of file Added: trunk/maven-eugene-plugin/src/it/evol-308/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/pom.xml (rev 0) +++ trunk/maven-eugene-plugin/src/it/evol-308/pom.xml 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>testEvol308-xmi</artifactId> + <version>2.0.0</version> + + <name>EUGene Test :: testEvol308</name> + + <properties> + + <eugeneVersion>@pom.version@</eugeneVersion> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + + </properties> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <version>4.9</version> + </dependency> + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <fullPackagePath>org.nuiton.euegne.test</fullPackagePath> + <defaultPackage>org.nuiton.euegne.test</defaultPackage> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <inputs>src/main/xmi:model.zargo</inputs> + <templates> + org.nuiton.eugene.java.JavaEnumerationTransformer + </templates> + </configuration> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> + + Added: 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 (rev 0) +++ trunk/maven-eugene-plugin/src/it/evol-308/src/main/java/org/nuiton/eugene/test/MyEnumeration2.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1,6 @@ +package org.nuiton.eugene.test; + + +public enum MyEnumeration2 { + one2; +} \ No newline at end of file Added: 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 (rev 0) +++ trunk/maven-eugene-plugin/src/it/evol-308/src/test/java/org/nuiton/eugene/test/EnumerationTest.java 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1,17 @@ +package org.nuiton.eugene.test; + +import org.junit.Assert; +import org.junit.Test; + +public class EnumerationTest { + + @Test + public void testEnumeration() { + Assert.assertNotNull(MyEnumeration.values()); + Assert.assertEquals(3,MyEnumeration.values().length); + Assert.assertNotNull(MyEnumeration.one); + Assert.assertNotNull(MyEnumeration.two); + Assert.assertNotNull(MyEnumeration.three); + + } +} Added: trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy (rev 0) +++ trunk/maven-eugene-plugin/src/it/evol-308/verify.groovy 2011-10-12 18:54:15 UTC (rev 1103) @@ -0,0 +1,12 @@ + +outputDir = new File(basedir, 'target/generated-sources/java'); + +// already in class-path +file = new File(outputDir, 'org/nuiton/eugene/test/MyEnumeration2'); +assert !file.exists(); + +// not with stereotype enumeration +file = new File(outputDir, 'org/nuiton/eugene/test/MyEnumeration3'); +assert !file.exists(); + +return true; \ No newline at end of file

1 0