Author: fdesbois Date: 2010-06-27 16:29:18 +0200 (Sun, 27 Jun 2010) New Revision: 2041 Url: http://nuiton.org/repositories/revision/topia/2041 Log: Evo #609 : Remove old code. Refactor is done (same generation as before). Note that some generated code is strange (for i18n block that contains keys for entity N relations... Accept and attribute needed for visitor with no navigable association on association class...) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-27 14:12:49 UTC (rev 2040) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-27 14:29:18 UTC (rev 2041) @@ -1150,101 +1150,6 @@ " " : acceptOperationBody.toString()); } - @Deprecated - protected void generateAcceptMethod(ObjectModelClass input) { - - ObjectModelOperation operation = - addOperation(outputAbstract, "accept", void.class); - - addException(operation, TopiaException.class); - addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); - setDocumentation(operation, - "Envoi via les methodes du visitor l'ensemble des " + - "champs de l'entity\n" + - "avec leur nom, type et valeur."); - - ObjectModelParameter param = - addParameter(operation, EntityVisitor.class, "visitor"); - setDocumentation(param, "le visiteur de l'entite."); - - StringBuilder body = new StringBuilder("" -/*{ - visitor.start(this); -}*/ - ); - for (ObjectModelAttribute attr : input.getAttributes()) { - 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 - if (!(attr.isNavigable() - || hasUnidirectionalRelationOnAbstractType(reverse, model) - || attr.hasAssociationClass())) { - continue; - } - - if (!attr.hasAssociationClass()) { - String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); - String attrName = attr.getName(); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getSimpleName( - TopiaGeneratorUtil.getNMultiplicityInterfaceType( - attr)); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } else { - String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attr.getAssociationClass().getQualifiedName()); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } - } - } - - //Déclaration des attributs d'une classe d'associations - if (input instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) input; - for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { - if (attr != null) { - String attrType = TopiaGeneratorUtil.getSimpleName( - attr.getType()); - String attrName = attr.getName(); - attrName = GeneratorUtil.toLowerCaseFirstLetter(attrName); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } - } - body.append("" -/*{ visitor.end(this); -}*/ - ); - - setOperationBody(operation, body.length() == 0 ? " " : body.toString()); - } - protected void generateToStringOperation(ObjectModelClass input) { if (log.isDebugEnabled()) { @@ -1483,34 +1388,6 @@ buffer.append("\");"); } - /** - * Generate entity methods which have not a public visibility. In this case, they will not be - * generated in the EntityInterface, so they will be generated here, in the EntityAbstract - * with abstract modifier to keep consistency with the model. - * @param output ObjectModelClass result corresponding to the EntityAbstract - * @param input ObjectModelClass source from ObjectModel - */ - @Deprecated - private void generateAbstractMethods(ObjectModelClass output, - ObjectModelClass input) { - for (ObjectModelOperation op : input.getOperations()) { - if (log.isDebugEnabled()) { - log.debug("clazz : " + input.getQualifiedName() + - " - method : " + op.getName() + - " - visibility : " + op.getVisibility()); - } - String visibility = op.getVisibility(); - ObjectModelModifier visibilityModifier = ObjectModelModifier.toValue(visibility); - if (!visibilityModifier.equals(ObjectModelModifier.PUBLIC)) { - addOperation(output, - op.getName(), - op.getReturnType(), - visibilityModifier, - ObjectModelModifier.ABSTRACT); - } - } - } - // ------------------------------------------------------------------------- // Helpers // -------------------------------------------------------------------------