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

r995 - trunk
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 11:05:46 +0100 (Fri, 19 Nov 2010) New Revision: 995 Url: http://nuiton.org/repositories/revision/eugene/995 Log: clean versions in pom + remove Stephane Chorlet from codelutin organization Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 07:48:45 UTC (rev 994) +++ trunk/pom.xml 2010-11-19 10:05:46 UTC (rev 995) @@ -341,8 +341,6 @@ <developer> <name>Stéphane Chorlet</name> <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> <role>developer</role> @@ -382,11 +380,9 @@  <projectId>eugene</projectId> - <antVersion>1.8.0</antVersion> <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> -   <locales>en,fr</locales> @@ -415,7 +411,6 @@ <version>${processorPluginVersion}</version> </plugin> - <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId>

1 0

r994 - in trunk: ant-eugene-task/src/license eugene/src/license maven-eugene-plugin/src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 08:48:45 +0100 (Fri, 19 Nov 2010) New Revision: 994 Url: http://nuiton.org/repositories/revision/eugene/994 Log: use new thrid-partys missing files (maven-license-plugin 3.0) Modified: trunk/ant-eugene-task/src/license/THIRD-PARTY.properties trunk/eugene/src/license/THIRD-PARTY.properties trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties Modified: trunk/ant-eugene-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/ant-eugene-task/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,43 +1,21 @@ -### -# #%L -# EUGene :: Ant task -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 +# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:19:52 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.apache.ant--ant--1.8.0=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:28:07 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant--1.8.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/eugene/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/eugene/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,18 +1,20 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 +# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 09:01:58 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:26:28 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties 2010-11-18 21:36:37 UTC (rev 993) +++ trunk/maven-eugene-plugin/src/license/THIRD-PARTY.properties 2010-11-19 07:48:45 UTC (rev 994) @@ -1,22 +1,24 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD +# - BSD License # - Common Public License Version 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:22:18 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Fri Nov 19 08:29:01 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0

1 0

r993 - trunk
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 22:36:37 +0100 (Thu, 18 Nov 2010) New Revision: 993 Url: http://nuiton.org/repositories/revision/eugene/993 Log: use mavenpom 2.4.1-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 15:10:17 UTC (rev 992) +++ trunk/pom.xml 2010-11-18 21:36:37 UTC (rev 993) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> @@ -420,10 +420,6 @@ <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> <configuration> -  - <excludes> - <exclude>**/THIRD-PARTY.properties</exclude> - </excludes> <extraExtensions> <objectmodel>xml</objectmodel> <xsl>xml</xsl>

1 0

r992 - trunk
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 16:10:17 +0100 (Thu, 18 Nov 2010) New Revision: 992 Url: http://nuiton.org/repositories/revision/eugene/992 Log: Evolution #1067: Updates nuiton-utils to 1.5.2 + reuse mavenpom default libs versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 15:08:25 UTC (rev 991) +++ trunk/pom.xml 2010-11-18 15:10:17 UTC (rev 992) @@ -58,6 +58,13 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>2.0</version> @@ -79,33 +86,9 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - - <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.8.0</version> + <version>${antVersion}</version> <scope>provided</scope> </dependency> @@ -283,7 +266,7 @@ <version>1.5.15</version> </dependency> - <dependency> +  </dependencies> </dependencyManagement> @@ -399,10 +382,11 @@  <projectId>eugene</projectId> - <ant.version>1.8.0</ant.version> + <antVersion>1.8.0</antVersion> <processorPluginVersion>1.0.4</processorPluginVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <mavenVersion>2.2.1</mavenVersion> + <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> +   <locales>en,fr</locales>

1 0

r991 - trunk/eugene
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 16:08:25 +0100 (Thu, 18 Nov 2010) New Revision: 991 Url: http://nuiton.org/repositories/revision/eugene/991 Log: Evolution #1067: Updates nuiton-utils to 1.5.2 Modified: trunk/eugene/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-18 14:26:45 UTC (rev 990) +++ trunk/eugene/pom.xml 2010-11-18 15:08:25 UTC (rev 991) @@ -50,6 +50,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> </dependency> @@ -133,7 +138,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> <dependency>

1 0

