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

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

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

12 Aug '10

Author: tchemit Date: 2010-08-12 17:00:46 +0200 (Thu, 12 Aug 2010) New Revision: 952 Url: http://nuiton.org/repositories/revision/eugene/952 Log: reformat code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 14:51:27 UTC (rev 951) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 15:00:46 UTC (rev 952) @@ -25,39 +25,46 @@ package org.nuiton.eugene.models.object.xml; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.object.ObjectModelElement; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelElement; - /** * ObjectModelElementImpl. * * @author chatellier * @author cedric * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class ObjectModelElementImpl implements ObjectModelElement { /** logger */ private static final Log log = LogFactory.getLog(ObjectModelElementImpl.class); protected ObjectModelImpl objectModelImpl; + protected ObjectModelElement declaringElement; protected String name; + protected boolean isStatic; + protected String documentation; + protected List<String> stereotypes; + protected Map<String, String> tagValues; + protected List<String> comments; public ObjectModelElementImpl() { @@ -66,22 +73,19 @@ comments = new ArrayList<String>(); } - /** - * @param objectModelImpl the objectModelImpl - */ + /** @param objectModelImpl the objectModelImpl */ public void setObjectModelImpl(ObjectModelImpl objectModelImpl) { this.objectModelImpl = objectModelImpl; } - /** - * @param declaringElement the declaringElement to set - */ + /** @param declaringElement the declaringElement to set */ public void setDeclaringElement(ObjectModelElement declaringElement) { this.declaringElement = declaringElement; } /** * TODO a tester + * * @return the objectModel */ public ObjectModelImpl getModel() { @@ -140,9 +144,9 @@ @Override public String getDocumentation() { - if (documentation == null && hasTagValue("documentation")) { - return getTagValue("documentation"); - } + if (documentation == null && hasTagValue("documentation")) { + return getTagValue("documentation"); + } return documentation; } @@ -183,11 +187,11 @@ /** * Adds the given {@code value} associated to the {@code tagValue}. - * + * * Note: If a previous tag value was definied, then it will be replaced. * * @param tagValue the name of the tag value - * @param value the value to associate + * @param value the value to associate * @since 2.1.2 */ public void addTagValue(String tagValue, String value) { @@ -195,7 +199,7 @@ if (StringUtils.isNotEmpty(oldValue)) { log.warn("Replace tagValue '" + tagValue + "' (old:" + oldValue + ", new: " + value + ")"); } - tagValues.put(tagValue,value); + tagValues.put(tagValue, value); } @Override

1 0

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

12 Aug '10

