Author: chatellier Date: 2009-02-20 16:43:58 +0000 (Fri, 20 Feb 2009) New Revision: 457 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModeImplAssociationClassParticipant.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAssociationClassImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAttributeImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassifierImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelElementImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImpl.java lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImplRef.java Log: Make some corrections Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModeImplAssociationClassParticipant.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-02-20 16:43:58 UTC (rev 457) @@ -17,13 +17,10 @@ package org.codelutin.generator.models.object.xml; -import java.util.Iterator; - import org.codelutin.generator.GeneratorUtil; /** - * - * ObjectModeImplAssociationClassParticipant.java + * ObjectModeImplAssociationClassParticipant. * * @author cedric,chatellier * @version $Revision$ @@ -56,10 +53,7 @@ public String getAttributeName() { if ((attributeName == null) || ("".equals(attributeName))) { - for (Iterator i = associationClass.getParticipantsRefs().iterator(); i - .hasNext();) { - ObjectModeImplAssociationClassParticipant participant = (ObjectModeImplAssociationClassParticipant) i - .next(); + for (ObjectModeImplAssociationClassParticipant participant : associationClass.getParticipantsRefs()) { if (participant != this) { attributeName = GeneratorUtil .toLowerCaseFirstLetter(GeneratorUtil Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAssociationClassImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAssociationClassImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAssociationClassImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; @@ -44,7 +43,7 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl implements ObjectModelAssociationClass { - private static final Log log = LogFactory + private static Log log = LogFactory .getLog(ObjectModelAssociationClassImpl.class); protected List<ObjectModelAttribute> participantsAttributes = null; @@ -95,9 +94,7 @@ participantsClassifiers = new ArrayList<ObjectModelClassifier>(); participantsAttributes = new ArrayList<ObjectModelAttribute>(); - for (Iterator i = participantsRefs.iterator(); i.hasNext();) { - ObjectModeImplAssociationClassParticipant ref = (ObjectModeImplAssociationClassParticipant) i - .next(); + for (ObjectModeImplAssociationClassParticipant ref : participantsRefs) { ObjectModelClassifier classifier = objectModelImpl .getClassifier(ref.getName()); participantsClassifiers.add(classifier); @@ -108,8 +105,7 @@ if (attribute == null) { log.warn("WARNING : Attribute " + ref.getAttributeName() + " not found on " + classifier.getQualifiedName()); - log - .warn("WARNING : Assuming there is no navigability in this direction for the " + log.warn("WARNING : Assuming there is no navigability in this direction for the " + getQualifiedName() + " association class"); } } @@ -117,7 +113,7 @@ } } - public Collection getParticipantsRefs() { + public Collection<ObjectModeImplAssociationClassParticipant> getParticipantsRefs() { return participantsRefs; } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAttributeImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelAttributeImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -15,8 +15,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - - package org.codelutin.generator.models.object.xml; import org.codelutin.generator.GeneratorUtil; @@ -56,9 +54,10 @@ } public void postInit() { - if (name == null) + if (name == null) { name = GeneratorUtil.toLowerCaseFirstLetter(GeneratorUtil .getClassNameFromQualifiedName(type)); + } super.postInit(); } @@ -244,8 +243,6 @@ } /* - * (non-Javadoc) - * * @see org.codelutin.generator.models.object.ObjectModelAttribute#isNavigable() */ public boolean isNavigable() { @@ -253,8 +250,6 @@ } /* - * (non-Javadoc) - * * @see org.codelutin.generator.models.object.ObjectModelAttribute#isOrdered() */ public boolean isOrdered() { @@ -262,7 +257,7 @@ || getTagValue("order-by") != null; } - /* (non-Javadoc) + /* * @see org.codelutin.generator.models.object.ObjectModelAttribute#isIndexed() */ public boolean isIndexed() { Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -15,7 +15,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - package org.codelutin.generator.models.object.xml; import java.util.ArrayList; Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassifierImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassifierImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelClassifierImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -106,9 +106,7 @@ public Collection<ObjectModelInterface> getInterfaces() { if (interfaces == null) { interfaces = new ArrayList<ObjectModelInterface>(); - Iterator i = interfacesRefs.iterator(); - while (i.hasNext()) { - ObjectModelImplRef ref = (ObjectModelImplRef) i.next(); + for(ObjectModelImplRef ref : interfacesRefs) { interfaces.add(objectModelImpl.getInterface(ref.getName())); } } @@ -150,11 +148,9 @@ protected Collection<ObjectModelOperation> getAllInterfaceOperations( Collection<ObjectModelOperation> result) { - for (Iterator i = getInterfaces().iterator(); i.hasNext();) { - ObjectModelClassifierImpl interfacez = (ObjectModelClassifierImpl) i - .next(); + for (ObjectModelClassifier interfacez : getInterfaces()) { result.addAll(interfacez.getOperations()); - interfacez.getAllInterfaceOperations(result); + ((ObjectModelClassifierImpl)interfacez).getAllInterfaceOperations(result); } return result; } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelElementImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelElementImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelElementImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -53,7 +53,7 @@ } /** - * @return the objectModelImpl + * @param objectModelImpl the objectModelImpl */ public void setObjectModelImpl(ObjectModelImpl objectModelImpl) { this.objectModelImpl = objectModelImpl; @@ -91,15 +91,17 @@ } public ObjectModelImplRef addStereotype(ObjectModelImplRef stereotype) { - if (stereotype == null) + if (stereotype == null) { return new ObjectModelImplRef(); + } stereotypes.add(stereotype.getName()); return stereotype; } public ObjectModelImplTagValue addTagValue(ObjectModelImplTagValue tagValue) { - if (tagValue == null) + if (tagValue == null) { return new ObjectModelImplTagValue(); + } tagValues.put(tagValue.getName(), tagValue.getValue()); return tagValue; } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImpl.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImpl.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImpl.java 2009-02-20 16:43:58 UTC (rev 457) @@ -214,12 +214,13 @@ interfaces.put(interfacez.getQualifiedName(), interfacez); classifiers.put(interfacez.getQualifiedName(), interfacez); } else { - if (!(initialElement instanceof ObjectModelInterfaceImpl)) + if (!(initialElement instanceof ObjectModelInterfaceImpl)) { throw new IllegalArgumentException( "\"" + interfacez + "\" is incompatible with already defined element \"" + initialElement + "\""); + } ObjectModelInterfaceImpl initialInterfacez = (ObjectModelInterfaceImpl) initialElement; mergeClassifiers(initialInterfacez, interfacez); @@ -269,7 +270,8 @@ return comments; } - private void mergeClassifiers(ObjectModelClassifierImpl initialClazzifier, + protected void mergeClassifiers( + ObjectModelClassifierImpl initialClazzifier, ObjectModelClassifierImpl additionalClazzifier) { Iterator it; @@ -284,55 +286,63 @@ String sourceDoc = ""; if (initialClazzifier.documentation != null) { description += initialClazzifier.getDescription(); - if (initialClazzifier.documentation.contains("--")) + if (initialClazzifier.documentation.contains("--")) { sourceDoc += initialClazzifier.getSourceDocumentation(); + } } if (additionalClazzifier.documentation != null) { - if (!description.equals("")) + if (!description.equals("")) { description += " - "; + } description += additionalClazzifier.getDescription(); if (additionalClazzifier.documentation.contains("--")) { - if (!sourceDoc.equals("")) + if (!sourceDoc.equals("")) { sourceDoc += " - "; + } sourceDoc += additionalClazzifier.getSourceDocumentation(); } } - if (!description.equals("") || !sourceDoc.equals("")) + if (!description.equals("") || !sourceDoc.equals("")) { initialClazzifier.documentation = description + "--" + sourceDoc; - + } // System.out.println("Doc after : " + initialClazzifier.documentation); for (it = additionalClazzifier.interfacesRefs.iterator(); it.hasNext();) { ObjectModelImplRef interfaceRef = (ObjectModelImplRef) it.next(); - if (!contains(initialClazzifier.interfacesRefs, interfaceRef)) + if (!contains(initialClazzifier.interfacesRefs, interfaceRef)) { initialClazzifier.interfacesRefs.add(interfaceRef); + } initialClazzifier.interfaces = null; // On force ainsi à // regénérer l'objet } for (it = additionalClazzifier.getOperations().iterator(); it.hasNext();) { ObjectModelOperationImpl operation = (ObjectModelOperationImpl) it .next(); - if (!contains(initialClazzifier.getOperations(), operation)) + if (!contains(initialClazzifier.getOperations(), operation)) { initialClazzifier.operations.add(operation); + } } for (it = additionalClazzifier.getComments().iterator(); it.hasNext();) { String comment = (String) it.next(); - if (!initialClazzifier.comments.contains(comment)) + if (!initialClazzifier.comments.contains(comment)) { initialClazzifier.comments.add(comment); + } } for (it = additionalClazzifier.getStereotypes().iterator(); it .hasNext();) { String stereotype = (String) it.next(); - if (!initialClazzifier.getStereotypes().contains(stereotype)) + if (!initialClazzifier.getStereotypes().contains(stereotype)) { initialClazzifier.stereotypes.add(stereotype); + } } for (it = additionalClazzifier.getTagValues().keySet().iterator(); it .hasNext();) { String tagName = (String) it.next(); - if (!initialClazzifier.getTagValues().containsKey(tagName)) + if (!initialClazzifier.getTagValues().containsKey(tagName)) { initialClazzifier.tagValues.put(tagName, additionalClazzifier .getTagValue(tagName)); + } } } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImplRef.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImplRef.java 2009-02-20 16:27:10 UTC (rev 456) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/models/object/xml/ObjectModelImplRef.java 2009-02-20 16:43:58 UTC (rev 457) @@ -15,7 +15,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - package org.codelutin.generator.models.object.xml; /** @@ -46,11 +45,13 @@ } public boolean equals(Object o) { - if (!(o instanceof ObjectModelImplRef)) + if (!(o instanceof ObjectModelImplRef)) { return false; + } ObjectModelImplRef oRef = (ObjectModelImplRef) o; - if (name == null) + if (name == null) { return (oRef.getName() == null); + } return name.equals(oRef.getName()); }