r990 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:45 +0100 (Thu, 18 Nov 2010) New Revision: 990 Url: http://nuiton.org/repositories/revision/eugene/990 Log: Evolution #1062: Add I18n method in JavageneratorUtil Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-18 14:26:29 UTC (rev 989) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-18 14:26:45 UTC (rev 990) @@ -43,7 +43,9 @@ import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.models.object.ObjectModelTransformer; import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.i18n.I18n; +import java.beans.Introspector; import java.net.URL; import java.util.Collection; import java.util.Collections; @@ -480,7 +482,7 @@ /** * clone a given attribute into a classifier of the output model * - * @param attribute the original attribute + * @param source the original attribute * @param destination classifier where the clone will be added * @param cloneDocumentation flag to add documentation if some found in model * @param modifiers extra modifiers @@ -738,4 +740,46 @@ return fileLocation; } + /** + * Generates a static block with I18n keys for each navigable attributes + * prefixed by the given {@code i18nPrefix}. + * + * @param input the input classifier + * @param output the output classifier (to generate) + * @param i18nPrefix the i81n prefix to use + */ + protected void generateI18nBlock(ObjectModelClassifier input, + ObjectModelClassifier output, + String i18nPrefix) { + + ObjectModelOperation block = + addBlock(output, ObjectModelModifier.STATIC); + + StringBuilder buffer = new StringBuilder(300); + addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); + boolean useI18n = false; + for (ObjectModelAttribute attr : input.getAttributes()) { + //TC-20100225 only treate navigable relations + if (attr.isNavigable()) { + useI18n=true; + addI18n(buffer, + i18nPrefix, + Introspector.decapitalize(attr.getName()) + ); + } + } + if (useI18n) { + addImport(output, I18n.class); + } + setOperationBody(block, buffer.toString()); + } + + protected void addI18n(StringBuilder buffer, String i18nPrefix, + String suffix) { + buffer.append("\n I18n.n_(\""); + buffer.append(i18nPrefix); + buffer.append(suffix); + buffer.append("\");"); + } + }

1 0

r989 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:29 +0100 (Thu, 18 Nov 2010) New Revision: 989 Url: http://nuiton.org/repositories/revision/eugene/989 Log: Evolution #1063: Can generateds i18n for Bean (JavaBeanTransformer) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-18 14:26:04 UTC (rev 988) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-18 14:26:29 UTC (rev 989) @@ -50,6 +50,12 @@ * JavaBeanTransformer generates simple bean with pcs support * (and nothing else) according to the JavaBeans 1.1 norm. * + * Since version 2.2.1, it is possible to + * <ul> + * <li>generate a simple POJO (says with no PCS support) by using the tag value {@link JavaGeneratorUtil#TAG_NO_PCS}.</li> + * <li>generate i18n keys using the tag value {@link JavaGeneratorUtil#TAG_I18N_PREFIX}.</li> + * </ul> + * * @author tchemit <chemit(a)codelutin.com> * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaBeanTransformer" * @since 2.0.2 @@ -77,6 +83,11 @@ log.debug("will generate " + output.getQualifiedName()); } + String i18nPrefix = JavaGeneratorUtil.getI18nPrefix(input, model); + if (!StringUtils.isEmpty(i18nPrefix)) { + generateI18nBlock(input, output, i18nPrefix); + } + ObjectModelClass ouputImpl = generateImpl(input, output); String noPCSTagValue = input.getTagValue(JavaGeneratorUtil.TAG_NO_PCS);

1 0

r988 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:26:04 +0100 (Thu, 18 Nov 2010) New Revision: 988 Url: http://nuiton.org/repositories/revision/eugene/988 Log: Evolution #1062: Add I18n method in JavageneratorUtil 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 2010-11-18 14:25:31 UTC (rev 987) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-18 14:26:04 UTC (rev 988) @@ -25,7 +25,9 @@ package org.nuiton.eugene.java; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -66,6 +68,11 @@ public static final String TAG_VERSION = "version"; /** + * Tag pour specfier if i18n must be generated. + * @since 2.2.1 + */ + public static final String TAG_I18N_PREFIX = "i18n"; + /** * dependency to add constants in interfaces via an enumeration. * * The literals of enumeration will be the value, and constant names will @@ -131,4 +138,18 @@ } } } + + /** + * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur + * le model. + * + * @param element l'élément à tester + * @param model le modele utilisé + * @return le prefix i18n ou <code>null</code> si non spécifié + * @since 2.2.1 + */ + public static String getI18nPrefix(ObjectModelElement element, + ObjectModel model) { + return findTagValue(TAG_I18N_PREFIX, element, model); + } }

1 0