Author: tchemit Date: 2010-08-12 16:51:27 +0200 (Thu, 12 Aug 2010) New Revision: 951 Url: http://nuiton.org/repositories/revision/eugene/951 Log: do NOT expose method to modify model from contract Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.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 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-12 14:51:27 UTC (rev 951) @@ -160,10 +160,23 @@ builder.addImport(classifier, imports.getName()); } + /** + * Adds a tag value to the model. + * + * @param name name of the tag value + * @param value value of the tag value + */ public void addTagValue(String name, String value) { builder.addTagValue(name, value); } + /** + * 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 + */ public void addTagValue(ObjectModelElement element, String name, String value) { builder.addTagValue(element, name, value); } 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 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-12 14:51:27 UTC (rev 951) @@ -116,16 +116,16 @@ */ boolean hasTagValue(String tagValue); - /** - * Adds the given {@code value} associated to the {@code tagValue}. - * - * Note: If a previous tag value was definied, then it will be replaced. - * - * @param tagValue the name of the tag value - * @param value the value to associate - * @since 2.1.2 - */ - void addTagValue(String tagValue, String value); +// /** +// * Adds the given {@code value} associated to the {@code tagValue}. +// * +// * Note: If a previous tag value was definied, then it will be replaced. +// * +// * @param tagValue the name of the tag value +// * @param value the value to associate +// * @since 2.1.2 +// */ +// void addTagValue(String tagValue, String value); /** * Return if this element has static declaration, only valid when Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-12 14:51:27 UTC (rev 951) @@ -45,6 +45,7 @@ /** * Le model associé au transformer est le model d'entree. Le modele de sortie * peut etre initialiser via la methode {@link Transformer#initOutputModel()}. + * * Il est également possible de surcharger la methode {@link #debugOutputModel()} * pour verifier le resultat de la transformation. * Par defaut la methode appelle la methode @@ -57,22 +58,24 @@ * {@link #transformFromEnumeration(ObjectModelEnumeration)} */ @Override - public void transform() { + public void transform() { + ObjectModel model = getModel(); + // transformFromModel - transformFromElement(getModel(), ObjectModelType.OBJECT_MODEL); + transformFromElement(model, ObjectModelType.OBJECT_MODEL); // transformFromClassifier - transformFromElements(getModel().getClassifiers(), ObjectModelType.OBJECT_MODEL_CLASSIFIER); + transformFromElements(model.getClassifiers(), ObjectModelType.OBJECT_MODEL_CLASSIFIER); // transformFromInterface - transformFromElements(getModel().getInterfaces(), ObjectModelType.OBJECT_MODEL_INTERFACE); + transformFromElements(model.getInterfaces(), ObjectModelType.OBJECT_MODEL_INTERFACE); // transformFromClass - transformFromElements(getModel().getClasses(), ObjectModelType.OBJECT_MODEL_CLASS); + transformFromElements(model.getClasses(), ObjectModelType.OBJECT_MODEL_CLASS); // transformFromEnumeration - transformFromElements(getModel().getEnumerations(), ObjectModelType.OBJECT_MODEL_ENUMERATION); + transformFromElements(model.getEnumerations(), ObjectModelType.OBJECT_MODEL_ENUMERATION); debugOutputModel(); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -181,7 +181,15 @@ return tagValues.containsKey(tagValue); } - @Override + /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ public void addTagValue(String tagValue, String value) { String oldValue = getTagValue(tagValue); if (StringUtils.isNotEmpty(oldValue)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -479,7 +479,15 @@ return tagValue == null ? null : tagValues.get(tagValue); } - @Override + /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ public void addTagValue(String tagValue, String value) { String oldValue = getTagValue(tagValue); if (StringUtils.isNotEmpty(oldValue)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-12 10:24:38 UTC (rev 950) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-12 14:51:27 UTC (rev 951) @@ -121,7 +121,14 @@ return modelTagValues; } - @Override + /** + * Adds the given {@code value} associated to the {@code key}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param key the name of the tag value + * @param value the value to associate + */ public void addTagValue(String key, String value) { modelTagValues.put(key, value); }

1 0

r950 - 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 12:24:38 +0200 (Thu, 12 Aug 2010) New Revision: 950 Url: http://nuiton.org/repositories/revision/eugene/950 Log: clean code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-08-11 18:26:10 UTC (rev 949) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-08-12 10:24:38 UTC (rev 950) @@ -28,18 +28,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelBuilder; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; 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.ObjectModelType; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; @@ -107,7 +104,6 @@ * * @param classifier the classifier on which to add the interface * @param interfaceQualifiedName fully qualified name of the interface - * @see ObjectModelBuilder#addInterface(ObjectModelClassifier, String) */ @Override public void addInterface(ObjectModelClassifier classifier, @@ -133,7 +129,6 @@ * @param value initializer value of attribute * @param modifiers modifiers of the attribute * @return a new ObjectModelAttribute - * @see ObjectModelBuilder#addAttribute(ObjectModelClassifier, String, String, String, ObjectModelModifier...) */ @Override public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, @@ -183,7 +178,6 @@ * @param type the return type of the operation * @param modifiers the modifiers of the operation * @return a new ObjectModelOperation - * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) */ @Override public ObjectModelOperation addOperation(ObjectModelClassifier classifier, @@ -201,7 +195,6 @@ * @param type the type of the parameter * @param name the name of the parameter * @return a new ObjectModelParameter - * @see ObjectModelBuilder#addParameter(ObjectModelOperation, String, String) */ @Override public ObjectModelParameter addParameter(ObjectModelOperation operation, @@ -217,7 +210,6 @@ * * @param operation the operation on which to add a exeception * @param exception the exception to add - * @see ObjectModelBuilder#addException(ObjectModelOperation, String) */ @Override public void addException(ObjectModelOperation operation, String exception) { @@ -232,7 +224,6 @@ * @param operation the operation on which to add the body code * @param body the body code to set on the operation * @throws IllegalArgumentException if operation is abstract - * @see ObjectModelBuilder#setOperationBody(ObjectModelOperation, String) */ @Override public void setOperationBody(ObjectModelOperation operation, String body) 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-11 18:26:10 UTC (rev 949) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-08-12 10:24:38 UTC (rev 950) @@ -51,8 +51,8 @@ * @param name model name */ public ObjectModelBuilder(String name) { - this.model = new ObjectModelImpl(); - this.model.setName(name); + model = new ObjectModelImpl(); + model.setName(name); } /** @@ -61,7 +61,7 @@ * @return the ObjectModel which is currently built */ public ObjectModel getModel() { - return this.model; + return model; } /** @@ -198,7 +198,7 @@ * @param modifiers attribute modifiers * @return the new ObjectModelAttribute added * @throws IllegalArgumentException illegal Modifier - * @see org.nuiton.eugene.models.object.ObjectModelModifier#isVisibility() + * @see ObjectModelModifier#isVisibility() */ public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type, String value, ObjectModelModifier... modifiers) throws IllegalArgumentException { @@ -239,7 +239,7 @@ * Add an association A to B. Create only attribute association for classifierA. * MODIFIERS allowed : PUBLIC, PRIVATE, PACKAGE, PROTECTED, AGGREGATE, COMPOSITE, ORDERED, UNIQUE * STATIC, NAVIGABLE. - * You have to use method {@link #addReverseAssociation(org.nuiton.eugene.models.object.ObjectModelAttribute,java.lang.String, int, int, org.nuiton.eugene.models.object.ObjectModelModifier...)} + * You have to use method {@link #addReverseAssociation(ObjectModelAttribute, String, int, int, ObjectModelModifier...)} * to create attribute association for classifierB. * * @param classifierA classifier from @@ -303,7 +303,7 @@ * @param maxMultiplicity maximum multiplicity of B in association * @param modifiers for the association * @return the attribute corresponding to the association for classifierB - * @see #addAssociation(org.nuiton.eugene.models.object.ObjectModelClassifier, org.nuiton.eugene.models.object.ObjectModelClassifier,java.lang.String, int, int, org.nuiton.eugene.models.object.ObjectModelModifier...) + * @see #addAssociation(ObjectModelClassifier, ObjectModelClassifier, String, int, int, ObjectModelModifier...) */ public ObjectModelAttribute addReverseAssociation(ObjectModelAttribute attrAssociation, String roleName, int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) { @@ -472,6 +472,7 @@ * @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 */

