Author: tchemit Date: 2010-05-13 19:18:23 +0200 (Thu, 13 May 2010) New Revision: 1960 Url: http://nuiton.org/repositories/revision/topia/1960 Log: use prefix constant api in transformers clean api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; @@ -165,6 +166,18 @@ ); for (ObjectModelClass clazz : classes) { + String prefix = getConstantPrefix(clazz, ""); + + if (StringUtils.isEmpty(prefix)) { + + // no specific prefix, so no prefix + if (log.isWarnEnabled()) { + log.warn("[" + clazz.getName() + "] Will generate constants with NO prefix, not a good idea..."); + } + } + + setConstantPrefix(prefix); + generateBinder(modelName, clazz, resultClass, initCode); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -107,6 +107,18 @@ addInterface(result, TopiaDAO.class.getName() + "<E>"); + String prefix = getConstantPrefix(clazz, ""); + + if (StringUtils.isEmpty(prefix)) { + + // no specific prefix, so no prefix + if (log.isWarnEnabled()) { + log.warn("[" + clazz.getName() + "] Will generate constants with NO prefix, not a good idea..."); + } + } + + setConstantPrefix(prefix); + // imports Collection<ObjectModelOperation> DAOoperations = getDAOOperations(clazz); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -40,7 +40,6 @@ import org.nuiton.topia.persistence.TopiaEntityAbstract; import java.beans.Introspector; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -89,9 +88,19 @@ addImport(result, ToStringBuilder.class); addImport(result, TopiaEntity.class); addImport(result, TopiaContextImplementor.class); - //TC-20100413 : TopiaEntity is already Serializable -// addImport(result, Serializable.class); + + String prefix = getConstantPrefix(clazz, ""); + if (StringUtils.isEmpty(prefix)) { + + // no specific prefix, so no prefix + if (log.isWarnEnabled()) { + log.warn("[" + clazz.getName() + "] Will generate constants with NO prefix, not a good idea..."); + } + } + + setConstantPrefix(prefix); + // javadoc StringBuilder doc = new StringBuilder(); @@ -166,7 +175,7 @@ type = attr.getType(); // type = TopiaGeneratorUtil.getSimpleName(attr.getType()); } else { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); //TODO THIMEL : Je pense que les // GeneratorUtil.toLowerCaseFirstLetter sont inutiles // ici, ou alors il faudrait le faire partout @@ -209,12 +218,10 @@ if (attr.hasTagValue(TAG_ANNOTATION)) { - String annotation = - attr.getTagValue(TAG_ANNOTATION); + String annotation = attr.getTagValue(TAG_ANNOTATION); //FIXME Make annotation works... - //TODO Use the addAnnotation method... -///* <%=annotation%> -//*/ + //TODO tchemit 20100513 Test it still works + addAnnotation(result, attr2, annotation); } } @@ -308,7 +315,7 @@ if (!GeneratorUtil.isNMultiplicity(attr)) { if (attr.hasAssociationClass()) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); addImport(result, assocClassFQN); assocClassFQN = TopiaGeneratorUtil.getSimpleName(assocClassFQN); @@ -575,7 +582,7 @@ } else { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); // String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); @@ -780,7 +787,7 @@ ); } else { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); // String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); @@ -894,12 +901,11 @@ if (model.hasClass(attr.getType())) { attrEntity = model.getClass(attr.getType()); } - boolean isEntity = (attrEntity != null && - attrEntity.hasStereotype( - STEREOTYPE_ENTITY)); + boolean isEntity = attrEntity != null && + attrEntity.hasStereotype(STEREOTYPE_ENTITY); ObjectModelAttribute reverse = attr.getReverseAttribute(); - if ((isEntity && (reverse == null || !reverse.isNavigable()) - && !attr.hasAssociationClass()) || (!isEntity)) { + if (isEntity && (reverse == null || !reverse.isNavigable()) + && !attr.hasAssociationClass() || !isEntity) { String attrName = attr.getName(); body.append("" /*{ append(<%=getConstantName(attrName)%>, this.<%=attrName%>). @@ -954,7 +960,7 @@ ); } } else if (attr.hasAssociationClass()) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName( + String assocAttrName = GeneratorUtil.getAssocAttrName( attr); String assocClassFQN = TopiaGeneratorUtil.getSimpleName( attr.getAssociationClass().getQualifiedName()); @@ -1123,7 +1129,7 @@ ); } } else { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); String assocClassFQN = TopiaGeneratorUtil.getSimpleName( attr.getAssociationClass().getQualifiedName()); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -256,7 +256,7 @@ protected String getName(ObjectModelAttribute attr, boolean isAssoc) { String result = GeneratorUtil.toLowerCaseFirstLetter(attr.getName()); if (attr.hasAssociationClass() && !isAssoc) { - result = TopiaGeneratorUtil.getAssocAttrName(attr); + result = GeneratorUtil.getAssocAttrName(attr); } return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -78,6 +78,18 @@ setDocumentation(result,clazz.getDocumentation()); } + String prefix = getConstantPrefix(clazz, ""); + + if (StringUtils.isEmpty(prefix)) { + + // no specific prefix, so no prefix + if (log.isWarnEnabled()) { + log.warn("[" + clazz.getName() + "] Will generate constants with NO prefix, not a good idea..."); + } + } + + setConstantPrefix(prefix); + generateSearchFields(result, clazz); // super classes @@ -295,7 +307,7 @@ protected void addAssociationAttribute(ObjectModelInterface result, ObjectModelAttribute attr) { String attrName = attr.getName(); String attrType = attr.getType(); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); String assocClassName = attr.getAssociationClass().getName(); @@ -464,18 +476,25 @@ setDocumentation(op, "Retourne la valeur de l'attribut " + attrName + "."); } - private static final String doubleQuote = "\""; - private static final String comma = ","; +// private static final String doubleQuote = "\""; + private static final String comma = ", "; - private String getStringRepresentation(List<String> strings) { + private String getStringRepresentation(ObjectModelInterface output,List<String> strings) { StringBuilder result = new StringBuilder(); Iterator<String> it = strings.iterator(); if (it.hasNext()) { - result.append(doubleQuote).append(it.next()).append(doubleQuote); + result.append(output.getName()); + result.append('.'); + result.append(getConstantName(it.next())); +// result.append(doubleQuote).append(it.next()).append(doubleQuote); } while (it.hasNext()) { - result.append(comma).append(doubleQuote).append(it.next()).append(doubleQuote); + result.append(comma); + result.append(output.getName()); + result.append('.'); + result.append(getConstantName(it.next())); +// result.append(comma).append(doubleQuote).append(it.next()).append(doubleQuote); } return result.toString(); } @@ -516,7 +535,7 @@ StringBuilder buffer = new StringBuilder(); if (!txtFields.isEmpty()) { buffer.append("\n txtFields={"); - buffer.append(getStringRepresentation(txtFields)); + buffer.append(getStringRepresentation(result,txtFields)); buffer.append("}"); if (!numFields.isEmpty() || !boolFields.isEmpty() || !dateFields.isEmpty()) { @@ -525,7 +544,7 @@ } if (!numFields.isEmpty()) { buffer.append("\n numFields={"); - buffer.append(getStringRepresentation(numFields)); + buffer.append(getStringRepresentation(result,numFields)); buffer.append("}"); if (!boolFields.isEmpty() || !dateFields.isEmpty()) { buffer.append(","); @@ -533,7 +552,7 @@ } if (!boolFields.isEmpty()) { buffer.append("\n boolFields={"); - buffer.append(getStringRepresentation(boolFields)); + buffer.append(getStringRepresentation(result,boolFields)); buffer.append("}"); if (!dateFields.isEmpty()) { buffer.append(","); @@ -541,7 +560,7 @@ } if (!dateFields.isEmpty()) { buffer.append("\n dateFields={"); - buffer.append(getStringRepresentation(dateFields)); + buffer.append(getStringRepresentation(result,dateFields)); buffer.append("}"); } annotationCode.append("" @@ -569,7 +588,7 @@ if (!attr.hasAssociationClass()) { attrName = attr.getName(); } else { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); } String attrColName = getConstantName(attrName); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-05-13 17:16:53 UTC (rev 1959) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-05-13 17:18:23 UTC (rev 1960) @@ -435,7 +435,7 @@ return false; } value = clazz.getTagValue(TAG_NOT_GENERATE_TO_STRING); - return (value == null || value.trim().isEmpty()); + return value == null || value.trim().isEmpty(); } /** @@ -548,7 +548,7 @@ public static String getPrimaryKeyAttributesListDeclaration( ObjectModelClass clazz, boolean includeName) { String attributes = ""; - final Collection<ObjectModelAttribute> attributeCollection; + Collection<ObjectModelAttribute> attributeCollection; attributeCollection = getElementsWithStereotype(clazz.getAttributes(), STEREOTYPE_PRIMARYKAY); for (ObjectModelAttribute attr : attributeCollection) { @@ -569,9 +569,9 @@ // } public static boolean isAssociationClassDoublon(ObjectModelAttribute attr) { - return (attr.getReverseAttribute() != null) && - (attr.getDeclaringElement().equals( - attr.getReverseAttribute().getDeclaringElement())) && + return attr.getReverseAttribute() != null && + attr.getDeclaringElement().equals( + attr.getReverseAttribute().getDeclaringElement()) && (!GeneratorUtil.isFirstAttribute(attr)); } @@ -766,7 +766,7 @@ String result; if (attr.hasAssociationClass()) { - result = TopiaGeneratorUtil.getDBName(attr.getAssociationClass()); + result = getDBName(attr.getAssociationClass()); } else { String name = attr.getName(); String revers = attr.getReverseAttributeName();