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

r962 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:43:36 +0200 (Sun, 29 Aug 2010) New Revision: 962 Url: http://nuiton.org/repositories/revision/eugene/962 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-08-29 15:43:35 UTC (rev 961) +++ trunk/ant-eugene-task/pom.xml 2010-08-29 15:43:36 UTC (rev 962) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2</version> + <version>2.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-08-29 15:43:35 UTC (rev 961) +++ trunk/eugene/pom.xml 2010-08-29 15:43:36 UTC (rev 962) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2</version> + <version>2.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-08-29 15:43:35 UTC (rev 961) +++ trunk/maven-eugene-plugin/pom.xml 2010-08-29 15:43:36 UTC (rev 962) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2</version> + <version>2.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 15:43:35 UTC (rev 961) +++ trunk/pom.xml 2010-08-29 15:43:36 UTC (rev 962) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1.2</version> + <version>2.1.3-SNAPSHOT</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0

r961 - in tags: . eugene-2.1.2
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:43:35 +0200 (Sun, 29 Aug 2010) New Revision: 961 Url: http://nuiton.org/repositories/revision/eugene/961 Log: [maven-release-plugin] copy for tag eugene-2.1.2 Added: tags/eugene-2.1.2/ Property changes on: tags/eugene-2.1.2 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r960 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:43:34 +0200 (Sun, 29 Aug 2010) New Revision: 960 Url: http://nuiton.org/repositories/revision/eugene/960 Log: [maven-release-plugin] prepare release eugene-2.1.2 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-08-29 15:28:08 UTC (rev 959) +++ trunk/ant-eugene-task/pom.xml 2010-08-29 15:43:34 UTC (rev 960) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-08-29 15:28:08 UTC (rev 959) +++ trunk/eugene/pom.xml 2010-08-29 15:43:34 UTC (rev 960) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-08-29 15:28:08 UTC (rev 959) +++ trunk/maven-eugene-plugin/pom.xml 2010-08-29 15:43:34 UTC (rev 960) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 15:28:08 UTC (rev 959) +++ trunk/pom.xml 2010-08-29 15:43:34 UTC (rev 960) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.2</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1.2</url> </scm> </project>

1 0

r959 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 17:28:08 +0200 (Sun, 29 Aug 2010) New Revision: 959 Url: http://nuiton.org/repositories/revision/eugene/959 Log: Update nuiton-utils to 1.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:19:35 UTC (rev 958) +++ trunk/pom.xml 2010-08-29 15:28:08 UTC (rev 959) @@ -269,7 +269,7 @@ <ant.version>1.7.1</ant.version> <processor.version>1.0.3</processor.version> - <nuiton-utils.version>1.3.1</nuiton-utils.version> + <nuiton-utils.version>1.4.1</nuiton-utils.version>  <locales>en,fr</locales>

1 0

r958 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:19:35 +0200 (Sun, 29 Aug 2010) New Revision: 958 Url: http://nuiton.org/repositories/revision/eugene/958 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-14 10:10:10 UTC (rev 957) +++ trunk/pom.xml 2010-08-29 14:19:35 UTC (rev 958) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>eugene</artifactId>

1 0

r957 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 14 Aug '10

14 Aug '10

Author: tchemit Date: 2010-08-14 12:10:10 +0200 (Sat, 14 Aug 2010) New Revision: 957 Url: http://nuiton.org/repositories/revision/eugene/957 Log: Anomalie #809: no way to generate empty body for operation 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 2010-08-12 16:19:16 UTC (rev 956) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-08-14 10:10:10 UTC (rev 957) @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.*; +import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; /*{generator option: parentheses = true}*/ @@ -506,10 +507,12 @@ /*{<%=comma%><%=exceptionName%>}*/ comma = ", "; } + // tchemit 2010-08-14 fix http://www.nuiton.org/issues/show/809 +// if (!op.getBodyCode().isEmpty()) { + if (!(clazz instanceof ObjectModelInterface) && !op.isAbstract()) { + String body = op.getBodyCode() == null ? "" : op.getBodyCode(); +/*{<%=prefix%> {<%=body%><%=prefix%>} - if (!op.getBodyCode().isEmpty()) { -/*{<%=prefix%> {<%=op.getBodyCode()%><%=prefix%>} - }*/ } else { /*{;