1 0

r949 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models models/object models/object/xml models/state/xml
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 20:26:10 +0200 (Wed, 11 Aug 2010) New Revision: 949 Url: http://nuiton.org/repositories/revision/eugene/949 Log: Evolution #807: make possible to add a tagValue to ObjectElement and ObjectModel by programation in Transformer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.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-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-08-11 18:26:10 UTC (rev 949) @@ -48,7 +48,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.List; import java.util.Set; /** @@ -161,6 +160,14 @@ builder.addImport(classifier, imports.getName()); } + public void addTagValue(String name, String value) { + builder.addTagValue(name, value); + } + + public void addTagValue(ObjectModelElement element, String name, String value) { + builder.addTagValue(element, name, value); + } + public String getConstantName(String propertyName) { return getConstantPrefix() + builder.getConstantName(propertyName); } @@ -327,6 +334,7 @@ * * @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 modifiers extra modifiers * @return the new operation created in destination classifier */ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2010-08-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2010-08-11 18:26:10 UTC (rev 949) @@ -72,4 +72,15 @@ */ String getTagValue(String tagValue); + /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ + void addTagValue(String tagValue, String value); + } //Model 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-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-08-11 18:26:10 UTC (rev 949) @@ -117,6 +117,17 @@ boolean hasTagValue(String tagValue); /** + * Adds the given {@code value} associated to the {@code tagValue}. + * + * Note: If a previous tag value was definied, then it will be replaced. + * + * @param tagValue the name of the tag value + * @param value the value to associate + * @since 2.1.2 + */ + void addTagValue(String tagValue, String value); + + /** * Return if this element has static declaration, only valid when * getDeclaringElement is classifier. Not possible for the moment * to have static innerClass (from XMI 1.2 and 2.1). Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java 2010-08-11 18:26:10 UTC (rev 949) @@ -44,7 +44,7 @@ /** * Le model associé au transformer est le model d'entree. Le modele de sortie - * peut etre initialiser via la methode {@link org.nuiton.eugene.Transformer#initOutputModel()}. + * peut etre initialiser via la methode {@link Transformer#initOutputModel()}. * Il est également possible de surcharger la methode {@link #debugOutputModel()} * pour verifier le resultat de la transformation. * Par defaut la methode appelle la methode Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2010-08-11 18:26:10 UTC (rev 949) @@ -31,6 +31,9 @@ import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelElement; /** @@ -44,17 +47,23 @@ * By : */ public class ObjectModelElementImpl implements ObjectModelElement { + /** logger */ + private static final Log log = LogFactory.getLog(ObjectModelElementImpl.class); + protected ObjectModelImpl objectModelImpl; protected ObjectModelElement declaringElement; protected String name; protected boolean isStatic; protected String documentation; - protected List<String> stereotypes = new ArrayList<String>(); - protected Map<String, String> tagValues = new HashMap<String, String>(); - protected List<String> comments = new ArrayList<String>(); + protected List<String> stereotypes; + protected Map<String, String> tagValues; + protected List<String> comments; public ObjectModelElementImpl() { + tagValues = new HashMap<String, String>(); + stereotypes = new ArrayList<String>(); + comments = new ArrayList<String>(); } /** @@ -107,7 +116,7 @@ if (tagValue == null) { return new ObjectModelImplTagValue(); } - tagValues.put(tagValue.getName(), tagValue.getValue()); + addTagValue(tagValue.getName(), tagValue.getValue()); return tagValue; } @@ -124,21 +133,11 @@ return name; } - /** - * Returns the element in which this element is defined, or null if there's none. - * - * @return the ObjectModelElement in which this element is defined, or null if there's none. - */ @Override public ObjectModelElement getDeclaringElement() { return declaringElement; } - /** - * Returns the whole documentation associated with this element (description + source documentation). - * - * @return the whole documentation associated with this element. - */ @Override public String getDocumentation() { if (documentation == null && hasTagValue("documentation")) { @@ -147,87 +146,55 @@ return documentation; } - /** - * Returns the description associated with this element. - * - * @return the description associated with this element. - */ @Override public String getDescription() { return getDocumentation().substring(0, getDocumentation().indexOf("--")); } - /** - * Returns the source documentation part associated with this element. - * - * @return the source documentation part associated with this element. - */ @Override public String getSourceDocumentation() { return getDocumentation().substring(getDocumentation().indexOf("--") + 2); } - /** - * Returns the stereotypes names associated with this element. - * - * @return a Collection containing all stereotypes names associated with this element as String. - */ @Override public Collection<String> getStereotypes() { return stereotypes; } - /** - * Returns whether this element has a stereotype corresponding to the given name, or not. - * - * @return a boolean indicating whether this element has a stereotype corresponding to the given name, or not. - */ @Override public boolean hasStereotype(String stereotypeName) { return stereotypes.contains(stereotypeName); } - /** - * Returns the tagValues associated with this element. - * For each entry, the key is the name of the tagValue, the value is the value of the tagValue :-) - * - * @return a Map containing all tagValues associated with this element - */ @Override public Map<String, String> getTagValues() { return tagValues; } - /** - * Returns the tagValue corresponding to the given name, or null if the element has no associated tagValue for this name. - * - * @return the value of the found tagValue, or null if the element has no associated tagValue for this name. - */ @Override public String getTagValue(String tagValue) { return tagValue == null ? null : tagValues.get(tagValue); } - /** - * Returns whether this element has a tagValue corresponding to the given name, or not. - * - * @return a boolean indicating whether this element has a tagValue corresponding to the given name, or not. - */ @Override public boolean hasTagValue(String tagValue) { return tagValues.containsKey(tagValue); } @Override + public void addTagValue(String tagValue, String value) { + String oldValue = getTagValue(tagValue); + if (StringUtils.isNotEmpty(oldValue)) { + log.warn("Replace tagValue '" + tagValue + "' (old:" + oldValue + ", new: " + value + ")"); + } + tagValues.put(tagValue,value); + } + + @Override public boolean isStatic() { return isStatic; } - /** - * Returns all comments lied to this particular model element - * - * @return a List containing all comments for this element as Strings. - */ @Override public List<String> getComments() { return comments; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2010-08-11 18:26:10 UTC (rev 949) @@ -32,6 +32,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModel; @@ -59,9 +60,8 @@ * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="objectmodel" */ public class ObjectModelImpl implements ObjectModel { - /** - * logger - */ + + /** logger */ private static final Log log = LogFactory.getLog(ObjectModelImpl.class); protected String name; protected String version; @@ -469,30 +469,25 @@ return tagValue; } - /** - * Returns the tagValues associated with this element. For each entry, the - * key is the name of the tagValue, the value is the value of the tagValue - * :-) - * - * @return a Map containing all tagValues associated with this element - */ @Override public Map<String, String> getTagValues() { return tagValues; } - /** - * Returns the tagValue corresponding to the given name, or null if the - * element has no associated tagValue for this name. - * - * @return the value of the found tagValue, or null if the element has no - * associated tagValue for this name. - */ @Override public String getTagValue(String tagValue) { return tagValue == null ? null : tagValues.get(tagValue); } + @Override + public void addTagValue(String tagValue, String value) { + String oldValue = getTagValue(tagValue); + if (StringUtils.isNotEmpty(oldValue)) { + log.warn("Replace tagValue '" + tagValue + "' (old:" + oldValue + ", new: " + value + ")"); + } + tagValues.put(tagValue,value); + } + /** * Get the extension associated to the reference (unique). Create it if not exist. * @param <O> object type returned Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-11 14:46:08 UTC (rev 948) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2010-08-11 18:26:10 UTC (rev 949) @@ -41,7 +41,7 @@ * @version $Revision$ * * Last update : $Date$ - * By : * + * * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="statemodel" */ public class StateModelImpl implements StateModel { @@ -121,22 +121,11 @@ return modelTagValues; } - /** - * Add a tag value - * - * @param key key - * @param value value - */ + @Override public void addTagValue(String key, String value) { modelTagValues.put(key, value); } - /** - * Get a tag value - * - * @return the value of the found tagValue, or null if the element has no - * associated tagValue for this name. - */ @Override public String getTagValue(String key) { return key == null ? null : modelTagValues.get(key); @@ -151,11 +140,6 @@ this.version = version; } - /** - * Get model version. - * - * @return model version - */ @Override public String getVersion() { return version;

