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

r1205 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 16:31:25 +0100 (Fri, 16 Nov 2012) New Revision: 1205 Url: http://nuiton.org/repositories/revision/eugene/1205 Log: fixes #2426: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-13 10:29:53 UTC (rev 1204) +++ trunk/pom.xml 2012-11-16 15:31:25 UTC (rev 1205) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4-SNAPSHOT</version> + <version>3.4.4</version> </parent> <artifactId>eugene</artifactId>

1 0

r1204 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 13 Nov '12

13 Nov '12

Author: tchemit Date: 2012-11-13 11:29:53 +0100 (Tue, 13 Nov 2012) New Revision: 1204 Url: http://nuiton.org/repositories/revision/eugene/1204 Log: reuse the getChild method to avoid linkage with nuiton-utils + improve doc Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-13 10:24:38 UTC (rev 1203) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-13 10:29:53 UTC (rev 1204) @@ -33,7 +33,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.util.CollectionUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -187,7 +186,12 @@ // Add helper operations if (hasAMultipleProperty) { - addImport(output, CollectionUtil.class); + if (!superClassIsBean) { + + // add getChild methods + createGetChildMethod(output); + } + } } @@ -446,7 +450,7 @@ addParameter(operation, "int", "index"); setOperationBody(operation, "" /*{ - <%=simpleType%> o = CollectionUtil.getOrNull(<%=attrName%>, index); + <%=simpleType%> o = getChild(<%=attrName%>, index); return o; }*/ ); @@ -853,4 +857,36 @@ ); } + protected void createGetChildMethod(ObjectModelClass output) { + ObjectModelOperation getChild = addOperation( + output, + "getChild", "<T> T", + ObjectModelJavaModifier.PROTECTED + ); + addParameter(getChild, "java.util.Collection<T>", "childs"); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" +/*{ + T result = null; + if (childs != null) { + if (childs instanceof List) { + if (index < childs.size()) { + result = ((List<T>) childs).get(index); + } + } else { + int i = 0; + for (T o : childs) { + if (index == i) { + result = o; + break; + } + i++; + } + } + } + return result; +}*/ + ); + } + } \ No newline at end of file Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2012-11-13 10:24:38 UTC (rev 1203) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2012-11-13 10:29:53 UTC (rev 1204) @@ -57,7 +57,11 @@ * If the bean needs Property change support (says you do not add the {@link #TAG_NO_PCS} on classifier or model, * then your class must provide evrything for it. * - * See newt code to know minimum stuff to add in your class for this purpose). + * More over, if you use some collections in your bean you must also define + * two method named {@code getChild(Collection list, int index)} and + * {@code getChild(List list, int index)} + * + * See new code to know minimum stuff to add in your class for this purpose. * <pre> * public abstract class AbstractBean implements Serializable { * @@ -89,6 +93,13 @@ * firePropertyChange(propertyName, null, newValue); * } * + * protected <T> T getChild(Collection<T> list, int index) { + * return CollectionUtil.getOrNull(list, index); + * } + * + * protected <T> T getChild(List<T> list, int index) { + * return CollectionUtil.getOrNull(list, index); + * } * } * </pre> * @@ -99,7 +110,7 @@ */ @ModelPropertiesUtil.TagValueDefinition( target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To specify a super-class to place on generated bean " + + documentation = "To specify a super-class to used on generated bean " + "for a class or any class of a model") String TAG_BEAN_SUPER_CLASS = "beanSuperClass"; }

1 0

r1203 - trunk
by tchemit＠users.nuiton.org 13 Nov '12

13 Nov '12