1 0

r956 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by bleny＠users.nuiton.org 12 Aug '10

12 Aug '10

Author: bleny Date: 2010-08-12 18:19:16 +0200 (Thu, 12 Aug 2010) New Revision: 956 Url: http://nuiton.org/repositories/revision/eugene/956 Log: added clone operation for classifiers, classes, enumerations, interfaces, attributes and operations 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 2010-08-12 16:18:13 UTC (rev 955) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 16:19:16 UTC (rev 956) @@ -48,6 +48,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.Map; import java.util.Set; /** @@ -382,6 +383,18 @@ builder.addAnnotation(classifier, element, annotation); } + /** + * 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 + * @return the block added + */ public ObjectModelOperation addBlock(ObjectModelClassifier classifier, ObjectModelModifier... modifiers) { return builder.addBlock(classifier, modifiers); @@ -400,24 +413,25 @@ /** * Clone the {@code source} operation into the {@code destination} classifier. - * Name, returnType, Parameters and Exceptions will be cloned. You can specify - * {@code modifiers} for the result operation. + * 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 documentation flag to add documentation if some found in model + * @param cloneDocumentation flag to add documentation if some found in model * @param modifiers extra modifiers * @return the new operation created in destination classifier + * @since 2.1.2 */ public ObjectModelOperation cloneOperationSignature(ObjectModelOperation source, ObjectModelClassifier destination, - boolean documentation, + boolean cloneDocumentation, ObjectModelModifier... modifiers) { ObjectModelOperation outputOperation = addOperation(destination, source.getName(), source.getReturnType(), modifiers); - if (documentation && GeneratorUtil.hasDocumentation(source)) { + if (cloneDocumentation && GeneratorUtil.hasDocumentation(source)) { setDocumentation(outputOperation, source.getDocumentation()); } @@ -426,7 +440,7 @@ ObjectModelParameter outputParam = addParameter(outputOperation, parameter.getType(), parameter.getName()); - if (documentation && GeneratorUtil.hasDocumentation(parameter)) { + if (cloneDocumentation && GeneratorUtil.hasDocumentation(parameter)) { setDocumentation(outputParam, parameter.getDocumentation()); } } @@ -435,10 +449,211 @@ addException(outputOperation, exception); } + for (Map.Entry<String, String> tagValue : source.getTagValues().entrySet()) { + addTagValue(destination, tagValue.getKey(), tagValue.getValue()); + } + return outputOperation; } /** + * 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 cloneDocumentation flag to add documentation if some found in model + * @param modifiers extra modifiers + * @return the new operation created in destination classifier + * @since 2.1.2 + */ + public ObjectModelOperation cloneOperation(ObjectModelOperation source, + ObjectModelClassifier destination, + boolean cloneDocumentation, + ObjectModelModifier... modifiers) { + ObjectModelOperation outputOperation = cloneOperationSignature(source, destination, cloneDocumentation, modifiers); + setOperationBody(outputOperation, source.getBodyCode()); + return outputOperation; + } + + /** + * clone a given attribute into a classifier of the output model + * + * @param attribute 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 + * @return the clone attribute + * @since 2.1.2 + */ + protected ObjectModelAttribute cloneAttribute(ObjectModelAttribute source, + ObjectModelClassifier destination, + boolean cloneDocumentation, + ObjectModelModifier... modifiers) { + + ObjectModelAttribute outputAttribute = addAttribute(destination, + source.getName(), source.getType(), + source.getDefaultValue(), modifiers); + + for (Map.Entry<String, String> tagValue : source.getTagValues().entrySet()) { + addTagValue(outputAttribute, tagValue.getKey(), tagValue.getValue()); + } + + if (cloneDocumentation) { + setDocumentation(outputAttribute, source.getDocumentation()); + } + + for (String comment : source.getComments()) { + addComment(outputAttribute, comment); + } + + setMinMultiplicity(outputAttribute, source.getMinMultiplicity()); + setMaxMultiplicity(outputAttribute, source.getMaxMultiplicity()); + + return outputAttribute; + } + + /** + * 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 + * @param copyDocumentation flag to add documentation if some found in model + * @since 2.1.2 + */ + protected void copyClassifier(ObjectModelClassifier source, + ObjectModelClassifier destination, + boolean copyDocumentation) { + + for (ObjectModelAttribute attribute : source.getAttributes()) { + cloneAttribute(attribute, destination, copyDocumentation); + } + + for (ObjectModelInterface interfacez : source.getInterfaces()) { + addInterface(destination, interfacez.getQualifiedName()); + } + + for (ObjectModelOperation operation : source.getOperations()) { + cloneOperation(operation, destination, copyDocumentation); + } + } + + /** + * 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 cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given class + * @since 2.1.2 + */ + public ObjectModelClass cloneClass(ObjectModelClass source, + boolean cloneDocumentation) { + ObjectModelClass outputClass = createClass(source.getName(), + source.getPackageName()); + copyClassifier(source, outputClass, cloneDocumentation); + + if (source.getSuperclasses().size() > 1) { + log.warn(source.getQualifiedName() + " has multiple inheritence, some of them will be ignored"); + } + + for (ObjectModelClass superClass : source.getSuperclasses()) { + setSuperClass(outputClass, superClass.getQualifiedName()); + + // TODO 20100812 bleny is there something to do with discriminator for superClass ? + } + + for (ObjectModelClassifier innerClassifier : source.getInnerClassifiers()) { + ObjectModelClassifier innerClassifierClone = cloneClassifier(innerClassifier, cloneDocumentation); + addInnerClassifier(outputClass, + ObjectModelType.OBJECT_MODEL_CLASSIFIER, + innerClassifierClone.getName()); + } + + return outputClass; + } + + /** + * 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 cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given interface + * @since 2.1.2 + */ + public ObjectModelInterface cloneInterface(ObjectModelInterface source, + boolean cloneDocumentation) { + ObjectModelInterface outputInterface = createInterface(source.getName(), source.getPackageName()); + + copyClassifier(source, outputInterface, cloneDocumentation); + // nothing more to do. copyClassifier already done the job + + return outputInterface; + } + + /** + * 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 cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given enumeration + * @since 2.1.2 + */ + public ObjectModelEnumeration cloneEnumeration(ObjectModelEnumeration source, + boolean cloneDocumentation) { + ObjectModelEnumeration outputEnumeration = + createEnumeration(source.getName(), source.getPackageName()); + + copyClassifier(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 cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given classifier + * @since 2.1.2 + */ + public ObjectModelClassifier cloneClassifier(ObjectModelClassifier source, + boolean cloneDocumentation) { + ObjectModelClassifier clone = null; + if (source.isInterface()) { + clone = cloneInterface((ObjectModelInterface) source, cloneDocumentation); + } else if (source.isClass()) { + clone = cloneClass((ObjectModelClass) source, cloneDocumentation); + } else if (source.isEnum()) { + clone = cloneEnumeration((ObjectModelEnumeration) source, cloneDocumentation); + } else { + // should never occur + log.error("strange classifier " + source); + } + return clone; + } + + /** * Search in {@code input} model, for a enumeration dependency named * {@link JavaGeneratorUtil#DEPENDENCIES_CONSTANTS}. *

