[Topia-commits] r2673 - in branches/topia-2.6.x: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia/generator

Author: tchemit Date: 2012-10-24 21:45:07 +0200 (Wed, 24 Oct 2012) New Revision: 2673 Url: http://nuiton.org/repositories/revision/topia/2673 Log: fixes #2373: Use ObjectModelJavaModifier instead of ObjectModelModifier refs #2374: Updates to eugene 2.6 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/pom.xml 2012-10-24 19:45:07 UTC (rev 2673) @@ -59,7 +59,7 @@ <projectId>topia</projectId> <!-- libs version --> - <eugeneVersion>2.5</eugeneVersion> + <eugeneVersion>2.6-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> <processorPluginVersion>1.2.2</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> @@ -84,6 +84,13 @@ </dependency> <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-java-templates</artifactId> + <version>${eugeneVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-10-24 19:45:07 UTC (rev 2673) @@ -64,6 +64,11 @@ </dependency> <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-java-templates</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -93,8 +93,8 @@ op = addOperation(resultClass, "getTopiaBinder", "<E extends TopiaEntity> TopiaEntityBinder<E>", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "Class<E>", "entityClass"); addParameter(op, "String", "contextName"); setOperationBody(op, "" @@ -106,8 +106,8 @@ op = addOperation(resultClass, "getSimpleTopiaBinder", "<E extends TopiaEntity> TopiaEntityBinder<E>", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "Class<E>", "entityClass"); setOperationBody(op, "" /*{ @@ -118,8 +118,8 @@ op = addOperation(resultClass, "registerTopiaBinder", "void", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "BinderModelBuilder", "builder"); addParameter(op, "String", "contextName"); setOperationBody(op, "" @@ -131,8 +131,8 @@ op = addOperation(resultClass, "registerTopiaBinder", "<E extends TopiaEntity> TopiaEntityBinder<E>", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "Class<E>", "entityClass"); addParameter(op, "BinderModelBuilder", "builder"); addParameter(op, "String", "contextName"); @@ -146,8 +146,8 @@ op = addOperation(resultClass, "copy", "<E extends TopiaEntity> void", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "String", "contextName"); addParameter(op, "E", "source"); addParameter(op, "E", "target"); @@ -166,8 +166,8 @@ op = addOperation(resultClass, "simpleCopy", "<E extends TopiaEntity> void", - ObjectModelModifier.PUBLIC, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, + ObjectModelJavaModifier.STATIC); addParameter(op, "E", "source"); addParameter(op, "E", "target"); addParameter(op, "boolean", "tech"); @@ -202,10 +202,10 @@ } - op = addOperation(resultClass, "initBinders", "void", ObjectModelModifier.PROTECTED, ObjectModelModifier.STATIC); + op = addOperation(resultClass, "initBinders", "void", ObjectModelJavaModifier.PROTECTED, ObjectModelJavaModifier.STATIC); setOperationBody(op, initCode.toString()); - op = addOperation(resultClass, null, (String) null, ObjectModelModifier.STATIC); + op = addOperation(resultClass, null, (String) null, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ initBinders(); Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -37,6 +37,7 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -244,7 +245,7 @@ op = addOperation(result, "getEntityClass", "Class<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return (Class<E>)<%=clazzName%>.class; @@ -291,7 +292,7 @@ op = addOperation(result, "getRequestPermission", "List<Permission>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setDocumentation(op, "Retourne les permissions a verifier pour " + "l'acces a l'entite pour le service Taas"); addException(op, TopiaException.class); @@ -347,7 +348,7 @@ op = addOperation(result, "getRequestPermission", "List<Permission>", - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addParameter(op, String.class, "topiaId"); addParameter(op, int.class, "actions"); addParameter(op, String.class, "query"); @@ -382,7 +383,7 @@ protected void generateDelete(ObjectModelClass clazz, ObjectModelClass result) { ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, "E", "entity"); StringBuilder body = new StringBuilder(); @@ -532,7 +533,7 @@ operation = addOperation(result, "findUsages", "<U extends TopiaEntity> List<U>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "Class<U>", "type"); addParameter(operation, "E", "entity"); @@ -547,7 +548,7 @@ operation = addOperation(result, "findAllUsages", "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); addException(operation, TopiaException.class); @@ -575,7 +576,7 @@ operation = addOperation(result, "findUsages", "<U extends TopiaEntity> List<U>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "Class<U>", "type"); addParameter(operation, "E", "entity"); @@ -659,7 +660,7 @@ operation = addOperation(result, "findAllUsages", "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); addException(operation, TopiaException.class); @@ -716,8 +717,8 @@ op2 = addOperation(result, op.getName(), op.getReturnType(), - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.toValue(op.getVisibility())); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.fromVisibility(op.getVisibility())); setDocumentation(op2, op.getDocumentation()); // parameters @@ -802,7 +803,7 @@ op = addOperation(result, "findBy" + StringUtils.capitalize(attrName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setDocumentation(op, "Retourne le premier élément trouvé ayant comme valeur pour l'attribut " + attrName + " le paramètre."); @@ -816,7 +817,7 @@ op = addOperation(result, "findAllBy" + StringUtils.capitalize(attrName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setDocumentation(op, "Retourne les éléments ayant comme valeur pour " + @@ -834,7 +835,7 @@ op = addOperation(result, "findBy" + StringUtils.capitalize(assocClassName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); setDocumentation(op, "Retourne le premier élément trouvé ayant " + @@ -851,7 +852,7 @@ op = addOperation(result, "findAllBy" + StringUtils.capitalize(assocClassName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); setDocumentation(op, "Retourne les éléments ayant comme valeur pour" + @@ -879,7 +880,7 @@ op = addOperation(result, "findContains" + StringUtils.capitalize(attrName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setDocumentation(op, "Retourne le premier élément ayant comme valeur pour" + @@ -896,7 +897,7 @@ op = addOperation(result, "findAllContains" + StringUtils.capitalize(attrName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setDocumentation(op, "Retourne les éléments ayant comme valeur pour" + @@ -972,15 +973,15 @@ log.debug("generateNaturalId for " + props); } ObjectModelOperation findByNaturalId = addOperation(result, - "findByNaturalId", "E", ObjectModelModifier.PUBLIC); + "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); addException(findByNaturalId, TopiaException.class); ObjectModelOperation existByNaturalId = addOperation(result, - "existByNaturalId", "boolean", ObjectModelModifier.PUBLIC); + "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); addException(existByNaturalId, TopiaException.class); ObjectModelOperation create = addOperation(result, - "create", "E", ObjectModelModifier.PUBLIC); + "create", "E", ObjectModelJavaModifier.PUBLIC); addException(create, TopiaException.class); // used for calling findByProperties in findByNaturalId Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -156,13 +156,13 @@ // add non public constructor ObjectModelOperation constructor = - addConstructor(daoHelper, ObjectModelModifier.PROTECTED); + addConstructor(daoHelper, ObjectModelJavaModifier.PROTECTED); setOperationBody(constructor," "); ObjectModelOperation op; // getModelVersion method - op = addOperation(daoHelper, "getModelVersion", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getModelVersion", "String", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ return "<%=modelVersion%>"; @@ -170,7 +170,7 @@ ); // getModelName method - op = addOperation(daoHelper, "getModelName", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getModelName", "String", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ return "<%=modelName%>"; @@ -183,7 +183,7 @@ String daoClazzName = clazzName + "DAO"; // specialized getXXXDao method - op = addOperation(daoHelper, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addImport(daoHelper, clazz); addException(op, TopiaException.class); @@ -198,7 +198,7 @@ } // generic getDao method - op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "Class<T>", "klass"); addException(op, TopiaException.class); @@ -211,7 +211,7 @@ }*/ ); - op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "T", "entity"); addException(op, TopiaException.class); @@ -225,7 +225,7 @@ ); // getContractClass method - op = addOperation(daoHelper, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" /*{ @@ -235,7 +235,7 @@ ); // getImplementationClass method - op = addOperation(daoHelper, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" /*{ @@ -245,7 +245,7 @@ ); // getContractClasses method - op = addOperation(daoHelper, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); @@ -258,7 +258,7 @@ ); // getImplementationClasses method - op = addOperation(daoHelper, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); @@ -271,7 +271,7 @@ ); // getImplementationClassesAsString method - op = addOperation(daoHelper, "getImplementationClassesAsString", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClassesAsString", "String", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ StringBuilder buffer = new StringBuilder(); @@ -283,7 +283,7 @@ ); // getContracts method - op = addOperation(daoHelper, "getContracts", entityEnumName+"[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContracts", entityEnumName+"[]", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, "" /*{ return <%=entityEnumName%>.values(); @@ -292,7 +292,7 @@ if (generateOperator) { // getOperator method - op = addOperation(daoHelper, "getOperator", "<T extends TopiaEntity> EntityOperator<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getOperator", "<T extends TopiaEntity> EntityOperator<T>", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op,"Class<T>","klass"); setOperationBody(op, "" /*{ @@ -368,7 +368,7 @@ attr.setDocumentation("The array of not null properties of the entity."); // constructor - op = addConstructor(entityEnum, ObjectModelModifier.PACKAGE); + op = addConstructor(entityEnum, ObjectModelJavaModifier.PACKAGE); addParameter(op,"Class<? extends TopiaEntity >","contract"); addParameter(op,"String[]","notNulls"); addParameter(op,"String...","naturalIds"); @@ -382,7 +382,7 @@ ); // getContract method - op = addOperation(entityEnum, "getContract", "Class<? extends TopiaEntity>", ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getContract", "Class<? extends TopiaEntity>", ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -391,7 +391,7 @@ ); // getNaturalIds method - op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -400,7 +400,7 @@ ); // isUseNaturalIds method - op = addOperation(entityEnum, "isUseNaturalIds", "boolean", ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "isUseNaturalIds", "boolean", ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -409,7 +409,7 @@ ); // getNotNulls method - op = addOperation(entityEnum, "getNotNulls", "String[]", ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getNotNulls", "String[]", ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -418,7 +418,7 @@ ); // isUseNotNulls method - op = addOperation(entityEnum, "isUseNotNulls", "boolean", ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "isUseNotNulls", "boolean", ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -427,7 +427,7 @@ ); // getImplementationFQN method - op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -436,7 +436,7 @@ ); // setImplementationFQN method - op = addOperation(entityEnum, "setImplementationFQN","void",ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "setImplementationFQN","void",ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); addParameter(op,"String","implementationFQN"); if (generateOperator) { @@ -458,7 +458,7 @@ } // accept method - op = addOperation(entityEnum, "accept","boolean",ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "accept","boolean",ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); addParameter(op,"Class<? extends TopiaEntity>","klass"); setOperationBody(op, "" @@ -468,7 +468,7 @@ ); // getImplementation method - op = addOperation(entityEnum, "getImplementation","Class<? extends TopiaEntity>",ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getImplementation","Class<? extends TopiaEntity>",ObjectModelJavaModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -484,7 +484,7 @@ ); // valueOf method - op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); + op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelJavaModifier.PUBLIC,ObjectModelJavaModifier.STATIC); addParameter(op,"TopiaEntity","entity"); setOperationBody(op, "" /*{ @@ -493,7 +493,7 @@ ); // valueOf method - op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); + op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelJavaModifier.PUBLIC,ObjectModelJavaModifier.STATIC); addParameter(op,"Class<?>","klass"); setOperationBody(op, "" /*{ Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -99,10 +99,10 @@ String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", clazz, model); if (StringUtils.isNotEmpty(svUID)) { - addAttribute(result, "serialVersionUID", long.class, svUID, ObjectModelModifier.FINAL, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + addAttribute(result, "serialVersionUID", long.class, svUID, ObjectModelJavaModifier.FINAL, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); } - addAttribute(result, "p", PropertyChangeSupport.class, null, ObjectModelModifier.PROTECTED); + addAttribute(result, "p", PropertyChangeSupport.class, null, ObjectModelJavaModifier.PROTECTED); /* * Définition des attributs @@ -168,7 +168,7 @@ } } - attr2 = addAttribute(result, attributeName, attributeType, null, ObjectModelModifier.PROTECTED); + attr2 = addAttribute(result, attributeName, attributeType, null, ObjectModelJavaModifier.PROTECTED); if (attr2 != null) { if (TopiaGeneratorUtil.hasDocumentation(attr)) { @@ -201,7 +201,7 @@ protected void addOperations(ObjectModelClass result, ObjectModelClass clazz) { ObjectModelOperation op; - op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ @@ -209,7 +209,7 @@ }*/ ); - op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "addPropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, String.class, "propertyName"); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" @@ -218,7 +218,7 @@ }*/ ); - op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" /*{ @@ -226,7 +226,7 @@ }*/ ); - op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "removePropertyChangeListener", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, String.class, "propertyName"); addParameter(op, PropertyChangeListener.class, "listener"); setOperationBody(op, "" @@ -255,7 +255,7 @@ if (!GeneratorUtil.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { - op = addOperation(result, "set" + StringUtils.capitalize(attrName), "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "set" + StringUtils.capitalize(attrName), "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, attrTypeDTO, "value"); setOperationBody(op, "" /*{ @@ -265,7 +265,7 @@ }*/ ); - op = addOperation(result, "get" + StringUtils.capitalize(attrName), attrTypeDTO, ObjectModelModifier.PUBLIC); + op = addOperation(result, "get" + StringUtils.capitalize(attrName), attrTypeDTO, ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=attrName%>; @@ -278,7 +278,7 @@ if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } - op = addOperation(result, "set" + StringUtils.capitalize(assocAttrName), "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "set" + StringUtils.capitalize(assocAttrName), "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, assocClassFQN + "DTO", "association"); setOperationBody(op, "" /*{ @@ -288,7 +288,7 @@ }*/ ); - op = addOperation(result, "get" + StringUtils.capitalize(assocAttrName), assocClassFQN + "DTO", ObjectModelModifier.PUBLIC); + op = addOperation(result, "get" + StringUtils.capitalize(assocAttrName), assocClassFQN + "DTO", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; @@ -304,7 +304,7 @@ } else { nMultType = Collection.class.getName() + "<" + attrTypeDTO + ">"; } - op = addOperation(result, "set" + StringUtils.capitalize(attrName), "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "set" + StringUtils.capitalize(attrName), "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, nMultType, "values"); setOperationBody(op, "" /*{ @@ -314,7 +314,7 @@ }*/ ); - op = addOperation(result, "addChild" + StringUtils.capitalize(attrName), attrTypeDTO, ObjectModelModifier.PUBLIC); + op = addOperation(result, "addChild" + StringUtils.capitalize(attrName), attrTypeDTO, ObjectModelJavaModifier.PUBLIC); addParameter(op, attrTypeDTO, attrName); StringBuilder buffercode = new StringBuilder(); @@ -413,7 +413,7 @@ } } - op = addOperation(result, "toString", String.class, ObjectModelModifier.PUBLIC); + op = addOperation(result, "toString", String.class, ObjectModelJavaModifier.PUBLIC); StringBuilder buffer = new StringBuilder(); buffer.append("" Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -40,6 +40,7 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.TopiaException; @@ -396,7 +397,7 @@ op = addOperation(daoAbstractClass, "getEntityClass", "Class<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addAnnotation(daoAbstractClass, op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -409,7 +410,7 @@ op = addOperation(daoAbstractClass, "getTopiaEntityEnum", entityEnumName, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addAnnotation(daoAbstractClass, op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ @@ -458,7 +459,7 @@ op = addOperation(daoAbstractClass, "getRequestPermission", "List<Permission>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); // setDocumentation(op, "Retourne les permissions a verifier pour " + // "l'acces a l'entite pour le service Taas"); addException(op, TopiaException.class); @@ -514,7 +515,7 @@ op = addOperation(daoAbstractClass, "getRequestPermission", "List<Permission>", - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addParameter(op, String.class, "topiaId"); addParameter(op, int.class, "actions"); addParameter(op, String.class, "query"); @@ -681,7 +682,7 @@ if (body.length()>0) { // something specific was done, need to generate the method ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); addAnnotation(result, op,Override.class.getSimpleName()); addException(op, TopiaException.class); addParameter(op, "E", "entity"); @@ -714,7 +715,7 @@ operation = addOperation(result, "findUsages", "<U extends TopiaEntity> List<U>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "Class<U>", "type"); addParameter(operation, "E", "entity"); @@ -729,7 +730,7 @@ operation = addOperation(result, "findAllUsages", "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); addException(operation, TopiaException.class); @@ -757,7 +758,7 @@ operation = addOperation(result, "findUsages", "<U extends TopiaEntity> List<U>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "Class<U>", "type"); addParameter(operation, "E", "entity"); @@ -840,7 +841,7 @@ operation = addOperation(result, "findAllUsages", "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); addException(operation, TopiaException.class); @@ -902,8 +903,8 @@ cloneOperation(op, result, true, - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.toValue(op.getVisibility()) + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.fromVisibility(op.getVisibility()) ); } } @@ -984,7 +985,7 @@ op = addOperation(result, getJavaBeanMethodName("findBy", attrName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setOperationBody(op, "" @@ -997,7 +998,7 @@ op = addOperation(result, getJavaBeanMethodName("findAllBy", attrName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setOperationBody(op, "" @@ -1015,7 +1016,7 @@ op = addOperation(result, getJavaBeanMethodName("findBy", assocClassName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); setOperationBody(op, "" @@ -1028,7 +1029,7 @@ op = addOperation(result, getJavaBeanMethodName("findAllBy", assocClassName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, assocClassFQN, "value"); setOperationBody(op, "" @@ -1054,7 +1055,7 @@ op = addOperation(result, getJavaBeanMethodName("findContains", attrName), "E", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setOperationBody(op, "" @@ -1067,7 +1068,7 @@ op = addOperation(result, getJavaBeanMethodName("findAllContains", attrName), "List<E>", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, attrType, "v"); setOperationBody(op, "" @@ -1124,16 +1125,16 @@ log.debug("generateNaturalId for " + props); } ObjectModelOperation findByNaturalId = addOperation(result, - "findByNaturalId", "E", ObjectModelModifier.PUBLIC); + "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); addException(findByNaturalId, TopiaException.class); ObjectModelOperation existByNaturalId = addOperation(result, - "existByNaturalId", "boolean", ObjectModelModifier.PUBLIC); + "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); addException(existByNaturalId, TopiaException.class); // TODO sletellier 20120406 : remove method on 3.0 ObjectModelOperation create = addOperation(result, - "create", "E", ObjectModelModifier.PUBLIC); + "create", "E", ObjectModelJavaModifier.PUBLIC); // sletellier : mark as Deprecated (http://nuiton.org/issues/2051) setDocumentation(create, "@deprecated since 2.6.10, prefer use {@link #createByNaturalId}\n"); @@ -1141,7 +1142,7 @@ addException(create, TopiaException.class); ObjectModelOperation createByNaturalId = addOperation(result, - "createByNaturalId", "E", ObjectModelModifier.PUBLIC); + "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); addException(createByNaturalId, TopiaException.class); @@ -1205,7 +1206,7 @@ } ObjectModelOperation createByNotNull = addOperation(result, - "createByNotNull", "E", ObjectModelModifier.PUBLIC); + "createByNotNull", "E", ObjectModelJavaModifier.PUBLIC); addException(createByNotNull, TopiaException.class); Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -33,6 +33,7 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; @@ -98,7 +99,7 @@ String svUID = TopiaGeneratorUtil.findTagValue("dto-serialVersionUID", clazz, model); if (svUID != null) { - addAttribute(result, "serialVersionUID", "long", svUID, ObjectModelModifier.FINAL, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + addAttribute(result, "serialVersionUID", "long", svUID, ObjectModelJavaModifier.FINAL, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); } boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); @@ -120,7 +121,7 @@ } String attrVisibility = attr.getVisibility(); - ObjectModelModifier modifier = ObjectModelModifier.toValue(attrVisibility); + ObjectModelModifier modifier = ObjectModelJavaModifier.fromVisibility(attrVisibility); if (!attr.hasAssociationClass()) { String attrType = attr.getType(); String attrName = attr.getName(); @@ -159,7 +160,7 @@ for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { if (attr != null) { String attrVisibility = attr.getVisibility(); - ObjectModelModifier modifier = ObjectModelModifier.toValue(attrVisibility); + ObjectModelModifier modifier = ObjectModelJavaModifier.fromVisibility(attrVisibility); String attrType = attr.getType(); String attrName = attr.getName(); if (isEntity(attrType)) { @@ -170,7 +171,7 @@ } } - addAttribute(result,"p", PropertyChangeSupport.class,"new PropertyChangeSupport(this)",ObjectModelModifier.PROTECTED,ObjectModelModifier.FINAL); + addAttribute(result,"p", PropertyChangeSupport.class,"new PropertyChangeSupport(this)",ObjectModelJavaModifier.PROTECTED,ObjectModelJavaModifier.FINAL); } protected void addOperations(ObjectModelClass result,ObjectModelClass clazz) { @@ -178,7 +179,7 @@ boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); ObjectModelOperation op; if (generateDTOId) { - op = addOperation(result, "setTopiaId", "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, "setTopiaId", "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, "String", "topiaId"); setOperationBody(op, "" /*{ @@ -186,7 +187,7 @@ }*/ ); - op = addOperation(result, "getTopiaId", "String", ObjectModelModifier.PUBLIC); + op = addOperation(result, "getTopiaId", "String", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return topiaId; @@ -246,7 +247,7 @@ String setterName = getJavaBeanMethodName("set", attrName); String getterName = getJavaBeanMethodName("get", attrName); if (!GeneratorUtil.isNMultiplicity(attr)) { - op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, attrType, "value"); setOperationBody(op, "" /*{ @@ -256,7 +257,7 @@ }*/ ); - op = addOperation(result, getterName, attrType, ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, attrType, ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=attrName%>; @@ -265,7 +266,7 @@ } else { - op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, attrType+"[]", "values"); setOperationBody(op, "" /*{ @@ -275,7 +276,7 @@ }*/ ); - op = addOperation(result, getterName, attrType+"[]", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, attrType+"[]", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=attrName%>; @@ -289,7 +290,7 @@ String setterName = getJavaBeanMethodName("set", assocAttrName); String getterName = getJavaBeanMethodName("get", assocAttrName); if (!GeneratorUtil.isNMultiplicity(attr)) { - op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, assocClassFQN + "DTO", "association"); setOperationBody(op, "" /*{ @@ -299,7 +300,7 @@ }*/ ); - op = addOperation(result, getterName, assocClassFQN + "DTO", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, assocClassFQN + "DTO", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=propertyName%>; @@ -307,7 +308,7 @@ ); } else { - op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelJavaModifier.PUBLIC); addParameter(op, assocClassFQN + "DTO[]", "values"); setOperationBody(op, "" /*{ @@ -317,7 +318,7 @@ }*/ ); - op = addOperation(result, getterName, assocClassFQN + "DTO[]", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, assocClassFQN + "DTO[]", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" /*{ return this.<%=propertyName%>; @@ -327,7 +328,7 @@ } } - op = addOperation(result,"toString",String.class, ObjectModelModifier.PUBLIC); + op = addOperation(result,"toString",String.class, ObjectModelJavaModifier.PUBLIC); StringBuilder buffer = new StringBuilder(); buffer.append("" Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -35,6 +35,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -225,7 +226,7 @@ svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; } addConstant(ouput, TopiaGeneratorUtil.SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); + ObjectModelJavaModifier.PRIVATE); } protected void createEntityInterface(ObjectModelClass input) { @@ -337,7 +338,7 @@ addImport(outputAbstract, TopiaContextImplementor.class); ObjectModelOperation op = addOperation(outputAbstract, "update", "void", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); // setDocumentation(op,"@since 2.5.3"); addAnnotation(outputAbstract, op, Override.class.getSimpleName()); @@ -347,7 +348,7 @@ }*/ ); - op = addOperation(outputAbstract, "delete", "void", ObjectModelModifier.PUBLIC); + op = addOperation(outputAbstract, "delete", "void", ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); // setDocumentation(op,"@since 2.5.3"); addAnnotation(outputAbstract, op, Override.class.getSimpleName()); @@ -441,7 +442,7 @@ String opName = operation.getName(); String opType = operation.getReturnType(); ObjectModelModifier visibility = - ObjectModelModifier.toValue(operation.getVisibility()); + ObjectModelJavaModifier.fromVisibility(operation.getVisibility()); if (log.isDebugEnabled()) { log.debug("Extra operation for : " + input.getQualifiedName() + @@ -457,9 +458,9 @@ // Generate entity methods which have not a public visibility. // Only in abstract entity class as abstract operation. - } else if (!visibility.equals(ObjectModelModifier.PUBLIC)) { + } else if (!visibility.equals(ObjectModelJavaModifier.PUBLIC)) { addOperation(outputAbstract, opName, opType, visibility, - ObjectModelModifier.ABSTRACT); + ObjectModelJavaModifier.ABSTRACT); // Other operations, only in entity interface, implementations // need to be done in implementation class created by developper @@ -546,8 +547,8 @@ // Declaration ObjectModelAttribute property = addAttribute(outputAbstract, attrName, attrType, null, - //ObjectModelModifier.toValue(attrVisibility), - ObjectModelModifier.PROTECTED + //ObjectModelJavaModifier.toValue(attrVisibility), + ObjectModelJavaModifier.PROTECTED ); // Documentation @@ -736,7 +737,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName(operationPrefix, attrName), - attrType, ObjectModelModifier.PACKAGE); + attrType, ObjectModelJavaModifier.PACKAGE); // Implementation ObjectModelOperation implOperation = @@ -771,7 +772,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("add", attrName), - void.class, ObjectModelModifier.PACKAGE); + void.class, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = addParameter(interfaceOperation, attrType, attrName); @@ -839,7 +840,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("addAll", attrName), - void.class, ObjectModelModifier.PACKAGE); + void.class, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = addParameter(interfaceOperation, collectionInterface + "<" + attrType + ">", attrName); @@ -912,7 +913,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("remove" , attrName), - void.class, ObjectModelModifier.PACKAGE); + void.class, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = addParameter(interfaceOperation, attrType, attrName); @@ -976,7 +977,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("clear" , attrName), - void.class, ObjectModelModifier.PACKAGE); + void.class, ObjectModelJavaModifier.PACKAGE); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1040,7 +1041,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("get" , attrName), - attrType, ObjectModelModifier.PACKAGE); + attrType, ObjectModelJavaModifier.PACKAGE); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1065,7 +1066,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("get", attrName) + "ByTopiaId", - attrType, ObjectModelModifier.PACKAGE); + attrType, ObjectModelJavaModifier.PACKAGE); ObjectModelParameter param = addParameter(interfaceOperation, String.class, "topiaId"); @@ -1136,7 +1137,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("size", attrName), - int.class, ObjectModelModifier.PACKAGE); + int.class, ObjectModelJavaModifier.PACKAGE); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1163,7 +1164,7 @@ // Interface operation ObjectModelOperation interfaceOperation = addOperation(outputInterface, getJavaBeanMethodName("is", attrName)+ "Empty", - boolean.class, ObjectModelModifier.PACKAGE); + boolean.class, ObjectModelJavaModifier.PACKAGE); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -36,6 +36,7 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelType; @@ -104,26 +105,26 @@ abstractEntityPropertyClass = (ObjectModelClass)addInnerClassifier(helperClass, ObjectModelType.OBJECT_MODEL_CLASS, ENTITY_PROPERTY_CLASS_NAME + ENTITY_PROPERTY_GENERIC_TYPE, - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.STATIC); addImport(helperClass, HashMap.class); addImport(helperClass, Map.class); addAttribute(abstractEntityPropertyClass, "alias", String.class, null, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addAttribute(abstractEntityPropertyClass, "propertiesCache", "Map<String, String>", null, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); // Constructor // FIXME-fdesbois-2010-06-23 : need to take care of generic case in JavaBuilder in EUGene // ObjectModelOperation constructor = -// addConstructor(abstractEntityPropertyClass, ObjectModelModifier.PUBLIC); +// addConstructor(abstractEntityPropertyClass, ObjectModelJavaModifier.PUBLIC); ObjectModelOperation constructor = - builder.addOperation(abstractEntityPropertyClass, ENTITY_PROPERTY_CLASS_NAME, null, ObjectModelModifier.PUBLIC); + builder.addOperation(abstractEntityPropertyClass, ENTITY_PROPERTY_CLASS_NAME, null, ObjectModelJavaModifier.PUBLIC); setOperationBody(constructor, "" /*{ @@ -134,7 +135,7 @@ // Getter and setter for alias ObjectModelOperation setAlias = addOperation(abstractEntityPropertyClass, "setAlias", "void", - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addParameter(setAlias, String.class, "alias"); @@ -146,7 +147,7 @@ ObjectModelOperation getAlias = addOperation(abstractEntityPropertyClass, "$alias", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setOperationBody(getAlias, "" @@ -158,7 +159,7 @@ // Getter for properties ObjectModelOperation getProperty = addOperation(abstractEntityPropertyClass, "$property", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addParameter(getProperty, String.class, "propertyName"); @@ -175,7 +176,7 @@ ObjectModelOperation topiaCreateDate = addOperation(abstractEntityPropertyClass, "topiaCreateDate", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setOperationBody(topiaCreateDate, "" /*{ @@ -185,7 +186,7 @@ ObjectModelOperation topiaId = addOperation(abstractEntityPropertyClass, "topiaId", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setOperationBody(topiaId, "" /*{ @@ -195,7 +196,7 @@ ObjectModelOperation topiaVersion = addOperation(abstractEntityPropertyClass, "topiaVersion", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); setOperationBody(topiaVersion, "" /*{ @@ -206,10 +207,10 @@ // Abstract methods addOperation(abstractEntityPropertyClass, "getEntityClass", "Class" + ENTITY_PROPERTY_GENERIC_TYPE, - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); addOperation(abstractEntityPropertyClass, "defaultAlias", String.class, - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); } protected void createUtilOperations() { @@ -217,7 +218,7 @@ // createQuery method with EntityProperty in argument ObjectModelOperation createQuery = addOperation(helperClass, "createQuery", TopiaQuery.class, - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(createQuery, ENTITY_PROPERTY_CLASS_NAME, "property"); setOperationBody(createQuery, "" @@ -229,7 +230,7 @@ // format method to format statement using $1, $2 corresponding to property names ObjectModelOperation format = addOperation(helperClass, "format", String.class, - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(format, String.class, "statement"); addParameter(format, "String...", "propertyNames"); @@ -246,7 +247,7 @@ String genericType = "<P extends " + ENTITY_PROPERTY_CLASS_NAME + "> P"; ObjectModelOperation newEntityProperty1 = addOperation(helperClass, "newEntityProperty", genericType, - ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); addParameter(newEntityProperty1, "Class<P>", "propertyClass"); setOperationBody(newEntityProperty1, "" @@ -256,7 +257,7 @@ ); ObjectModelOperation newEntityProperty2 = addOperation(helperClass, "newEntityProperty", genericType, - ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); addParameter(newEntityProperty2, "Class<P>", "propertyClass"); addParameter(newEntityProperty2, String.class, "alias"); @@ -353,7 +354,7 @@ aliases.put(alias, aliasPropertyName); addAttribute(helperClass, aliasPropertyName, String.class, "\"" + alias + "\"", - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC, ObjectModelModifier.FINAL); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.FINAL); return aliasPropertyName; } @@ -365,7 +366,7 @@ addInnerClassifier(helperClass, ObjectModelType.OBJECT_MODEL_CLASS, className, - ObjectModelModifier.STATIC); + ObjectModelJavaModifier.STATIC); if (log.isDebugEnabled()) { log.debug("Generate for entity : " + input.getQualifiedName()); @@ -381,7 +382,7 @@ setSuperClass(propertyClass, superClassQualifiedName); ObjectModelOperation constructor = - addConstructor(propertyClass, ObjectModelModifier.PROTECTED); + addConstructor(propertyClass, ObjectModelJavaModifier.PROTECTED); setOperationBody(constructor, "" /*{ @@ -390,7 +391,7 @@ ObjectModelOperation getEntityClass = addOperation(propertyClass, "getEntityClass", "Class<" + input.getName() + ">", - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addAnnotation(propertyClass, getEntityClass, "Override"); @@ -402,7 +403,7 @@ ObjectModelOperation defaultAlias = addOperation(propertyClass, "defaultAlias", String.class, - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addAnnotation(propertyClass, defaultAlias, "Override"); @@ -459,7 +460,7 @@ protected ObjectModelOperation createGetPropertyNameOperation(ObjectModelClass output, String attrName, String entityClassName) { ObjectModelOperation result = - addOperation(output, attrName, String.class, ObjectModelModifier.PUBLIC); + addOperation(output, attrName, String.class, ObjectModelJavaModifier.PUBLIC); String constantName = entityClassName + "." + getConstantName(attrName); @@ -521,7 +522,7 @@ ObjectModelOperation newEntityProperty1 = addOperation(helperClass, "new" + className, className, - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(newEntityProperty1, "" /*{ @@ -531,7 +532,7 @@ ObjectModelOperation newEntityProperty2 = addOperation(helperClass, "new" + className, className, - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(newEntityProperty2, String.class, "alias"); setOperationBody(newEntityProperty2, "" @@ -555,7 +556,7 @@ ObjectModelOperation newEntityProperty = addOperation(helperClass, "new" + subEntityName + "Property", propertyClassName, - ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); String callMethodName = "new" + propertyClassName; Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2012-10-11 02:49:34 UTC (rev 2672) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2012-10-24 19:45:07 UTC (rev 2673) @@ -33,6 +33,7 @@ import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -276,8 +277,8 @@ ObjectModelOperation operation = addOperation(serviceAbstract, OP_NAME_BEGIN_TRANSACTION, TopiaContext.class, - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.PROTECTED); addException(operation, TopiaException.class); } @@ -286,7 +287,7 @@ addOperation(serviceAbstract, OP_NAME_COMMIT_TRANSACTION, "void", - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addParameter(operation, TopiaContext.class, PARAMETER_TRANSACTION); addException(operation, TopiaException.class); setOperationBody(operation,"" @@ -304,8 +305,8 @@ addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.PROTECTED); addParameter(operation, TopiaContext.class, PARAMETER_TRANSACTION); addException(operation, TopiaException.class); } @@ -319,8 +320,8 @@ addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.PROTECTED); if (needTransaction) { addParameter(treateError1, TopiaContext.class, PARAMETER_TRANSACTION); } @@ -334,7 +335,7 @@ if (needTransaction) { ObjectModelOperation treateError2 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.PROTECTED); addParameter(treateError2, Exception.class, "eee"); addParameter(treateError2, String.class, "message"); addParameter(treateError2, "Object...", "args"); @@ -454,8 +455,8 @@ ObjectModelOperation executeOperation = addOperation(serviceAbstract, "execute" + opName, source.getReturnType(), - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.PROTECTED); // Throw all exception from abstract method // They will be catched by interface method to use treateError @@ -515,7 +516,7 @@ addOperation(serviceAbstract, source.getName(), source.getReturnType(), - ObjectModelModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); addAnnotation(serviceAbstract, implOp, Override.class.getSimpleName());