Author: tchemit Date: 2012-11-13 11:24:38 +0100 (Tue, 13 Nov 2012) New Revision: 1203 Url: http://nuiton.org/repositories/revision/eugene/1203 Log: back to last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 19:47:03 UTC (rev 1202) +++ trunk/pom.xml 2012-11-13 10:24:38 UTC (rev 1203) @@ -42,7 +42,6 @@ <module>eugene</module> <module>eugene-java-templates</module> <module>eugene-maven-plugin</module> -  </modules> <dependencyManagement> @@ -310,7 +309,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r1202 - in trunk: . eugene/src/license eugene-java-templates/src/license eugene-maven-plugin eugene-maven-plugin/src/license
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 20:47:03 +0100 (Sun, 11 Nov 2012) New Revision: 1202 Url: http://nuiton.org/repositories/revision/eugene/1202 Log: fixes #2427: Updates to helper-m-p 2.0 refs #2426: Updates to mavenpom 3.4.4 optimize third parties Modified: trunk/eugene-java-templates/src/license/THIRD-PARTY.properties trunk/eugene-maven-plugin/pom.xml trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties trunk/eugene/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/eugene/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene/src/license/THIRD-PARTY.properties 2012-11-06 11:37:40 UTC (rev 1201) +++ trunk/eugene/src/license/THIRD-PARTY.properties 2012-11-11 19:47:03 UTC (rev 1202) @@ -22,5 +22,5 @@ # #Mon May 28 11:02:25 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License jdom--jdom--1.0=The Apache Software License, Version 2.0 Modified: trunk/eugene-java-templates/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene-java-templates/src/license/THIRD-PARTY.properties 2012-11-06 11:37:40 UTC (rev 1201) +++ trunk/eugene-java-templates/src/license/THIRD-PARTY.properties 2012-11-11 19:47:03 UTC (rev 1202) @@ -21,5 +21,5 @@ # #Wed Oct 24 21:31:10 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License jdom--jdom--1.0=The Apache Software License, Version 2.0 Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-11-06 11:37:40 UTC (rev 1201) +++ trunk/eugene-maven-plugin/pom.xml 2012-11-11 19:47:03 UTC (rev 1202) @@ -114,7 +114,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> </dependency> <dependency> Modified: trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties 2012-11-06 11:37:40 UTC (rev 1201) +++ trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties 2012-11-11 19:47:03 UTC (rev 1202) @@ -21,10 +21,9 @@ # Please fill the missing licenses for dependencies : # # -#Fri Aug 17 09:06:10 CEST 2012 +#Sun Nov 11 20:45:26 CET 2012 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License 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 -oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 11:37:40 UTC (rev 1201) +++ trunk/pom.xml 2012-11-11 19:47:03 UTC (rev 1202) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> @@ -90,26 +90,6 @@ </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${antVersion}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.4.01</version> @@ -161,80 +141,17 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> + <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> - - <exclusion> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> </exclusion> <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> - - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> - - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.velocity</groupId> + <groupId>velocity</groupId> <artifactId>velocity</artifactId> </exclusion> @@ -286,7 +203,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.8</version> </dependency> </dependencies> @@ -366,10 +283,6 @@ <developer> <name>Florian Desbois</name> <id>fdesbois</id> - <email>fdesbois at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles>

1 0

r1201 - trunk/eugene-java-templates/src/main/resources/META-INF/services
by tchemit＠users.nuiton.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 12:37:40 +0100 (Tue, 06 Nov 2012) New Revision: 1201 Url: http://nuiton.org/repositories/revision/eugene/1201 Log: refs #2393: Move java templates tag-values and stereotypes to his module (reference provider by ServiceLoadermecanism) Modified: trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider Modified: trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider =================================================================== --- trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider 2012-11-06 09:49:22 UTC (rev 1200) +++ trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider 2012-11-06 11:37:40 UTC (rev 1201) @@ -0,0 +1 @@ +org.nuiton.eugene.java.JavaTemplatesModelPropertiesProvider \ No newline at end of file

1 0

