- Eugene-commits - mailman.cloud.codelutin.com

r1337 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org April 23, 2014

April 23, 2014

Author: tchemit Date: 2014-04-23 09:57:21 +0200 (Wed, 23 Apr 2014) New Revision: 1337 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1337 Log: fixes #3170 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2014-04-18 14:59:18 UTC (rev 1336) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2014-04-23 07:57:21 UTC (rev 1337) @@ -94,8 +94,8 @@ // build output template configuration // merge input configuration + output properties - Properties properties = - new Properties(getConfiguration().getProperties()); + Properties properties = new Properties(); + properties.putAll(getConfiguration().getProperties()); properties.putAll(getOutputProperties()); TemplateConfiguration outconfig =

1 0

[ANN] - EUGene 2.8 released
by nuiton.org Release Notification April 18, 2014

April 18, 2014

The EUGene team is pleased to announce the eugene-2.8 release! Efficient Universal Generator Documentation of the project can be found here: https://doc.nuiton.org/eugene Changes ------- Changes in this version include: New features: o Add warnings while loading model properties Issue: 3164. Thanks to Tony Chemit. Resolved by tchemit. o Review implications of ordering and uniqueness in collections Issue: 3147. Thanks to Brendan Le Ny. Resolved by bleny. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|eugene|2.8|jar Have fun! -EUGene team

1 0

r1336 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by maven-release＠users.nuiton.org April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 16:59:18 +0200 (Fri, 18 Apr 2014) New Revision: 1336 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1336 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/eugene/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/eugene-java-templates/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/eugene-maven-plugin/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/eugene-yaml-templates/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-18 14:59:13 UTC (rev 1335) +++ trunk/pom.xml 2014-04-18 14:59:18 UTC (rev 1336) @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description> @@ -129,11 +129,11 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/eugene/tags/eugene-2.8</connection> + <connection>scm:svn:https://svn.nuiton.org/eugene/trunk</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/eugene/tags/eugene-2.8 + scm:svn:https://svn.nuiton.org/eugene/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/eugene/repository/show/tags/eugene-2.8</url> + <url>https://forge.nuiton.org/projects/eugene/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r1335 - in tags: . eugene-2.8
by maven-release＠users.nuiton.org April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 16:59:13 +0200 (Fri, 18 Apr 2014) New Revision: 1335 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1335 Log: [maven-release-plugin] copy for tag eugene-2.8 Added: tags/eugene-2.8/ Property changes on: tags/eugene-2.8 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws .idea Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754 /branches/eugene-2.4.3:1151-1173

1 0

r1334 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by maven-release＠users.nuiton.org April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 16:59:00 +0200 (Fri, 18 Apr 2014) New Revision: 1334 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1334 Log: [maven-release-plugin] prepare release eugene-2.8 Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/eugene/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/eugene-java-templates/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/eugene-maven-plugin/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/eugene-yaml-templates/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-18 10:07:01 UTC (rev 1333) +++ trunk/pom.xml 2014-04-18 14:59:00 UTC (rev 1334) @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description> @@ -129,11 +129,11 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/eugene/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/eugene/tags/eugene-2.8</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/eugene/trunk + scm:svn:https://svn.nuiton.org/eugene/tags/eugene-2.8 </developerConnection> - <url>https://forge.nuiton.org/projects/eugene/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/eugene/repository/show/tags/eugene-2.8</url> </scm> <distributionManagement> <site>

1 0

r1333 - in trunk/eugene/src/main/java/org/nuiton/eugene: . models/object/reader
by tchemit＠users.nuiton.org April 18, 2014

April 18, 2014