1 0

r955 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by bleny＠users.nuiton.org 12 Aug '10

12 Aug '10

Author: bleny Date: 2010-08-12 18:18:13 +0200 (Thu, 12 Aug 2010) New Revision: 955 Url: http://nuiton.org/repositories/revision/eugene/955 Log: a bit of javadoc about objectModel Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java 2010-08-12 15:22:56 UTC (rev 954) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java 2010-08-12 16:18:13 UTC (rev 955) @@ -55,6 +55,7 @@ Collection<ObjectModelClassifier> getInnerClassifiers(); /** + * // FIXME 20100812 fix javadoc, what is a discrimator and what it is used for ? * Returns the discriminator for the given superclass. * * @param superclass super class to get discriminator Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-12 15:22:56 UTC (rev 954) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-12 16:18:13 UTC (rev 955) @@ -62,8 +62,12 @@ String getDocumentation(); /** - * Returns the description associated with this element. + * The description of this element is the upper part of the element's + * documentation. * + * The other part of the document can be accessed with + * {@link #getSourceDocumentation()} + * * @return the description associated with this element. */ String getDescription();

1 0

r954 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object
by tchemit＠users.nuiton.org 12 Aug '10

12 Aug '10

Author: tchemit Date: 2010-08-12 17:22:56 +0200 (Thu, 12 Aug 2010) New Revision: 954 Url: http://nuiton.org/repositories/revision/eugene/954 Log: add addOperation method + add javadocs Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 15:04:52 UTC (rev 953) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 15:22:56 UTC (rev 954) @@ -163,7 +163,7 @@ /** * Adds a tag value to the model. * - * @param name name of the tag value + * @param name name of the tag value * @param value value of the tag value */ public void addTagValue(String name, String value) { @@ -174,8 +174,8 @@ * Adds a tag value to the given {@code element}. * * @param element the element on which the tag value is attached. - * @param name the name of the tag value - * @param value the value of the tag value + * @param name the name of the tag value + * @param value the value of the tag value */ public void addTagValue(ObjectModelElement element, String name, String value) { builder.addTagValue(element, name, value); @@ -202,7 +202,7 @@ } return prefix.trim(); } - + protected ObjectModelAttribute addConstant( ObjectModelClassifier classifier, String name, @@ -280,6 +280,20 @@ return builder.addOperation(classifier, name, type == null ? null : type.getName(), modifiers); } + /** + * Adds an operation to the given classifier. + * + * @param classifier the classifier on which the operation will be added + * @param operation the operation to add + * @return the added operation + * @since 2.1.2 + */ + protected ObjectModelOperation addOperation( + ObjectModelClassifier classifier, + ObjectModelOperation operation) { + return builder.addOperation(classifier, operation); + } + protected void addLiteral(ObjectModelEnumeration classifier, String name) { builder.addLiteral(classifier, name); } @@ -329,14 +343,35 @@ builder.setDocumentation(element, documentation); } + /** + * Adds a min multiplicity to the given {@code attribute}. + * + * @param attribute the attribute on which the min multiplicty will be setted + * @param multiplicity the multiplicity to set + * @since 2.1.2 + */ public void setMinMultiplicity(ObjectModelAttribute attribute, int multiplicity) { builder.setMinMultiplicity(attribute, multiplicity); } + /** + * Adds a max multiplicity to the given {@code attribute}. + * + * @param attribute the attribute on which the min multiplicty will be setted + * @param multiplicity the multiplicity to set + * @since 2.1.2 + */ public void setMaxMultiplicity(ObjectModelAttribute attribute, int multiplicity) { builder.setMaxMultiplicity(attribute, multiplicity); } + /** + * Adds a comment to the given {@code element}. + * + * @param element the element on which the comment will be added. + * @param comment the comment to add + * @since 2.1.2 + */ public void addComment(ObjectModelElement element, String comment) { builder.addComment(element, comment); } @@ -352,6 +387,13 @@ return builder.addBlock(classifier, modifiers); } + /** + * Add a stereotype to the given {@code element}. + * + * @param element the element on which the stereotype will be added + * @param stereotype the stereotype to add + * @since 2.1.2 + */ public void addStereotype(ObjectModelElement element, String stereotype) { builder.addStereotype(element, stereotype); } @@ -473,7 +515,7 @@ } protected URL getFileInClassPath(String fqn) { - String resourceName = fqn.replaceAll("\\.", "/") + ".java"; + String resourceName = fqn.replaceAll("\\.", "/") + ".java"; URL fileLocation = getClassLoader().getResource(resourceName); if (log.isDebugEnabled()) { log.debug("Look for resource : " + resourceName + " = " + fileLocation); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-08-12 15:04:52 UTC (rev 953) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-08-12 15:22:56 UTC (rev 954) @@ -97,7 +97,9 @@ * @param name tagValue name * @param value tagValue value */ - public void addTagValue(ObjectModelElement element, String name, String value) { + public void addTagValue(ObjectModelElement element, + String name, + String value) { ObjectModelElementImpl impl = (ObjectModelElementImpl) element; ObjectModelImplTagValue tagValue = new ObjectModelImplTagValue(); @@ -115,12 +117,17 @@ * @param modifiers class modifiers * @return the new ObjectModelClass added to the model */ - public ObjectModelClass createClass(String name, String packageName, ObjectModelModifier... modifiers) { + public ObjectModelClass createClass(String name, + String packageName, + ObjectModelModifier... modifiers) { ObjectModelClassImpl result = new ObjectModelClassImpl(); return createClass(result, name, packageName, modifiers); } - protected ObjectModelClass createClass(ObjectModelClassImpl clazz, String name, String packageName, ObjectModelModifier... modifiers) + protected ObjectModelClass createClass(ObjectModelClassImpl clazz, + String name, + String packageName, + ObjectModelModifier... modifiers) throws IllegalArgumentException { clazz.setName(name); clazz.setPackage(packageName); @@ -162,7 +169,8 @@ * @param packageName interface package * @return the new ObjectModelInterface added to the model */ - public ObjectModelInterface createInterface(String name, String packageName) { + public ObjectModelInterface createInterface(String name, + String packageName) { ObjectModelInterfaceImpl result = new ObjectModelInterfaceImpl(); result.setName(name); result.setPackage(packageName); @@ -177,7 +185,8 @@ * @param packageName interface package * @return the new ObjectModelInterface added to the model */ - public ObjectModelEnumeration createEnumeration(String name, String packageName) { + public ObjectModelEnumeration createEnumeration(String name, + String packageName) { ObjectModelEnumerationImpl result = new ObjectModelEnumerationImpl(); result.setName(name); result.setPackage(packageName); @@ -195,7 +204,9 @@ * @param type attribute type (full qualified name) * @return the new ObjectModelAttribute added */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type) { + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type) { return addAttribute(classifier, name, type, ""); } @@ -213,8 +224,12 @@ * @throws IllegalArgumentException illegal Modifier * @see ObjectModelModifier#isVisibility() */ - public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type, String value, - ObjectModelModifier... modifiers) throws IllegalArgumentException { + public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, + String name, + String type, + String value, + ObjectModelModifier... modifiers) + throws IllegalArgumentException { ObjectModelAttributeImpl attribute = new ObjectModelAttributeImpl(); attribute.setName(name); attribute.setType(type); @@ -238,7 +253,8 @@ attribute.setUnique(true); break; default: - throw new IllegalArgumentException("Unsupported modifier type '" + modifier.name() + "'"); + throw new IllegalArgumentException( + "Unsupported modifier type '" + modifier.name() + "'"); } } } @@ -264,8 +280,12 @@ * @return the attribute corresponding to the association for classifierA * @throws IllegalArgumentException illegal modifier */ - public ObjectModelAttribute addAssociation(ObjectModelClassifier classifierA, ObjectModelClassifier classifierB, String roleName, - int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) + public ObjectModelAttribute addAssociation(ObjectModelClassifier classifierA, + ObjectModelClassifier classifierB, + String roleName, + int minMultiplicity, + int maxMultiplicity, + ObjectModelModifier... modifiers) throws IllegalArgumentException { ObjectModelAttributeImpl attribute = new ObjectModelAttributeImpl(); @@ -296,7 +316,8 @@ attribute.setNavigable(true); break; default: - throw new IllegalArgumentException("Unsupported modifier type '" + modifier.name() + "'"); + throw new IllegalArgumentException( + "Unsupported modifier type '" + modifier.name() + "'"); } } } @@ -318,8 +339,11 @@ * @return the attribute corresponding to the association for classifierB * @see #addAssociation(ObjectModelClassifier, ObjectModelClassifier, String, int, int, ObjectModelModifier...) */ - public ObjectModelAttribute addReverseAssociation(ObjectModelAttribute attrAssociation, String roleName, - int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) { + public ObjectModelAttribute addReverseAssociation(ObjectModelAttribute attrAssociation, + String roleName, + int minMultiplicity, + int maxMultiplicity, + ObjectModelModifier... modifiers) { ObjectModelAttributeImpl associationA = (ObjectModelAttributeImpl) attrAssociation; // Add reverse parameters @@ -335,8 +359,12 @@ // Create reverse association ObjectModelAttributeImpl associationB = - (ObjectModelAttributeImpl) addAssociation(classifierB, classifierA, roleName, - minMultiplicity, maxMultiplicity, modifiers); + (ObjectModelAttributeImpl) addAssociation(classifierB, + classifierA, + roleName, + minMultiplicity, + maxMultiplicity, + modifiers); associationB.setReverseAttributeName(associationA.getName()); associationB.setReverseMaxMultiplicity(associationA.getMaxMultiplicity()); @@ -356,18 +384,23 @@ * @param modifiers for the association class * @return the new association class created with participants A and B */ - public ObjectModelAssociationClass createAssociationClass(String name, String packageName, ObjectModelAttribute attrAssociationA, - ObjectModelAttribute attrAssociationB, ObjectModelModifier... modifiers) { + public ObjectModelAssociationClass createAssociationClass(String name, + String packageName, + ObjectModelAttribute attrAssociationA, + ObjectModelAttribute attrAssociationB, + ObjectModelModifier... modifiers) { ObjectModelAssociationClassImpl associationClass = new ObjectModelAssociationClassImpl(); createClass(associationClass, name, packageName, modifiers); // Add associationClass in attrAssociationA - ObjectModelAttributeImpl attrA = (ObjectModelAttributeImpl) attrAssociationA; + ObjectModelAttributeImpl attrA = + (ObjectModelAttributeImpl) attrAssociationA; attrA.setAssociationClassName(associationClass.getQualifiedName()); // Add associationClass in attrAssociationB - ObjectModelAttributeImpl attrB = (ObjectModelAttributeImpl) attrAssociationB; + ObjectModelAttributeImpl attrB = + (ObjectModelAttributeImpl) attrAssociationB; attrB.setAssociationClassName(associationClass.getQualifiedName()); // Create participantA @@ -375,7 +408,8 @@ new ObjectModeImplAssociationClassParticipant(); participantA.setAttribute(attrA.getName()); - ObjectModelClassifier classifierA = (ObjectModelClassifier) attrA.getDeclaringElement(); + ObjectModelClassifier classifierA = + (ObjectModelClassifier) attrA.getDeclaringElement(); participantA.setName(classifierA.getQualifiedName()); associationClass.addParticipant(participantA); @@ -385,7 +419,8 @@ new ObjectModeImplAssociationClassParticipant(); participantB.setAttribute(attrB.getName()); - ObjectModelClassifier classifierB = (ObjectModelClassifier) attrB.getDeclaringElement(); + ObjectModelClassifier classifierB = + (ObjectModelClassifier) attrB.getDeclaringElement(); participantB.setName(classifierB.getQualifiedName()); associationClass.addParticipant(participantB); @@ -406,13 +441,16 @@ * @throws IllegalArgumentException illegal Modifier */ public ObjectModelOperation addOperation(ObjectModelClassifier classifier, - String name, String returnType, ObjectModelModifier... modifiers) + String name, + String returnType, + ObjectModelModifier... modifiers) throws IllegalArgumentException { ObjectModelOperationImpl result = new ObjectModelOperationImpl(); result.setName(name); if (returnType != null) { - ObjectModelParameterImpl returnParameter = new ObjectModelParameterImpl(); + ObjectModelParameterImpl returnParameter = + new ObjectModelParameterImpl(); returnParameter.setType(returnType); result.setReturnParameter(returnParameter); } @@ -439,13 +477,32 @@ } /** + * Add an operation to a classifier. + * Modifiers allowed : STATIC, ABSTRACT, PUBLIC, PRIVATE, PROTECTED, PACKAGE. + * The last visibility set will be keeped. + * + * @param classifier where the operation will be added + * @param operation operation to add + * @return the added operation (says the given parameter) + * @since 2.1.2 + */ + public ObjectModelOperation addOperation(ObjectModelClassifier classifier, + ObjectModelOperation operation) { + + ((ObjectModelClassifierImpl) classifier).addOperation( + (ObjectModelOperationImpl) operation); + return operation; + } + + /** * Set the body code for an Operation. * * @param operation where the code will be added * @param body code to add to the operation */ public void setOperationBody(ObjectModelOperation operation, String body) { - ObjectModelOperationImpl operationImpl = (ObjectModelOperationImpl) operation; + ObjectModelOperationImpl operationImpl = + (ObjectModelOperationImpl) operation; operationImpl.setBodyCode(body); } @@ -455,7 +512,8 @@ * @param classifier where the interface will be added * @param interfaceQualifiedName interface qualified name */ - public void addInterface(ObjectModelClassifier classifier, String interfaceQualifiedName) { + public void addInterface(ObjectModelClassifier classifier, + String interfaceQualifiedName) { ObjectModelClassifierImpl impl = (ObjectModelClassifierImpl) classifier; ObjectModelImplRef interfacez = new ObjectModelImplRef(); @@ -470,10 +528,12 @@ * @param clazz where the superclass will be added * @param superclassQualifiedName superclass qualified name */ - public void addSuperclass(ObjectModelClass clazz, String superclassQualifiedName) { + public void addSuperclass(ObjectModelClass clazz, + String superclassQualifiedName) { ObjectModelClassImpl impl = (ObjectModelClassImpl) clazz; - ObjectModelImplSuperClassRef superclass = new ObjectModelImplSuperClassRef(); + ObjectModelImplSuperClassRef superclass = + new ObjectModelImplSuperClassRef(); superclass.setName(superclassQualifiedName); impl.addSuperclass(superclass); @@ -519,7 +579,8 @@ inner.setObjectModelImpl(impl.getModel()); if (log.isDebugEnabled()) { - log.debug("Add inner classifier for " + clazz.getQualifiedName() + " : " + inner.getQualifiedName()); + log.debug("Add inner classifier for " + clazz.getQualifiedName() + + " : " + inner.getQualifiedName()); } return inner; @@ -533,7 +594,9 @@ * @param name parameter name * @return the new ObjectModelParameter added */ - public ObjectModelParameter addParameter(ObjectModelOperation operation, String type, String name) { + public ObjectModelParameter addParameter(ObjectModelOperation operation, + String type, + String name) { ObjectModelOperationImpl impl = (ObjectModelOperationImpl) operation; ObjectModelParameterImpl param = new ObjectModelParameterImpl(); param.setType(type); @@ -561,7 +624,8 @@ * @param element where the documentation will be setted * @param documentation String documentation for the element */ - public void setDocumentation(ObjectModelElement element, String documentation) { + public void setDocumentation(ObjectModelElement element, + String documentation) { ObjectModelElementImpl impl = (ObjectModelElementImpl) element; impl.setDocumentation(documentation); } @@ -604,7 +668,8 @@ * @param attribute where the multiplicity will be setted * @param multiplicity String description for the element */ - public void setMinMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + public void setMinMultiplicity(ObjectModelAttribute attribute, + int multiplicity) { ObjectModelAttributeImpl impl = (ObjectModelAttributeImpl) attribute; impl.setMinMultiplicity(multiplicity); } @@ -615,7 +680,8 @@ * @param attribute where the multiplicity will be setted * @param multiplicity String description for the element */ - public void setMaxMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + public void setMaxMultiplicity(ObjectModelAttribute attribute, + int multiplicity) { ObjectModelAttributeImpl impl = (ObjectModelAttributeImpl) attribute; impl.setMaxMultiplicity(multiplicity); }