r1200 - in trunk/eugene-java-templates/src: main/java/org/nuiton/eugene/java test/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 10:49:22 +0100 (Tue, 06 Nov 2012) New Revision: 1200 Url: http://nuiton.org/repositories/revision/eugene/1200 Log: fixes #2394: Can specify a super classon generated bean Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-06 09:14:01 UTC (rev 1199) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-06 09:49:22 UTC (rev 1200) @@ -99,9 +99,27 @@ } } + String superClass = null; + + if (!superClassIsBean) { + + // try to find a super class by tag-value + superClass = + JavaTemplatesGeneratorUtil.getBeanSuperClassTagValue( + model, input); + if (superClass != null) { + + // will act as if super class is a bean + superClassIsBean = true; + } + } + ObjectModelClass output = createAbstractClass(input.getName(), input.getPackageName()); + if (superClass != null) { + setSuperClass(output, superClass); + } if (log.isDebugEnabled()) { log.debug("will generate " + output.getQualifiedName()); } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2012-11-06 09:14:01 UTC (rev 1199) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2012-11-06 09:49:22 UTC (rev 1200) @@ -63,4 +63,21 @@ String value = findTagValue(JavaTemplatesTagValues.TAG_NO_PCS, classifier, model); return value; } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#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. + * + * @param model model 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 JavaTemplatesTagValues#TAG_BEAN_SUPER_CLASS + * @since 2.3 + */ + public static String getBeanSuperClassTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS, classifier, model); + return value; + } } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2012-11-06 09:14:01 UTC (rev 1199) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2012-11-06 09:49:22 UTC (rev 1200) @@ -50,4 +50,56 @@ documentation = "To specify to not generate any propertyChange " + "code for a class or any class of a model") String TAG_NO_PCS = "noPCS"; + + /** + * Tag value to use a super class for generated bean. + * + * If the bean needs Property change support (says you do not add the {@link #TAG_NO_PCS} on classifier or model, + * then your class must provide evrything for it. + * + * See newt code to know minimum stuff to add in your class for this purpose). + * <pre> + * public abstract class AbstractBean implements Serializable { + * + * private static final long serialVersionUID = 1L; + * + * protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + * + * public void addPropertyChangeListener(PropertyChangeListener listener) { + * pcs.addPropertyChangeListener(listener); + * } + * + * public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + * pcs.addPropertyChangeListener(propertyName, listener); + * } + * + * public void removePropertyChangeListener(PropertyChangeListener listener) { + * pcs.removePropertyChangeListener(listener); + * } + * + * public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + * pcs.removePropertyChangeListener(propertyName, listener); + * } + * + * protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + * pcs.firePropertyChange(propertyName, oldValue, newValue); + * } + * + * protected void firePropertyChange(String propertyName, Object newValue) { + * firePropertyChange(propertyName, null, newValue); + * } + * + * } + * </pre> + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaTemplatesGeneratorUtil#getBeanSuperClassTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.5.6 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To specify a super-class to place on generated bean " + + "for a class or any class of a model") + String TAG_BEAN_SUPER_CLASS = "beanSuperClass"; } Modified: trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java =================================================================== --- trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java 2012-11-06 09:14:01 UTC (rev 1199) +++ trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java 2012-11-06 09:49:22 UTC (rev 1200) @@ -60,19 +60,24 @@ @Test public void containsTagValue() throws Exception { containsTagValue(JavaTemplatesTagValues.TAG_NO_PCS, true); + containsTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS, true); long l = System.nanoTime(); containsTagValue(JavaTemplatesTagValues.TAG_NO_PCS + l, false); + containsTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS + l, false); } @Test public void acceptTagValue() throws Exception { acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); + acceptTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS, false, ObjectModelOperation.class, ObjectModelAttribute.class); + acceptTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS, false, ObjectModelOperation.class, ObjectModelAttribute.class); long l = System.nanoTime(); acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); + acceptTagValue(JavaTemplatesTagValues.TAG_BEAN_SUPER_CLASS + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); } @Test

1 0

