branch develop updated (9dcc88a -> f36c852)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See http://git.nuiton.org/eugene.git from 9dcc88a Alos generate if generic tag value is there when using an external objet (See #3775) new b32e2f3 passage sur nuitonpom-4 new 006e8bc Rename the tag value *simpleBeanWithNoInterfaceAttributeGeneric* to *attributeGeneric* and move to the eugene default tag values (See #3787) new f36c852 Fixes #3787 Merge branch 'feature/3787_add_generic_information_on_attribute' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f36c85265d3f72907a96c9227f4b09871dda3df0 Merge: b32e2f3 006e8bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 4 08:45:49 2015 +0100 Fixes #3787 Merge branch 'feature/3787_add_generic_information_on_attribute' into develop commit 006e8bcd4f236918509c46abd94c932a00a6a625 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 4 08:45:45 2015 +0100 Rename the tag value *simpleBeanWithNoInterfaceAttributeGeneric* to *attributeGeneric* and move to the eugene default tag values (See #3787) commit b32e2f33e1c357857923cd814976be88be39b0a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 3 18:17:33 2015 +0100 passage sur nuitonpom-4 Summary of changes: .../eugene/java/AbstractJavaBeanTransformer.java | 19 +++++++++++++--- .../nuiton/eugene/java/JavaTemplatesTagValues.java | 25 ---------------------- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 9 ++------ .../java/org/nuiton/eugene/EugeneTagValues.java | 24 +++++++++++++++++++++ pom.xml | 2 +- 5 files changed, 43 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit b32e2f33e1c357857923cd814976be88be39b0a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 3 18:17:33 2015 +0100 passage sur nuitonpom-4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b4d776..ab05fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>3</version> + <version>4-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 006e8bcd4f236918509c46abd94c932a00a6a625 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 4 08:45:45 2015 +0100 Rename the tag value *simpleBeanWithNoInterfaceAttributeGeneric* to *attributeGeneric* and move to the eugene default tag values (See #3787) --- .../eugene/java/AbstractJavaBeanTransformer.java | 19 +++++++++++++--- .../nuiton/eugene/java/JavaTemplatesTagValues.java | 25 ---------------------- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 9 ++------ .../java/org/nuiton/eugene/EugeneTagValues.java | 24 +++++++++++++++++++++ 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java index 0aa90ac..fd48793 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java @@ -121,6 +121,19 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer return attrType; } + protected String getAttributeTypeWithGeneric(ObjectModelAttribute attr) { + String attrType = getAttributeType(attr); + String generic = getEugeneTagValues().getAttributeGenericTagValue(attr); + if (generic != null) { + attrType += "<" + getAttributeType(generic) + ">"; + } + return attrType; + } + + protected String getAttributeType(String attrType) { + return attrType; + } + protected boolean containsMutiple(List<ObjectModelAttribute> attributes) { boolean result = false; @@ -144,7 +157,7 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer boolean generateNotEmptyCollections) { String attrName = getAttributeName(attr); - String attrType = getAttributeType(attr); + String attrType = getAttributeTypeWithGeneric(attr); boolean multiple = JavaGeneratorUtil.isNMultiplicity(attr); @@ -206,7 +219,7 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer ); // Change type for Multiple attribute - attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, getAttributeType(attr), true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, getAttributeTypeWithGeneric(attr), true); simpleType = JavaGeneratorUtil.getSimpleName(attrType); } @@ -214,7 +227,7 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer if (multiple) { - String collectionImplementationType = JavaGeneratorUtil.getAttributeImplementationType(attr, getAttributeType(attr), true); + String collectionImplementationType = JavaGeneratorUtil.getAttributeImplementationType(attr, getAttributeTypeWithGeneric(attr), true); // creates a getXXX (multiple) method createGetMethod(output, diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java index 104487f..e11ebd9 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java @@ -24,7 +24,6 @@ package org.nuiton.eugene.java; import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.tagvalue.TagValueDefinition; @@ -457,18 +456,6 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { public static final String TAG_SIMPLE_BEAN_WITH_NO_INTERFACE_DEFAULTS_CLASS_NAME_SUFFIX = "simpleBeanWithNoInterfaceDefaultsClassNameSuffix"; /** - * To add a generic to an attribute. - * - * @see #getSimpleBeanWithNoInterfaceAttributeGenericTagValue(ObjectModelAttribute) - * @since 3.0 - */ - @TagValueDefinition( - target = {ObjectModelAttribute.class}, - documentation = "To add a generic to an attribute.\n" + - "(only effective with simple bean generator)") - public static final String TAG_SIMPLE_BEAN_WITH_NO_INTERFACE_ATTRIBUTE_GENERIC = "simpleBeanWithNoInterfaceAttributeGeneric"; - - /** * Obtain the value of the {@link #TAG_BEAN_SUPER_CLASS} tag value on the given model or classifier. * * It will first look on the model, and then in the given classifier. @@ -734,16 +721,4 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { return value; } - /** - * Obtain the value of the {@link #TAG_SIMPLE_BEAN_WITH_NO_INTERFACE_ATTRIBUTE_GENERIC} tag value on the given attribute. - * - * @param attribute attribute to seek - * @return the none empty value of the found tag value or {@code null} if not found nor empty. - * @see #TAG_SIMPLE_BEAN_WITH_NO_INTERFACE_ATTRIBUTE_GENERIC - * @since 3.0 - */ - public String getSimpleBeanWithNoInterfaceAttributeGenericTagValue(ObjectModelAttribute attribute) { - String value = findTagValue(TAG_SIMPLE_BEAN_WITH_NO_INTERFACE_ATTRIBUTE_GENERIC, attribute); - return value; - } } diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java index d5136c5..f30c2f5 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java @@ -496,7 +496,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr atLeastOnePropertyFound = true; String attrName = getAttributeName(attribute); - String attrType = getAttributeType(attribute); + String attrType = getAttributeTypeWithGeneric(attribute); addImport(output, attrType); String simpleType = JavaGeneratorUtil.getSimpleName(attrType); @@ -566,7 +566,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr atLeastOnePropertyFound = true; String attrName = getAttributeName(attribute); - String attrType = getAttributeType(attribute); + String attrType = getAttributeTypeWithGeneric(attribute); addImport(output, attrType); String simpleType = JavaGeneratorUtil.getSimpleName(attrType); @@ -690,11 +690,6 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr attrType = attributeClass.getPackageName() + "." + attributeType; } } - String generic = getJavaTemplatesTagValues().getSimpleBeanWithNoInterfaceAttributeGenericTagValue(attr); - - if (generic != null) { - attrType += "<" + getAttributeType(generic) + ">"; - } } return attrType; } diff --git a/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java b/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java index 36385b2..62ce261 100644 --- a/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java +++ b/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java @@ -22,6 +22,7 @@ package org.nuiton.eugene; import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelPackage; @@ -107,6 +108,16 @@ public class EugeneTagValues extends TagValueDefinitionProvider { public static final String TAG_GENERATE_BOOLEAN_GET_METHODS = "generateBooleanGetMethods"; /** + * To add a generic to an attribute. + * + * @see #getAttributeGenericTagValue(ObjectModelAttribute) + * @since 3.0 + */ + @TagValueDefinition(target = {ObjectModelAttribute.class}, + documentation = "To add a generic to an attribute.") + public static final String TAG_ATTRIBUTE_GENERIC = "attributeGeneric"; + + /** * Obtain the value of the {@link #TAG_DOCUMENTATION} tag value on the given model. * * @param model model to seek @@ -199,4 +210,17 @@ public class EugeneTagValues extends TagValueDefinitionProvider { String value = findTagValue(TAG_CONSTANT_PREFIX, classifier, aPackage, model); return value; } + + /** + * Obtain the value of the {@link #TAG_ATTRIBUTE_GENERIC} tag value on the given attribute. + * + * @param attribute attribute to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see #TAG_ATTRIBUTE_GENERIC + * @since 3.0 + */ + public String getAttributeGenericTagValue(ObjectModelAttribute attribute) { + String value = findTagValue(TAG_ATTRIBUTE_GENERIC, attribute); + return value; + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit f36c85265d3f72907a96c9227f4b09871dda3df0 Merge: b32e2f3 006e8bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 4 08:45:49 2015 +0100 Fixes #3787 Merge branch 'feature/3787_add_generic_information_on_attribute' into develop .../eugene/java/AbstractJavaBeanTransformer.java | 19 +++++++++++++--- .../nuiton/eugene/java/JavaTemplatesTagValues.java | 25 ---------------------- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 9 ++------ .../java/org/nuiton/eugene/EugeneTagValues.java | 24 +++++++++++++++++++++ 4 files changed, 42 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm