This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.9.2 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 851e827ab3d08f671d68c2149cdaea4854cf7a10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 5 20:58:33 2014 +0200 fixes #3353: Use Eugene 2.9.x --- .../org/nuiton/topia/generator/BinderHelperTransformer.java | 2 +- .../org/nuiton/topia/generator/DAOAbstractTransformer.java | 2 +- .../org/nuiton/topia/generator/EntityDAOTransformer.java | 2 +- .../java/org/nuiton/topia/generator/EntityTransformer.java | 6 +++--- .../java/org/nuiton/topia/generator/TopiaGeneratorUtil.java | 13 ++++++++++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java index 353bee6..4cb1da0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java @@ -185,7 +185,7 @@ public class BinderHelperTransformer extends ObjectModelTransformerToJava { for (ObjectModelClass clazz : classes) { - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); if (StringUtils.isEmpty(prefix)) { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java index ddf42dc..f1f9d91 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java @@ -203,7 +203,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { addInterface(result, TopiaDAO.class.getName() + "<E>"); - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); setConstantPrefix(prefix); // imports diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java index 4c60331..3604621 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java @@ -353,7 +353,7 @@ public class EntityDAOTransformer extends ObjectModelTransformerToJava { } setSuperClass(daoAbstractClass, extendClass); - String prefix = getConstantPrefix(clazz, ""); + String prefix = getConstantPrefix(clazz); setConstantPrefix(prefix); // imports diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java index a68cde3..3adfe76 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java @@ -121,7 +121,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // fix once for all the constant prefix to use - String prefix = getConstantPrefix(input, ""); + String prefix = getConstantPrefix(input); if (StringUtils.isEmpty(prefix)) { // no specific prefix, so no prefix @@ -138,7 +138,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - generateBooleanGetMethods = !TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, null, input); + generateBooleanGetMethods = getEugeneTagValues().isGenerateBooleanGetMethods(input, null, model); if (generateInterface) { @@ -153,7 +153,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // Generate i18n block - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefixTagValue(input, null, model); + String i18nPrefix = getEugeneTagValues().getI18nPrefixTagValue(input, null, model); if (!StringUtils.isEmpty(i18nPrefix)) { generateI18nBlock(input, outputAbstract, i18nPrefix); } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index 732eaeb..9a27742 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; +import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ModelPropertiesUtil; @@ -760,7 +761,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return Set.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr) || attr.isOrdered()) { return List.class.getName(); } return Collection.class.getName(); @@ -775,7 +776,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { public static String getNMultiplicityObjectType(ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return HashSet.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr) || attr.isOrdered()) { //On considère qu'on ne sait pas traiter vraiment l'attribut "ordered" // puisqu'on va conserver l'ordre d'insertion, et non un ordre en // fonction d'un élément donné. Donc on renvoi une ArrayList @@ -785,6 +786,12 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { return ArrayList.class.getName(); } + @Deprecated + public static boolean hasIndexedStereotype(ObjectModelAttribute attr) { + + return EugeneStereoTypes.hasIndexedStereotype(attr); + } + /** * Renvoie le type d'interface à utiliser en fonction de l'attribut * @@ -795,7 +802,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return "set"; - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr)) { + } else if (EugeneStereoTypes.hasIndexedStereotype(attr)) { return "list"; } //attr.isOrdered() - On génère le ordered en bag -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.