r1199 - in trunk: . eugene eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene/src/test/java/org/nuiton/eugene eugene-java-templates eugene-java-templates/src/main/java/org/nuiton/eugene/java eugene-java-templates/src/main/resources eugene-java-templates/src/main/resources/META-INF eugene-java-templates/src/main/resources/META-INF/services eugene-java-templates/src/test/java/org/nuiton/eugene/java eugene-maven-plugin
by tchemit＠users.nuiton.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 10:14:01 +0100 (Tue, 06 Nov 2012) New Revision: 1199 Url: http://nuiton.org/repositories/revision/eugene/1199 Log: fixes #2393: Move java templates tag-values and stereotypes to his module move to version 2.5.6-SNAPSHOT Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProvider.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesStereoTypes.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java trunk/eugene-java-templates/src/main/resources/META-INF/ trunk/eugene-java-templates/src/main/resources/META-INF/services/ trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/package-info.java trunk/eugene-maven-plugin/pom.xml trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene/pom.xml 2012-11-06 09:14:01 UTC (rev 1199) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5.1-SNAPSHOT</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -42,15 +42,6 @@ public interface EugeneStereoTypes { /** - * Stereotype for JavaBean objects to place on a classifier. - * - * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) - */ - @StereotypeDefinition(target = ObjectModelClassifier.class, - documentation = "To specify that a class is a JavaBean") - String STEREOTYPE_BEAN = "bean"; - - /** * Stéréotype pour les attributs à indexer en base. * * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute) Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -86,18 +86,6 @@ String TAG_CONSTANT_PREFIX = "constantPrefix"; /** - * Tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). - * - * You can globaly use it on the complete model or to a specific classifier. - * - * @see JavaGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier) - * @since 2.3 - */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To specify to not generate any propertyChange code for a class or any class of a model") - String TAG_NO_PCS = "noPCS"; - - /** * Tag value to specify the i18n prefix to use whene generating i18n keys. * * You can globaly use it on the complete model or to a specific classifier. Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -121,18 +121,6 @@ /** * Check if the given classifier has the - * {@link EugeneStereoTypes#STEREOTYPE_BEAN} stereotype. - * - * @param classifier classifier to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see EugeneStereoTypes#STEREOTYPE_BEAN - */ - public static boolean hasBeanStereotype(ObjectModelClassifier classifier) { - return classifier.hasStereotype(EugeneStereoTypes.STEREOTYPE_BEAN); - } - - /** - * Check if the given classifier has the * {@link EugeneStereoTypes#STEREOTYPE_SKIP} stereotype. * * @param classifier classifier to test @@ -177,23 +165,6 @@ } /** - * Obtain the value of the {@link EugeneTagValues#TAG_NO_PCS} - * tag value on the given model or classifier. - * - * It will first look on the model, and then in the given classifier. - * - * @param model model 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 EugeneTagValues#TAG_NO_PCS - * @since 2.3 - */ - public static String getNoPCSTagValue(ObjectModel model, ObjectModelClassifier classifier) { - String value = findTagValue(EugeneTagValues.TAG_NO_PCS, classifier, model); - return value; - } - - /** * Obtain the value of the {@link EugeneTagValues#TAG_CONSTANT_PREFIX} * tag value on the given model or classifier. * Modified: trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -55,7 +55,6 @@ public void getTagValueTarget() throws Exception { getTagValueTarget(EugeneTagValues.TAG_CONSTANT_PREFIX, ObjectModel.class, ObjectModelClassifier.class); getTagValueTarget(EugeneTagValues.TAG_I18N_PREFIX, ObjectModel.class, ObjectModelClassifier.class); - getTagValueTarget(EugeneTagValues.TAG_NO_PCS, ObjectModel.class, ObjectModelClassifier.class); getTagValueTarget(EugeneTagValues.TAG_VERSION, ObjectModel.class); } @@ -63,13 +62,11 @@ public void containsTagValue() throws Exception { containsTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX, true); containsTagValue(EugeneTagValues.TAG_I18N_PREFIX, true); - containsTagValue(EugeneTagValues.TAG_NO_PCS, true); containsTagValue(EugeneTagValues.TAG_VERSION, true); long l = System.nanoTime(); containsTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX + l, false); containsTagValue(EugeneTagValues.TAG_I18N_PREFIX + l, false); - containsTagValue(EugeneTagValues.TAG_NO_PCS + l, false); containsTagValue(EugeneTagValues.TAG_VERSION + l, false); } @@ -77,49 +74,40 @@ public void acceptTagValue() throws Exception { acceptTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); acceptTagValue(EugeneTagValues.TAG_I18N_PREFIX, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); - acceptTagValue(EugeneTagValues.TAG_NO_PCS, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); acceptTagValue(EugeneTagValues.TAG_VERSION, true, ObjectModel.class); acceptTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX, false, ObjectModelOperation.class, ObjectModelAttribute.class); acceptTagValue(EugeneTagValues.TAG_I18N_PREFIX, false, ObjectModelOperation.class, ObjectModelAttribute.class); - acceptTagValue(EugeneTagValues.TAG_NO_PCS, false, ObjectModelOperation.class, ObjectModelAttribute.class); acceptTagValue(EugeneTagValues.TAG_VERSION, false, ObjectModelClassifier.class, ObjectModelOperation.class, ObjectModelAttribute.class); long l = System.nanoTime(); acceptTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); acceptTagValue(EugeneTagValues.TAG_I18N_PREFIX + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); - acceptTagValue(EugeneTagValues.TAG_NO_PCS + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); acceptTagValue(EugeneTagValues.TAG_VERSION + l, false, ObjectModelClassifier.class, ObjectModelOperation.class, ObjectModelAttribute.class); } @Test public void getStereotypeTarget() throws Exception { - getStereotypeTarget(EugeneStereoTypes.STEREOTYPE_BEAN, ObjectModelClassifier.class); getStereotypeTarget(EugeneStereoTypes.STEREOTYPE_INDEXED, ObjectModelAttribute.class); } @Test public void containsStereotype() throws Exception { containsStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED, true); - containsStereotype(EugeneStereoTypes.STEREOTYPE_BEAN, true); long l = System.nanoTime(); containsStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED + l, false); - containsStereotype(EugeneStereoTypes.STEREOTYPE_BEAN + l, false); } @Test public void acceptStereotype() throws Exception { - acceptStereotype(EugeneStereoTypes.STEREOTYPE_BEAN, true, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class, ObjectModelInterface.class); acceptStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED, true, ObjectModelAttribute.class); - acceptStereotype(EugeneStereoTypes.STEREOTYPE_BEAN, false, ObjectModel.class, ObjectModelOperation.class); acceptStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED, false, ObjectModel.class, ObjectModelOperation.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class, ObjectModelInterface.class); long l = System.nanoTime(); - acceptStereotype(EugeneStereoTypes.STEREOTYPE_BEAN + l, false, ObjectModel.class, ObjectModelOperation.class); acceptStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED + l, false, ObjectModel.class, ObjectModelOperation.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class, ObjectModelInterface.class); } Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-java-templates/pom.xml 2012-11-06 09:14:01 UTC (rev 1199) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5.1-SNAPSHOT</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelInterface; @@ -54,8 +53,8 @@ * * 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 EugeneTagValues#TAG_NO_PCS}.</li> - * <li>generate i18n keys using the tag value {@link EugeneTagValues#TAG_I18N_PREFIX}.</li> + * <li>generate a simple POJO (says with no PCS support) by using the tag value {@link JavaTemplatesTagValues#TAG_NO_PCS}.</li> + * <li>generate i18n keys using the tag value {@link JavaTemplatesTagValues#TAG_I18N_PREFIX}.</li> * </ul> * * @author tchemit <chemit(a)codelutin.com> @@ -71,7 +70,7 @@ @Override public void transformFromClass(ObjectModelClass input) { - if (!JavaGeneratorUtil.hasBeanStereotype(input)) { + if (!JavaTemplatesGeneratorUtil.hasBeanStereotype(input)) { // not a bean return; @@ -93,7 +92,7 @@ Collection<ObjectModelClass> superclasses = input.getSuperclasses(); if(CollectionUtils.isNotEmpty(superclasses)) { for (ObjectModelClass superclass : superclasses) { - if (JavaGeneratorUtil.hasBeanStereotype(superclass)) { + if (JavaTemplatesGeneratorUtil.hasBeanStereotype(superclass)) { superClassIsBean = true; break; } @@ -112,7 +111,7 @@ generateI18nBlock(input, output, i18nPrefix); } - String noPCSTagValue = JavaGeneratorUtil.getNoPCSTagValue(model, input); + String noPCSTagValue = JavaTemplatesGeneratorUtil.getNoPCSTagValue(model, input); boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || !"true".equals(noPCSTagValue.trim()); Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -72,7 +72,7 @@ } protected boolean canGenerate(ObjectModelEnumeration input) { - boolean b = !JavaGeneratorUtil.hasSkipStereotype(input); + boolean b = !JavaTemplatesGeneratorUtil.hasSkipStereotype(input); if (b) { // check if not found in class-path Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -116,7 +116,7 @@ // interface operations - JavaGeneratorUtil.cloneOperations(this, + JavaTemplatesGeneratorUtil.cloneOperations(this, input.getOperations(), output, false Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -0,0 +1,66 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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% + */ + +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClassifier; + +/** + * Utility class for pure java templates. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.6 + */ +public class JavaTemplatesGeneratorUtil extends JavaGeneratorUtil { + + /** + * Check if the given classifier has the + * {@link JavaTemplatesStereoTypes#STEREOTYPE_BEAN} stereotype. + * + * @param classifier classifier to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see JavaTemplatesStereoTypes#STEREOTYPE_BEAN + */ + public static boolean hasBeanStereotype(ObjectModelClassifier classifier) { + return classifier.hasStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN); + } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#TAG_NO_PCS} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model 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 JavaTemplatesTagValues#TAG_NO_PCS + * @since 2.3 + */ + public static String getNoPCSTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_NO_PCS, classifier, model); + return value; + } +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProvider.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProvider.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProvider.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -0,0 +1,43 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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% + */ + +import org.nuiton.eugene.ModelPropertiesUtil; + +/** + * The Java templates provider of tag values and stereotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" role-hint="java" + * @since 2.5.6 + */ +public class JavaTemplatesModelPropertiesProvider extends ModelPropertiesUtil.ModelPropertiesProvider { + + @Override + public void init() throws IllegalAccessException { + scanStereotypeClass(JavaTemplatesStereoTypes.class); + scanTagValueClass(JavaTemplatesTagValues.class); + } +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesStereoTypes.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesStereoTypes.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesStereoTypes.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -0,0 +1,49 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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% + */ + +import org.nuiton.eugene.EugeneStereoTypes; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.models.object.ObjectModelClassifier; + +/** + * Defines all stereotypes managed by Java templates. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.6 + */ +public interface JavaTemplatesStereoTypes extends EugeneStereoTypes { + + /** + * Stereotype for JavaBean objects to place on a classifier. + * + * @see JavaTemplatesGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) + * @since 2.5.6 + */ + @ModelPropertiesUtil.StereotypeDefinition( + target = ObjectModelClassifier.class, + documentation = "To specify that a class is a JavaBean") + String STEREOTYPE_BEAN = "bean"; +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesStereoTypes.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java (rev 0) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -0,0 +1,53 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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% + */ + +import org.nuiton.eugene.EugeneTagValues; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClassifier; + +/** + * Defines all tag values managed by Java templates. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.6 + */ +public interface JavaTemplatesTagValues extends EugeneTagValues { + + /** + * Tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaTemplatesGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.5.6 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To specify to not generate any propertyChange " + + "code for a class or any class of a model") + String TAG_NO_PCS = "noPCS"; +} Property changes on: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/package-info.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/package-info.java 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/package-info.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -14,7 +14,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/eugene-java-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java =================================================================== --- trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java (rev 0) +++ trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java 2012-11-06 09:14:01 UTC (rev 1199) @@ -0,0 +1,141 @@ +package org.nuiton.eugene.java; + +/* + * #%L + * EUGene :: Java templates + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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% + */ + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.models.object.ObjectModel; +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.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/** + * To test stereotypes and tag values of this module. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.6 + */ +public class JavaTemplatesModelPropertiesProviderTest { + + protected ModelPropertiesUtil.ModelPropertiesProvider provider; + + @Before + public void setUp() throws Exception { + provider = new JavaTemplatesModelPropertiesProvider(); + provider.init(); + } + + @Test + public void getTagValueTarget() throws Exception { + getTagValueTarget(JavaTemplatesTagValues.TAG_NO_PCS, ObjectModel.class, ObjectModelClassifier.class); + } + + @Test + public void containsTagValue() throws Exception { + containsTagValue(JavaTemplatesTagValues.TAG_NO_PCS, true); + + long l = System.nanoTime(); + containsTagValue(JavaTemplatesTagValues.TAG_NO_PCS + l, false); + } + + @Test + public void acceptTagValue() throws Exception { + acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS, true, ObjectModel.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); + + acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS, false, ObjectModelOperation.class, ObjectModelAttribute.class); + + long l = System.nanoTime(); + acceptTagValue(JavaTemplatesTagValues.TAG_NO_PCS + l, false, ObjectModelOperation.class, ObjectModelAttribute.class); + } + + @Test + public void getStereotypeTarget() throws Exception { + + getStereotypeTarget(JavaTemplatesStereoTypes.STEREOTYPE_BEAN, ObjectModelClassifier.class); + } + + @Test + public void containsStereotype() throws Exception { + containsStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN, true); + + long l = System.nanoTime(); + containsStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN + l, false); + } + + @Test + public void acceptStereotype() throws Exception { + + acceptStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN, true, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class, ObjectModelInterface.class); + + acceptStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN, false, ObjectModel.class, ObjectModelOperation.class); + + long l = System.nanoTime(); + acceptStereotype(JavaTemplatesStereoTypes.STEREOTYPE_BEAN + l, false, ObjectModel.class, ObjectModelOperation.class); + + } + + protected void getTagValueTarget(String name, Class<?>... expected) { + Class<?>[] classes = provider.getTagValueTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } + + protected void containsTagValue(String name, boolean expected) { + boolean classes = provider.containsTagValue(name); + Assert.assertEquals(expected, classes); + } + + protected void acceptTagValue(String name, boolean expected, Class<?>... types) { + for (Class<?> type : types) { + boolean actual = provider.acceptTagValue(name, type); + Assert.assertEquals(expected, actual); + } + } + + protected void getStereotypeTarget(String name, Class<?>... expected) { + Class<?>[] classes = provider.getStereotypeTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } + + protected void containsStereotype(String name, boolean expected) { + boolean classes = provider.containsStereotype(name); + Assert.assertEquals(expected, classes); + } + + protected void acceptStereotype(String name, boolean expected, Class<?>... types) { + for (Class<?> type : types) { + boolean actual = provider.acceptStereotype(name, type); + Assert.assertEquals(expected, actual); + } + } +} Property changes on: trunk/eugene-java-templates/src/test/java/org/nuiton/eugene/java/JavaTemplatesModelPropertiesProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/eugene-maven-plugin/pom.xml 2012-11-06 09:14:01 UTC (rev 1199) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5.5.1-SNAPSHOT</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) +++ trunk/pom.xml 2012-11-06 09:14:01 UTC (rev 1199) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.5.5.1-SNAPSHOT</version> + <version>2.5.6-SNAPSHOT</version> <modules> <module>eugene</module>