Author: tchemit Date: 2014-04-18 12:07:01 +0200 (Fri, 18 Apr 2014) New Revision: 1333 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1333 Log: fixes #3164 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java 2014-04-18 10:05:51 UTC (rev 1332) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java 2014-04-18 10:07:01 UTC (rev 1333) @@ -33,8 +33,10 @@ import java.lang.annotation.Target; import java.lang.reflect.Field; import java.util.Arrays; +import java.util.HashSet; import java.util.Map; import java.util.ServiceLoader; +import java.util.Set; import java.util.TreeMap; /** @@ -148,6 +150,8 @@ provider.init(); getStereotypeStore().putAll(provider.getStereotypeStore()); getTagValueStore().putAll(provider.getTagValueStore()); + getDeprecatedStereotypes().addAll(provider.getDeprecatedStereotypes()); + getDeprecatedTagValues().addAll(provider.getDeprecatedTagValues()); } } } @@ -238,12 +242,16 @@ protected Map<String, TagValueDefinition> tagValueStore; protected Map<String, StereotypeDefinition> stereotypeStore; + protected Set<String> deprecatedTagValues; + protected Set<String> deprecatedStereotypes; protected boolean verbose; protected ModelPropertiesProvider() { stereotypeStore = new TreeMap<String, StereotypeDefinition>(); tagValueStore = new TreeMap<String, TagValueDefinition>(); + deprecatedTagValues = new HashSet<String>(); + deprecatedStereotypes = new HashSet<String>(); } public boolean isVerbose() { @@ -273,6 +281,9 @@ log.info("Detected stereotype definition [" + fieldName + ":" + stereotypeName + "] : " + Arrays.toString(stereotypeDefinition.target())); } stereotypeStore.put(stereotypeName, stereotypeDefinition); + if (field.isAnnotationPresent(Deprecated.class)) { + deprecatedStereotypes.add((stereotypeName)); + } } } } @@ -293,6 +304,9 @@ log.info("Detected tag value definition [" + fieldName + ":" + tagValueName + "] : " + Arrays.toString(tagValueDefinition.target())); } tagValueStore.put(tagValueName, tagValueDefinition); + if (field.isAnnotationPresent(Deprecated.class)) { + deprecatedTagValues.add((tagValueName)); + } } } } @@ -305,6 +319,14 @@ return tagValueStore; } + public Set<String> getDeprecatedTagValues() { + return deprecatedTagValues; + } + + public Set<String> getDeprecatedStereotypes() { + return deprecatedStereotypes; + } + public Class<?>[] getTagValueTarget(String tagValueName) { TagValueDefinition definition = tagValueStore.get(tagValueName); @@ -376,6 +398,16 @@ // no target found return false; } + + public boolean isDeprecatedTagValue(String tagValueName) { + boolean deprecated = deprecatedTagValues.contains(tagValueName); + return deprecated; + } + + public boolean isDeprecatedStereotype(String stereotypeName) { + boolean deprecated = deprecatedStereotypes.contains(stereotypeName); + return deprecated; + } } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-04-18 10:05:51 UTC (rev 1332) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-04-18 10:07:01 UTC (rev 1333) @@ -311,6 +311,17 @@ return false; } + if (safe) { + + // test if tagValue is deprecated + boolean deprecated = modelPropertiesProvider.isDeprecatedTagValue(tag); + if (deprecated) { + if (log.isWarnEnabled()) { + log.warn("Deprecated tagValue usage [" + key + "] : " + value ); + } + } + } + ObjectModelImpl modelImpl = (ObjectModelImpl) model; if (tag.equals(EugeneTagValues.TAG_VERSION)) { @@ -373,6 +384,17 @@ return false; } + if (safe) { + + // test if tagValue is deprecated + boolean deprecated = modelPropertiesProvider.isDeprecatedStereotype(value); + if (deprecated) { + if (log.isWarnEnabled()) { + log.warn("Deprecated stereotype usage [" + key + "] : " + value ); + } + } + } + if (log.isDebugEnabled()) { log.debug("Propriete: '" + key + "' => " + "fqn:" + fqn + " target:" + target @@ -477,6 +499,18 @@ return false; } + if (safe) { + + // test if tagValue is deprecated + boolean deprecated = modelPropertiesProvider.isDeprecatedTagValue(tag); + if (deprecated) { + if (log.isWarnEnabled()) { + log.warn("Deprecated tagValue usage [" + key + "] : " + value ); + } + } + } + + ObjectModelClassifier omc = getClassifier(model, TAGVALUE, key, fqn); if (omc == null) {