1 0

r948 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:08 +0200 (Wed, 11 Aug 2010) New Revision: 948 Url: http://nuiton.org/repositories/revision/eugene/948 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-07 16:21:31 UTC (rev 947) +++ trunk/pom.xml 2010-08-11 14:46:08 UTC (rev 948) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>eugene</artifactId>

1 0

r947 - in trunk: eugene/src/main/java/org/nuiton/eugene/models/object maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org 07 Aug '10

07 Aug '10

Author: tchemit Date: 2010-08-07 18:21:31 +0200 (Sat, 07 Aug 2010) New Revision: 947 Url: http://nuiton.org/repositories/revision/eugene/947 Log: reformat javadoc + code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-08-07 14:13:02 UTC (rev 946) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-08-07 16:21:31 UTC (rev 947) @@ -66,9 +66,7 @@ * Created: 14 mars 2004 * * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ par : + * @version $Id$ */ public class ObjectModelGenerator extends AbstractGenerator<ObjectModel> { Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-08-07 14:13:02 UTC (rev 946) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-08-07 16:21:31 UTC (rev 947) @@ -260,7 +260,6 @@ properties.put(PROP_TEMPLATES_LIST, templatesList); } - @Override public void generate(ChainedFileWriterConfiguration configuration, File outputDir,

