Author: tchemit Date: 2010-11-29 14:16:49 +0100 (Mon, 29 Nov 2010) New Revision: 2160 Url: http://nuiton.org/repositories/revision/topia/2160 Log: use always classifier for tag values instead of specialized type (for the moment eugene does not deal with it) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 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-11-29 09:02:30 UTC (rev 2159) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-11-29 13:16:49 UTC (rev 2160) @@ -279,7 +279,7 @@ */ @Deprecated public static boolean shouldgenerateOperatorForDAOHelper( - ObjectModelElement element,ObjectModel model) { + ObjectModelElement element, ObjectModel model) { return shouldGenerateOperatorForDAOHelper(model); // String tagValue = GeneratorUtil.findTagValue( // TopiaTagValues.TAG_GENERATE_OPERATOR_FOR_DAO_HELPER, element, model); @@ -1478,24 +1478,24 @@ * @see TopiaTagValues#TAG_NOT_GENERATE_TO_STRING * @since 2.5 */ - public static String getNotGenerateToStringTagValue(ObjectModelClass clazz, ObjectModel model) { + public static String getNotGenerateToStringTagValue(ObjectModelClassifier clazz, ObjectModel model) { String value = findTagValue(TopiaTagValues.TAG_NOT_GENERATE_TO_STRING, clazz, model); return value; } /** * Obtain the value of the {@link TopiaTagValues#TAG_SORT_ATTRIBUTE} - * tag value on the given class. + * tag value on the given classifier. * <p/> * - * @param clazz class to seek - * @param model model to seek + * @param classifier classifier to seek + * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see TopiaTagValues#TAG_SORT_ATTRIBUTE * @since 2.5 */ - public static String getSortAttributeTagValue(ObjectModelClass clazz, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_SORT_ATTRIBUTE, clazz, model); + public static String getSortAttributeTagValue(ObjectModelClassifier classifier, ObjectModel model) { + String value = findTagValue(TopiaTagValues.TAG_SORT_ATTRIBUTE, classifier, model); return value; } @@ -1576,16 +1576,16 @@ /** * Obtain the value of the {@link TopiaTagValues#TAG_TRANSACTION} - * tag value on the given interface. + * tag value on the given classifier. * <p/> * - * @param interfaze operation to seek + * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see TopiaTagValues#TAG_TRANSACTION * @since 2.5 */ - public static String getTransactionTagValue(ObjectModelInterface interfaze) { - String value = findTagValue(TopiaTagValues.TAG_TRANSACTION, interfaze, null); + public static String getTransactionTagValue(ObjectModelClassifier classifier) { + String value = findTagValue(TopiaTagValues.TAG_TRANSACTION, classifier, null); return value; } @@ -1622,17 +1622,17 @@ /** * Obtain the value of the {@link TopiaTagValues#TAG_NO_LOG_IN_SERVICE} - * tag value on the given interface. + * tag value on the given classifier. * <p/> * - * @param interfaze operation to seek + * @param classifier classifier to seek * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see TopiaTagValues#TAG_NO_LOG_IN_SERVICE * @since 2.5 */ - public static String getNoLogInServiceTagValue(ObjectModelInterface interfaze, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_NO_LOG_IN_SERVICE, interfaze, model); + public static String getNoLogInServiceTagValue(ObjectModelClassifier classifier, ObjectModel model) { + String value = findTagValue(TopiaTagValues.TAG_NO_LOG_IN_SERVICE, classifier, model); return value; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2010-11-29 09:02:30 UTC (rev 2159) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2010-11-29 13:16:49 UTC (rev 2160) @@ -31,7 +31,6 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; -import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -137,7 +136,7 @@ * @see TopiaGeneratorUtil#isNaturalIdMutable(ObjectModelClass) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClass.class}) + @TagValueDefinition(target = {ObjectModelClassifier.class}) String TAG_NATURAL_ID_MUTABLE = "naturalIdMutable"; /** @@ -242,17 +241,17 @@ /** * Tag pour specifier de ne pas generer la methode toString. * - * @see TopiaGeneratorUtil#getNotGenerateToStringTagValue(ObjectModelClass,ObjectModel) + * @see TopiaGeneratorUtil#getNotGenerateToStringTagValue(ObjectModelClassifier,ObjectModel) * @see TopiaGeneratorUtil#generateToString(ObjectModelClass, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClass.class}) + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_NOT_GENERATE_TO_STRING = "notGenerateToString"; /** * Tag pour specifier de trier les attributs par nom lors de la generation. * - * @see TopiaGeneratorUtil#getSortAttributeTagValue(ObjectModelClass, ObjectModel) + * @see TopiaGeneratorUtil#getSortAttributeTagValue(ObjectModelClassifier, ObjectModel) * @see TopiaGeneratorUtil#sortAttribute(ObjectModelClass, ObjectModel) * @since 2.5 */ @@ -324,11 +323,11 @@ * (TopiaContext) ou non * * @see ServiceTransformer - * @see TopiaGeneratorUtil#getTransactionTagValue(ObjectModelInterface) + * @see TopiaGeneratorUtil#getTransactionTagValue(ObjectModelClassifier) * @see TopiaGeneratorUtil#getTransactionTagValue(ObjectModelOperation) * @since 2.3.1 */ - @TagValueDefinition(target = {ObjectModelInterface.class, ObjectModelOperation.class}) + @TagValueDefinition(target = {ObjectModelClassifier.class, ObjectModelOperation.class}) String TAG_TRANSACTION = "transaction"; /** @@ -339,7 +338,7 @@ * @see TopiaGeneratorUtil#getDoCommitTagValue(ObjectModelOperation, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelOperation.class}) + @TagValueDefinition(target = {ObjectModelOperation.class}) String TAG_DO_COMMIT = "doCommit"; /** @@ -361,9 +360,9 @@ * on model (for all services). * * @see ServiceTransformer - * @see TopiaGeneratorUtil#getNoLogInServiceTagValue(ObjectModelInterface, ObjectModel) + * @see TopiaGeneratorUtil#getNoLogInServiceTagValue(ObjectModelClassifier, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelInterface.class}) + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_NO_LOG_IN_SERVICE = "noLogInService"; }