1 0

r1198 - trunk
by tchemit＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:43:35 +0100 (Tue, 30 Oct 2012) New Revision: 1198 Url: http://nuiton.org/repositories/revision/eugene/1198 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-29 16:31:45 UTC (rev 1197) +++ trunk/pom.xml 2012-10-30 07:43:35 UTC (rev 1198) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <artifactId>eugene</artifactId>

1 0

r1197 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 29 Oct '12

29 Oct '12

Author: tchemit Date: 2012-10-29 17:31:45 +0100 (Mon, 29 Oct 2012) New Revision: 1197 Url: http://nuiton.org/repositories/revision/eugene/1197 Log: refs #2385: Improve JavaBean generation template (prefer use getOrNull method instead of get) Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:29:21 UTC (rev 1196) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-29 16:31:45 UTC (rev 1197) @@ -429,7 +429,7 @@ addParameter(operation, "int", "index"); setOperationBody(operation, "" /*{ - <%=simpleType%> o = CollectionUtil.get(<%=attrName%>, index); + <%=simpleType%> o = CollectionUtil.getOrNull(<%=attrName%>, index); return o; }*/ );

1 0

r1196 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org 28 Oct '12

28 Oct '12

Author: tchemit Date: 2012-10-28 13:29:21 +0100 (Sun, 28 Oct 2012) New Revision: 1196 Url: http://nuiton.org/repositories/revision/eugene/1196 Log: refs #2385: Improve JavaBean generation template Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:28:48 UTC (rev 1195) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2012-10-28 12:29:21 UTC (rev 1196) @@ -34,6 +34,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.util.CollectionUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -162,13 +163,14 @@ // Add property change support createPropertyChangeSupport(output); } + } - boolean hasAMultipleProperty = containsMutiple(properties); + boolean hasAMultipleProperty = containsMutiple(properties); - // Add helper operations - if (hasAMultipleProperty) { - createGetChildMethod(output); - } + // Add helper operations + if (hasAMultipleProperty) { + + addImport(output, CollectionUtil.class); } } @@ -401,13 +403,13 @@ String attrType, String methodPrefix) { - ObjectModelOperation getter = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName(methodPrefix , attrName), attrType, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getter, "" + setOperationBody(operation, "" /*{ return <%=attrName%>; }*/ @@ -418,16 +420,16 @@ String attrName, String attrType, String simpleType) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("get", attrName), attrType, ObjectModelJavaModifier.PUBLIC ); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" + addParameter(operation, "int", "index"); + setOperationBody(operation, "" /*{ - <%=simpleType%> o = getChild(<%=attrName%>, index); + <%=simpleType%> o = CollectionUtil.get(<%=attrName%>, index); return o; }*/ ); @@ -435,13 +437,13 @@ protected void createIsEmptyMethod(ObjectModelClass output, String attrName) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("is", attrName)+"Empty", boolean.class, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getChild, "" + setOperationBody(operation, "" /*{ return <%=attrName%> == null || <%=attrName%>.isEmpty(); }*/ @@ -450,13 +452,13 @@ protected void createSizeMethod(ObjectModelClass output, String attrName) { - ObjectModelOperation getChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("size", attrName), int.class, ObjectModelJavaModifier.PUBLIC ); - setOperationBody(getChild, "" + setOperationBody(operation, "" /*{ return <%=attrName%> == null ? 0 : <%=attrName%>.size(); }*/ @@ -467,13 +469,13 @@ String attrType, String constantName, boolean usePCS) { - ObjectModelOperation addChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("add", attrName), "void", ObjectModelJavaModifier.PUBLIC ); - addParameter(addChild, attrType, attrName); + addParameter(operation, attrType, attrName); String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" @@ -487,7 +489,7 @@ }*/ ); } - setOperationBody(addChild, buffer.toString()); + setOperationBody(operation, buffer.toString()); } protected void createAddAllChildrenMethod(ObjectModelClass output, @@ -495,13 +497,13 @@ String attrType, String constantName, boolean usePCS) { - ObjectModelOperation addAllChild = addOperation( + ObjectModelOperation operation = addOperation( output, getJavaBeanMethodName("addAll", attrName), "void", ObjectModelJavaModifier.PUBLIC ); - addParameter(addAllChild, "java.util.Collection<" + attrType + ">", attrName); + addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" @@ -515,7 +517,7 @@ }*/ ); } - setOperationBody(addAllChild, buffer.toString()); + setOperationBody(operation, buffer.toString()); } protected void createRemoveChildMethod(ObjectModelClass output, @@ -669,36 +671,6 @@ } } - protected void createGetChildMethod(ObjectModelClass output) { - ObjectModelOperation getChild = addOperation( - output, - "getChild", "<T> T", - ObjectModelJavaModifier.PROTECTED - ); - addParameter(getChild, "java.util.Collection<T>", "childs"); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - T result = null; - if (childs != null) { - if (childs instanceof List) { - result = ((List<T>) childs).get(index); - } else { - int i = 0; - for (T o : childs) { - if (index == i) { - result = o; - break; - } - i++; - } - } - } - return result; - }*/ - ); - } - protected void addSerializable(ObjectModelClass input, ObjectModelClass output, boolean interfaceFound) {

1 0