r987 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:25:31 +0100 (Thu, 18 Nov 2010) New Revision: 987 Url: http://nuiton.org/repositories/revision/eugene/987 Log: Evolution #1061: Remove deprecated api since 2.0.1 in generatorUtil Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-16 12:31:51 UTC (rev 986) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-18 14:25:31 UTC (rev 987) @@ -267,46 +267,6 @@ } /** - * @param params the paramters to treate - * @return la chaine de caractere dont on a besoin pour la declaration - * des parametres d'une methode avec leurs types. - * @deprecated since 2.0.1, use {@link #getOperationParametersListDeclaration(ObjectModelOperation)} instead - */ - @Deprecated - public static String getMethodParameterDeclaration( - Collection<ObjectModelParameter> params) { - StringBuffer result = new StringBuffer(); - for (Iterator<ObjectModelParameter> j = params.iterator(); j.hasNext();) { - ObjectModelParameter parameter = j.next(); - result.append(getAttributeType(parameter)).append(" ").append(parameter.getName()); - if (j.hasNext()) { - result.append(", "); - } - } - return result.toString(); - } - - /** - * @param params the paramters to treate - * @return la chaine de caractere qui represente chaque nom de parametre - * separer par des ','. - * @deprecated since 2.0.1, use {@link #getOperationParametersListName(ObjectModelOperation) Declaration(org.nuiton.eugene.models.object.ObjectModelOperation)} instead - */ - @Deprecated - public static String getMethodParameterListName( - Collection<ObjectModelParameter> params) { - StringBuffer result = new StringBuffer(); - for (Iterator<ObjectModelParameter> j = params.iterator(); j.hasNext();) { - ObjectModelParameter parameter = j.next(); - result.append(parameter.getName()); - if (j.hasNext()) { - result.append(", "); - } - } - return result.toString(); - } - - /** * @param attribute the attribute to test * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d * si MaxMultiplicity == -1 ou > 1 @@ -330,29 +290,6 @@ /** * - * @deprecated use StringUtils.capitalize instead - * @param word the word to capitalize - * @return the capitalized word - */ - @Deprecated - public static String toUpperCaseFirstLetter(String word) { - return capitalize(word); - } - - /** - * Capitalizes a String changing the first letter to title case. - * - * @deprecated use StringUtils.capitalize instead - * @param word word to Capitalize - * @return Capitalized word - */ - @Deprecated - public static String capitalize(String word) { - return StringUtils.capitalize(word); - } - - /** - * * @param word the word to decapitalize * @return the decapitalized word */

1 0

r986 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 16 Nov '10

16 Nov '10