1 0

r1332 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org April 18, 2014

April 18, 2014

Author: tchemit Date: 2014-04-18 12:05:51 +0200 (Fri, 18 Apr 2014) New Revision: 1332 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1332 Log: refs #3147 improve javadoc Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2014-04-17 16:05:51 UTC (rev 1331) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2014-04-18 10:05:51 UTC (rev 1332) @@ -45,7 +45,7 @@ * Stéréotype pour les attributs à indexer en base. * * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute) - * @deprecated use {@link #STEREOTYPE_ORDERED} instead + * @deprecated since 2.8, use {@link #STEREOTYPE_ORDERED} instead */ @StereotypeDefinition(target = ObjectModelAttribute.class, documentation = "To specify that a attribute is indexed") @@ -60,7 +60,7 @@ * or {@link java.util.LinkedHashMap}. * * @see GeneratorUtil#hasOrderedStereotype(ObjectModelAttribute) - * @since 2.3 + * @since 2.8 */ @StereotypeDefinition(target = ObjectModelAttribute.class, documentation = "To specify that a attribute is ordered")

1 0

r1331 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by bleny＠users.nuiton.org April 17, 2014

April 17, 2014

Author: bleny Date: 2014-04-17 18:05:51 +0200 (Thu, 17 Apr 2014) New Revision: 1331 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1331 Log: refs #3147 ensure retro-compatibility for indexed stereotype usage Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-17 08:55:34 UTC (rev 1330) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-17 16:05:51 UTC (rev 1331) @@ -420,7 +420,7 @@ } public static boolean isOrdered(ObjectModelAttribute attr) { - return attr.isOrdered() || hasOrderedStereotype(attr); + return attr.isOrdered() || hasOrderedStereotype(attr) || hasIndexedStereotype(attr); } public static Class<?> getCollectionType(ObjectModelAttribute attr) {

1 0

r1330 - trunk
by athimel＠users.nuiton.org April 17, 2014

April 17, 2014

Author: athimel Date: 2014-04-17 10:55:34 +0200 (Thu, 17 Apr 2014) New Revision: 1330 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1330 Log: Use mavenpom 5.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 15:20:21 UTC (rev 1329) +++ trunk/pom.xml 2014-04-17 08:55:34 UTC (rev 1330) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.6-SNAPSHOT</version> + <version>5.0.6</version> </parent> <artifactId>eugene</artifactId>

1 0

r1329 - in trunk: eugene/src/main/java/org/nuiton/eugene/java eugene-java-templates/src/main/java/org/nuiton/eugene/java eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator
by bleny＠users.nuiton.org April 15, 2014

April 15, 2014