1 0

r953 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object
by tchemit＠users.nuiton.org 12 Aug '10

12 Aug '10

Author: tchemit Date: 2010-08-12 17:04:52 +0200 (Thu, 12 Aug 2010) New Revision: 953 Url: http://nuiton.org/repositories/revision/eugene/953 Log: add new methods to fill objectmodel from builder and transformerToJava Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 15:00:46 UTC (rev 952) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 15:04:52 UTC (rev 953) @@ -329,6 +329,18 @@ builder.setDocumentation(element, documentation); } + public void setMinMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + builder.setMinMultiplicity(attribute, multiplicity); + } + + public void setMaxMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + builder.setMaxMultiplicity(attribute, multiplicity); + } + + public void addComment(ObjectModelElement element, String comment) { + builder.addComment(element, comment); + } + public void addAnnotation(ObjectModelClassifier classifier, ObjectModelElement element, String annotation) { @@ -340,6 +352,10 @@ return builder.addBlock(classifier, modifiers); } + public void addStereotype(ObjectModelElement element, String stereotype) { + builder.addStereotype(element, stereotype); + } + /** * Clone the {@code source} operation into the {@code destination} classifier. * Name, returnType, Parameters and Exceptions will be cloned. You can specify Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-08-12 15:00:46 UTC (rev 952) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-08-12 15:04:52 UTC (rev 953) @@ -28,7 +28,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.xml.*; +import org.nuiton.eugene.models.object.xml.ObjectModeImplAssociationClassParticipant; +import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelElementImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; +import org.nuiton.eugene.models.object.xml.ObjectModelImplSuperClassRef; +import org.nuiton.eugene.models.object.xml.ObjectModelImplTagValue; +import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; /** * Builder to fill an empty ObjectModel. The object model name is important if @@ -139,7 +152,7 @@ throw new IllegalArgumentException( "Unsupported modifier type '" + modifier.name() + "'"); } - } + } } /** @@ -323,7 +336,7 @@ // Create reverse association ObjectModelAttributeImpl associationB = (ObjectModelAttributeImpl) addAssociation(classifierB, classifierA, roleName, - minMultiplicity, maxMultiplicity, modifiers); + minMultiplicity, maxMultiplicity, modifiers); associationB.setReverseAttributeName(associationA.getName()); associationB.setReverseMaxMultiplicity(associationA.getMaxMultiplicity()); @@ -469,9 +482,9 @@ /** * Add a superclass to an other class. The superclass may not exist in model. * - * @param clazz where the superclass will be added - * @param type type of inner classifier to create - * @param name superclass qualified name + * @param clazz where the superclass will be added + * @param type type of inner classifier to create + * @param name superclass qualified name * @param modifiers modifiers of the inner classifier * @return the new instanciated inner classifier * @throws IllegalArgumentException if given {@code type} is not a concrete classifier type @@ -491,7 +504,7 @@ break; case OBJECT_MODEL_CLASS: inner = new ObjectModelClassImpl(); - setClassModifiers((ObjectModelClassImpl)inner, modifiers); + setClassModifiers((ObjectModelClassImpl) inner, modifiers); break; case OBJECT_MODEL_INTERFACE: inner = new ObjectModelInterfaceImpl(); @@ -572,4 +585,39 @@ ref.setName(name); impl.addLiteral(ref); } + + /** + * Add a comment to an element. + * + * @param element where the comment will be added + * @param comment comment to add + * @since 2.1.2 + */ + public void addComment(ObjectModelElement element, String comment) { + ObjectModelElementImpl impl = (ObjectModelElementImpl) element; + impl.addComment(comment); + } + + /** + * Set the min multiplicity of an attribute in the model. + * + * @param attribute where the multiplicity will be setted + * @param multiplicity String description for the element + */ + public void setMinMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + ObjectModelAttributeImpl impl = (ObjectModelAttributeImpl) attribute; + impl.setMinMultiplicity(multiplicity); + } + + /** + * Set the max multiplicity of an attribute in the model. + * + * @param attribute where the multiplicity will be setted + * @param multiplicity String description for the element + */ + public void setMaxMultiplicity(ObjectModelAttribute attribute, int multiplicity) { + ObjectModelAttributeImpl impl = (ObjectModelAttributeImpl) attribute; + impl.setMaxMultiplicity(multiplicity); + } + }

1 0