1 0

r946 - in trunk: eugene/src/main/java/org/nuiton/eugene/writer maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator
by tchemit＠users.nuiton.org 07 Aug '10

07 Aug '10

Author: tchemit Date: 2010-08-07 16:13:02 +0200 (Sat, 07 Aug 2010) New Revision: 946 Url: http://nuiton.org/repositories/revision/eugene/946 Log: fix javadoc formatting Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2010-08-07 14:12:40 UTC (rev 945) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2010-08-07 14:13:02 UTC (rev 946) @@ -39,10 +39,9 @@ * Created: 17 déc. 2009 * * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ par : - * * @plexus.component role="org.nuiton.eugene.writer.ChainedWriterEngine" role-hint="default" + * @version $Id$ + * + * @plexus.component role="org.nuiton.eugene.writer.ChainedWriterEngine" role-hint="default" * @since 2.0.0 */ public class DefaultChainedWriterEngine implements ChainedWriterEngine { Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2010-08-07 14:12:40 UTC (rev 945) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2010-08-07 14:13:02 UTC (rev 946) @@ -38,10 +38,8 @@ * Created: 28 oct. 2009 * * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" + * @version $Id$ + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" */ public class BeanTransformer extends ObjectModelTransformerToJava { Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2010-08-07 14:12:40 UTC (rev 945) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2010-08-07 14:13:02 UTC (rev 946) @@ -11,10 +11,8 @@ * Created: 12 nov. 2009 * * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" + * @version $Id$ + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" */ public class Megatron extends ObjectModelTransformerToJava {

1 0