Author: bleny Date: 2014-04-15 17:20:21 +0200 (Tue, 15 Apr 2014) New Revision: 1329 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1329 Log: fixes #3147 Review implications of ordering and uniqueness in collections Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-15 13:20:57 UTC (rev 1328) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2014-04-15 15:20:21 UTC (rev 1329) @@ -501,7 +501,7 @@ @Override public String toString(ObjectModelParameter param) { - return new StringBuilder(getAttributeType(param)). + return new StringBuilder(getAttributeInterfaceType(param)). append(' '). append(param.getName()). toString(); @@ -519,7 +519,7 @@ Collection<ObjectModelAttribute> params = clazz.getAttributes(); for (Iterator<ObjectModelAttribute> j = params.iterator(); j.hasNext(); ) { ObjectModelAttribute attr = j.next(); - result.append(getAttributeType(attr, true)).append(" ").append(attr.getName()); + result.append(getAttributeInterfaceType(attr, true)).append(" ").append(attr.getName()); if (j.hasNext()) { result.append(", "); } @@ -530,10 +530,10 @@ /** * @param attribute the attribute to test * @return the type of the given attribute - * @see #getAttributeType(ObjectModelParameter, boolean) + * @see #getAttributeInterfaceType(ObjectModelParameter, boolean) */ - public static String getAttributeType(ObjectModelParameter attribute) { - return getAttributeType(attribute, false); + public static String getAttributeInterfaceType(ObjectModelParameter attribute) { + return getAttributeInterfaceType(attribute, false); } /** @@ -544,9 +544,9 @@ * @param useGenerics {@code true} if the attribute use a generic type * @return attribute type */ - public static String getAttributeType(ObjectModelParameter attribute, - boolean useGenerics) { - return getAttributeType(attribute, attribute.getType(), useGenerics); + public static String getAttributeInterfaceType(ObjectModelParameter attribute, + boolean useGenerics) { + return getAttributeInterfaceType(attribute, attribute.getType(), useGenerics); } /** @@ -558,9 +558,9 @@ * @param useGenerics {@code true} if the attribute use a generic type * @return attribute type */ - public static String getAttributeType(ObjectModelParameter attribute, - String attributeType, - boolean useGenerics) { + public static String getAttributeInterfaceType(ObjectModelParameter attribute, + String attributeType, + boolean useGenerics) { String result; if (attribute instanceof ObjectModelAttribute && isNMultiplicity((ObjectModelAttribute) attribute)) { @@ -574,4 +574,27 @@ } return result; } + + public static String getAttributeImplementationType(ObjectModelParameter attribute, + String attributeType, + boolean useGenerics) { + String result; + if (attribute instanceof ObjectModelAttribute + && isNMultiplicity((ObjectModelAttribute) attribute)) { + + result = getCollectionInstanceType((ObjectModelAttribute) attribute).getName(); + if (useGenerics) { + result += "<" + attributeType + ">"; + } + } else { + result = attributeType; + } + return result; + } + + public static String getAttributeImplementationType(ObjectModelParameter attribute, + boolean useGenerics) { + return getAttributeImplementationType(attribute, attribute.getType(), useGenerics); + } + } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2014-04-15 13:20:57 UTC (rev 1328) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java 2014-04-15 15:20:21 UTC (rev 1329) @@ -181,7 +181,7 @@ ); // Change type for Multiple attribute - attrType = JavaGeneratorUtil.getAttributeType(attr, true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, true); simpleType = JavaGeneratorUtil.getSimpleName(attrType); } Modified: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2014-04-15 13:20:57 UTC (rev 1328) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2014-04-15 15:20:21 UTC (rev 1329) @@ -358,7 +358,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, attrType, true); } /*{ <%=attrVisibility%> <%=attrType%> <%=attrName%>; @@ -407,7 +407,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, attrType, true); } /*{ public <%=attrType%> get<%=attrNameCapitalized%>() { return <%=attrName%>; @@ -441,7 +441,7 @@ attrType = attrType.substring(dot + 1); } if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = JavaGeneratorUtil.getAttributeType(attr, attrType, true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, attrType, true); } /*{ public void set<%=attrNameCapitalized%>(<%=attrType%> newValue) { <%=attrType%> oldValue = get<%=attrNameCapitalized%>(); Modified: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2014-04-15 13:20:57 UTC (rev 1328) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2014-04-15 15:20:21 UTC (rev 1329) @@ -50,9 +50,7 @@ import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; -import java.util.Collection; import java.util.Iterator; -import java.util.List; /*{generator option: parentheses = false}*/ @@ -178,7 +176,7 @@ ); // Change type for Multiple attribute - attrType = JavaGeneratorUtil.getAttributeType(attr, true); + attrType = JavaGeneratorUtil.getAttributeInterfaceType(attr, true); simpleType = GeneratorUtil.getSimpleName(attrType); }

1 0