Author: tchemit Date: 2010-11-16 13:31:51 +0100 (Tue, 16 Nov 2010) New Revision: 986 Url: http://nuiton.org/repositories/revision/eugene/986 Log: Evolution #1049: Add tagvalue noPCS to not generate PCS on JavaBeanTransformer Anomalie #1051: Duplicated Serializable interface generated in JavaBeanTransformer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-11 23:25:20 UTC (rev 985) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-16 12:31:51 UTC (rev 986) @@ -79,6 +79,10 @@ ObjectModelClass ouputImpl = generateImpl(input, output); + String noPCSTagValue = input.getTagValue(JavaGeneratorUtil.TAG_NO_PCS); + boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || + !"true".equals(noPCSTagValue.trim()); + if (log.isDebugEnabled()) { if (ouputImpl == null) { log.debug("will generate impl " + @@ -95,10 +99,11 @@ addSuperClass(input, output, ouputImpl); - addSerializable(output); + boolean serializableFound = addInterfaces(input, output); - addInterfaces(input, output); + addSerializable(output, serializableFound); + Set<String> constantNames = addConstantsFromDependency(input, output); // Get available properties @@ -113,14 +118,17 @@ // Add properties field + javabean methods for (ObjectModelAttribute attr : properties) { - createProperty(output, attr); + createProperty(output, attr, usePCS); } // Add operations createAbstractOperations(output, input.getOperations()); - // Add property change support - createPropertyChangeSupport(output); + if (usePCS) { + + // Add property change support + createPropertyChangeSupport(output); + } boolean hasAMultipleProperty = containsMutiple(properties); @@ -187,7 +195,8 @@ } protected void createProperty(ObjectModelClass output, - ObjectModelAttribute attr) { + ObjectModelAttribute attr, + boolean usePCS) { String attrName = getAttributeName(attr); String attrType = getAttributeType(attr); @@ -212,14 +221,17 @@ attrName, attrNameCapitalized, attrType, - constantName + constantName, + usePCS ); createRemoveChildMethod(output, attrName, attrNameCapitalized, attrType, - constantName + constantName, + usePCS + ); // Change type for Multiple attribute @@ -244,7 +256,8 @@ attrNameCapitalized, attrType, simpleType, - constantName + constantName, + usePCS ); // Add attribute to the class @@ -338,7 +351,8 @@ String attrName, String attrNameCapitalized, String attrType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation addChild = addOperation( output, "add" + attrNameCapitalized, @@ -346,19 +360,28 @@ ObjectModelModifier.PUBLIC ); addParameter(addChild, attrType, attrName); - setOperationBody(addChild, "" + + StringBuilder buffer = new StringBuilder("" /*{ get<%=attrNameCapitalized%>().add(<%=attrName%>); + }*/ + ); + if (usePCS) { + buffer.append("" + /*{ firePropertyChange(<%=constantName%>, null, <%=attrName%>); }*/ - ); + ); + } + setOperationBody(addChild, buffer.toString()); } protected void createRemoveChildMethod(ObjectModelClass output, String attrName, String attrNameCapitalized, String attrType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation operation = addOperation( output, "remove" + attrNameCapitalized, @@ -366,15 +389,28 @@ ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); - setOperationBody(operation, "" + StringBuilder buffer = new StringBuilder(); + buffer.append("" /*{ boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + }*/ + ); + + if (usePCS) { + buffer.append("" + /*{ if (removed) { firePropertyChange(<%=constantName%>, <%=attrName%>, null); + } + }*/ + ); } + buffer.append("" + /*{ return removed; }*/ ); + setOperationBody(operation, buffer.toString()); } protected void createSetMethod(ObjectModelClass output, @@ -382,7 +418,8 @@ String attrNameCapitalized, String attrType, String simpleType, - String constantName) { + String constantName, + boolean usePCS) { ObjectModelOperation operation = addOperation( output, "set" + attrNameCapitalized, @@ -390,14 +427,21 @@ ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); - - setOperationBody(operation, "" + if (usePCS) { + setOperationBody(operation, "" /*{ <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); this.<%=attrName%> = <%=attrName%>; firePropertyChange(<%=constantName%>, oldValue, <%=attrName%>); }*/ - ); + ); + } else { + setOperationBody(operation, "" + /*{ + this.<%=attrName%> = <%=attrName%>; + }*/ + ); + } } protected void createGetChildMethod(ObjectModelClass output) { @@ -424,19 +468,35 @@ ); } - protected void addSerializable(ObjectModelClass output) { - addInterface(output, Serializable.class); + protected void addSerializable(ObjectModelClass output,boolean interfaceFound) { + if (!interfaceFound) { + addInterface(output, Serializable.class); + } // Maybe generate the UID for each different generation ? addConstant(output, "serialVersionUID", "long", "1L", ObjectModelModifier.PRIVATE); } - protected void addInterfaces(ObjectModelClass input, + /** + * Add all interfaces defines in input class and returns if + * {@link Serializable} interface was found. + * + * @param input the input model class to process + * @param output the output generated class + * @return {@code true} if {@link Serializable} was found from input, + * {@code false} otherwise + */ + protected boolean addInterfaces(ObjectModelClass input, ObjectModelClass output) { - // Add interfaces from inputModel + boolean foundSerializable = false; for (ObjectModelInterface parentInterface : input.getInterfaces()) { - addInterface(output, parentInterface.getQualifiedName()); + String fqn = parentInterface.getQualifiedName(); + addInterface(output, fqn); + if (Serializable.class.getName().equals(fqn)) { + foundSerializable = true; + } } + return foundSerializable; } protected void addSuperClass(ObjectModelClass input, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-11 23:25:20 UTC (rev 985) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-16 12:31:51 UTC (rev 986) @@ -24,18 +24,12 @@ */ package org.nuiton.eugene.java; -import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.GeneratorUtil; -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.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import java.util.Collection; -import java.util.List; - /** * Utility class for pure java templates. * @@ -58,6 +52,12 @@ public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; /** + * tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * @see JavaBeanTransformer + */ + public static final String TAG_NO_PCS= "noPCS"; + + /** * tag value to add the version of the model from outside (says in the * properties file associated to the model).. *

1 0