Author: tchemit Date: 2008-10-23 15:42:48 +0000 (Thu, 23 Oct 2008) New Revision: 1192 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: use foreach, unecessary cast, unecessary initializer Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-21 00:55:24 UTC (rev 1191) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.Writer; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.apache.commons.logging.Log; @@ -93,7 +92,7 @@ boolean haveSuper = clazz.getSuperclasses().size() > 0; if (haveSuper) { - ObjectModelClass superClass = (ObjectModelClass)clazz.getSuperclasses().iterator().next(); + ObjectModelClass superClass = clazz.getSuperclasses().iterator().next(); String superClassname = superClass.getQualifiedName(); if (log.isDebugEnabled()) {log.debug("superClass for " + clazz.getQualifiedName() + " is " + superClassname);} /*{ <union-subclass }*/ @@ -130,10 +129,10 @@ }*/ } - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext(); ) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; ObjectModelAttribute reverse = attr.getReverseAttribute(); - + // pour les asso quoi qu'il arrive il faut les lier des 2 cotes // pour pouvoir supprimer en cascade l'asso lors de la suppression // d'un des cotes @@ -167,17 +166,17 @@ //Attributs pour les classes d'association if (clazz instanceof ObjectModelAssociationClass) { ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)clazz; - for (Iterator i = assoc.getParticipantsAttributes().iterator(); i.hasNext(); ) { - ObjectModelAttribute attr = (ObjectModelAttribute) i.next(); + for (Object o : assoc.getParticipantsAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; if (attr != null) { - + // Note(poussin) pour moi quoi qu'il arrive sur la classe d'association il faut // un many-to-one, sinon on a des problemes. // if ((!attr.getReverseAttribute().isNavigable()) || !Util.isNMultiplicity(attr.getReverseAttribute())) { // / *{ <one-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=(attr.isComposite()?" cascade=\"delete\"":"")%>/> // } */ // } else { - + /*{ <many-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>" column="<%=GeneratorUtil.getDBName(attr)%>" node="<%=getName(attr, true)%>/@topiaId" embed-xml="false"/> }*/ // } @@ -233,7 +232,7 @@ if (bracketIndex != -1) { type = typeString.substring(0, bracketIndex); int bracketEndIndex = typeString.indexOf(')', bracketIndex + 1); - String colmunList = null; + String colmunList; if (bracketEndIndex != -1) { colmunList = typeString.substring(bracketIndex + 1, bracketEndIndex); } else {