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

r745 - branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Dec. 13, 2009

Dec. 13, 2009

Author: tchemit Date: 2009-12-13 21:02:52 +0100 (Sun, 13 Dec 2009) New Revision: 745 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java Log: remove unucessary default constructor Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java 2009-12-13 20:02:13 UTC (rev 744) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelTransformer.java 2009-12-13 20:02:52 UTC (rev 745) @@ -42,10 +42,6 @@ * @param <O> */ public abstract class ObjectModelTransformer<O extends Model> extends Transformer<ObjectModel, O> { - - public ObjectModelTransformer() { - super(); - } /** * Le model associé au transformer est le model d'entree. Le modele de sortie

1 0

r744 - branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Dec. 13, 2009

Dec. 13, 2009

Author: tchemit Date: 2009-12-13 21:02:13 +0100 (Sun, 13 Dec 2009) New Revision: 744 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java Log: reformat + javadoc Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java 2009-12-13 20:01:41 UTC (rev 743) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ObjectModelType.java 2009-12-13 20:02:13 UTC (rev 744) @@ -24,14 +24,31 @@ * Contains all types available for generating specific ObjectModelElement file. * Needed because of inheritance between class, interface and classifier. * Method instanceof (previously used) is inadequat so expliciting the ObjectModel type is much better. - * + * <p/> * Created: may 4th 2009 * * @author Florian DESBOIS <fdesbois(a)codelutin.com> - * * @version $Revision: 496 $ */ public enum ObjectModelType { - OBJECT_MODEL, OBJECT_MODEL_ENUMERATION, OBJECT_MODEL_CLASSIFIER, - OBJECT_MODEL_CLASS, OBJECT_MODEL_INTERFACE + /** + * a model + */ + OBJECT_MODEL, + /** + * an enumration + */ + OBJECT_MODEL_ENUMERATION, + /** + * a generic classifier + */ + OBJECT_MODEL_CLASSIFIER, + /** + * a class + */ + OBJECT_MODEL_CLASS, + /** + * an interface + */ + OBJECT_MODEL_INTERFACE }

1 0

r743 - branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org Dec. 13, 2009

Dec. 13, 2009

Author: tchemit Date: 2009-12-13 21:01:41 +0100 (Sun, 13 Dec 2009) New Revision: 743 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ModelFileWriterConfiguration.java Log: javadoc Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ModelFileWriterConfiguration.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ModelFileWriterConfiguration.java 2009-12-11 18:09:59 UTC (rev 742) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ModelFileWriterConfiguration.java 2009-12-13 20:01:41 UTC (rev 743) @@ -7,8 +7,8 @@ import java.util.Set; /** - * Shared configuration of a {@link ModelFileWriter}, should be the same for all writer - * to use in a time. + * Shared configuration of a {@link ModelFileWriter}, should be the same for all writers + * to use at a time. * * @author tchemit * @since 2.0.0

1 0

r742 - branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene
by fdesbois＠users.nuiton.org Dec. 11, 2009

Dec. 11, 2009

Author: fdesbois Date: 2009-12-11 19:09:59 +0100 (Fri, 11 Dec 2009) New Revision: 742 Modified: branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Log: Add test for getSimpleName method, broken for getTypesList --> it's necessary to do imports before using this type of expression Modified: branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2009-12-11 10:56:36 UTC (rev 741) +++ branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2009-12-11 18:09:59 UTC (rev 742) @@ -126,6 +126,12 @@ result = GeneratorUtil.getSimpleName(str); log.info(str + " -> " + result); assertEquals(expResult, result); + + str = "<T extends org.nuiton.topia.TopiaEntity, D extends org.nuiton.topia.TopiaDAO<? super T>> D"; + expResult = "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D"; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); } @Test @@ -166,10 +172,15 @@ log.info(str + " -> " + results); assertEquals(results.size(), 3); - str = "java.util.Map<org.chorem.jtimer.Jtimer, java.util.Collection<java.lang.String>>"; + str = "java.util.Map<org.chorem.jtimer.Jtimer, java.util.Collection<String>>"; results = GeneratorUtil.getTypesList(str); log.info(str + " -> " + results); assertEquals(results.size(), 4); + +// str = "<T extends org.nuiton.topia.TopiaEntity> T"; +// results = GeneratorUtil.getTypesList(str); +// log.info(str + " -> " + results); +// assertEquals(results.size(), 1); } } \ No newline at end of file

1 0

r741 - in branches/eugene-2.0: . eugene/src/site eugene/src/site/resources eugene-test maven-eugene-plugin maven-eugene-plugin/src/site maven-eugene-plugin/src/site/fr maven-eugene-plugin/src/site/fr/rst maven-eugene-plugin/src/site/rst src/site
by tchemit＠users.nuiton.org Dec. 11, 2009

Dec. 11, 2009

Author: tchemit Date: 2009-12-11 11:56:36 +0100 (Fri, 11 Dec 2009) New Revision: 741 Added: branches/eugene-2.0/eugene/src/site/rst/ branches/eugene-2.0/maven-eugene-plugin/src/site/fr/ branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/ branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml branches/eugene-2.0/src/site/site_en.xml branches/eugene-2.0/src/site/site_fr.xml Removed: branches/eugene-2.0/eugene-test/nbactions.xml branches/eugene-2.0/eugene/src/site/en/ branches/eugene-2.0/eugene/src/site/resources/index.html branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml branches/eugene-2.0/src/site/site.xml Modified: branches/eugene-2.0/eugene/src/site/site_en.xml branches/eugene-2.0/eugene/src/site/site_fr.xml branches/eugene-2.0/maven-eugene-plugin/pom.xml branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst branches/eugene-2.0/pom.xml Log: - use mavenpom 1.1.2 - use normal directory layout for site - remove ide files Deleted: branches/eugene-2.0/eugene/src/site/resources/index.html =================================================================== --- branches/eugene-2.0/eugene/src/site/resources/index.html 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/eugene/src/site/resources/index.html 2009-12-11 10:56:36 UTC (rev 741) @@ -1,9 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <title>EUGene</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta http-equiv="Refresh" content="0; url=fr/index.html"> - </head> - <body /> -</html> Modified: branches/eugene-2.0/eugene/src/site/site_en.xml =================================================================== --- branches/eugene-2.0/eugene/src/site/site_en.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/eugene/src/site/site_en.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -8,7 +8,7 @@ <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="index.html" /> </breadcrumbs> <links> Modified: branches/eugene-2.0/eugene/src/site/site_fr.xml =================================================================== --- branches/eugene-2.0/eugene/src/site/site_fr.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/eugene/src/site/site_fr.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -8,13 +8,13 @@ <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> + <item name="${project.name}" href="index.html" /> </breadcrumbs> <links> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="index.html" /> - <item name="en]" href="../en/index.html" /> + <item name="en]" href="../index.html" /> </links> <menu ref="parent"/> Deleted: branches/eugene-2.0/eugene-test/nbactions.xml =================================================================== --- branches/eugene-2.0/eugene-test/nbactions.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/eugene-test/nbactions.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<actions> - <action> - <actionName>CUSTOM-debug maven</actionName> - <displayName>debug maven</displayName> - <goals> - <goal>clean</goal> - <goal>install</goal> - <goal>-e</goal> - <goal>-Dlog4j.configuration=file:src/test/resources/log4j.properties</goal> - </goals> - </action> - </actions> Modified: branches/eugene-2.0/maven-eugene-plugin/pom.xml =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -91,7 +91,6 @@ <execution> <goals> <goal>generate-metadata</goal> -  </goals> </execution> </executions> Copied: branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst (from rev 739, branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst) =================================================================== (Binary files differ) Modified: branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst =================================================================== (Binary files differ) Deleted: branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> - - <body> - <links> - <item name="Eugene" href="../eugene"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item name="Goals" href="plugin-info.html"> - <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> - <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> - <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> - <item name="generate" href="generate-mojo.html"/> - <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Added: branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml (rev 0) +++ branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> + <item name="[fr" href="../fr/index.html" /> + <item name="en]" href="index.html" /> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item href="index.html" name="Index"/> + <item name="Goals" href="plugin-info.html"> + <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> + <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> + <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> + <item name="generate-model-files" href="generate-model-files-mojo.html"/> + <item name="generate" href="generate-mojo.html"/> + <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Download"> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Copied: branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml (from rev 739, branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml) =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml (rev 0) +++ branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item name="Goals" href="plugin-info.html"> + <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> + <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> + <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> + <item name="generate-model-files" href="generate-model-files-mojo.html"/> + <item name="generate" href="generate-mojo.html"/> + <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/eugene-2.0/pom.xml =================================================================== --- branches/eugene-2.0/pom.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/pom.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> </parent> <artifactId>eugene</artifactId> @@ -251,12 +251,11 @@  <ant.version>1.7.1</ant.version> - <processor.version>1.0.2</processor.version> + <processor.version>1.0.3-SNAPSHOT</processor.version> <nuiton-utils.version>1.1.0</nuiton-utils.version>  <maven.site.locales>en,fr</maven.site.locales> - <defaultLocale>en</defaultLocale> </properties> <build> Deleted: branches/eugene-2.0/src/site/site.xml =================================================================== --- branches/eugene-2.0/src/site/site.xml 2009-12-11 09:58:30 UTC (rev 740) +++ branches/eugene-2.0/src/site/site.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="modules"/> - - <menu ref="reports"/> - </body> -</project> Added: branches/eugene-2.0/src/site/site_en.xml =================================================================== --- branches/eugene-2.0/src/site/site_en.xml (rev 0) +++ branches/eugene-2.0/src/site/site_en.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project> Copied: branches/eugene-2.0/src/site/site_fr.xml (from rev 739, branches/eugene-2.0/src/site/site.xml) =================================================================== --- branches/eugene-2.0/src/site/site_fr.xml (rev 0) +++ branches/eugene-2.0/src/site/site_fr.xml 2009-12-11 10:56:36 UTC (rev 741) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project>

1 0

r740 - in branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object: . xml
by fdesbois＠users.nuiton.org Dec. 11, 2009

Dec. 11, 2009

Author: fdesbois Date: 2009-12-11 10:58:30 +0100 (Fri, 11 Dec 2009) New Revision: 740 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilder.java Log: Improve ObjectModelModifier enumeration Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java 2009-12-08 15:55:00 UTC (rev 739) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java 2009-12-11 09:58:30 UTC (rev 740) @@ -34,10 +34,18 @@ */ public enum ObjectModelModifier { - STATIC, FINAL, ABSTRACT, PUBLIC, PROTECTED, PRIVATE, PACKAGE, + STATIC("static"), FINAL("final"), ABSTRACT("abstract"), + PUBLIC("public"), PROTECTED("protected"), PRIVATE("private"), PACKAGE(""), - AGGREGATE, COMPOSITE, UNIQUE, ORDERED, NAVIGABLE; + AGGREGATE("aggregate"), COMPOSITE("composite"), UNIQUE("unique"), + ORDERED("ordered"), NAVIGABLE("navigable"); + private String stringValue; + + ObjectModelModifier(String stringValue) { + this.stringValue = stringValue; + } + public boolean isVisibility() { return this == PUBLIC || this == PROTECTED || @@ -52,29 +60,29 @@ @Override public String toString() { - switch (this) { - //case STATIC: return "static"; - //case ABSTRACT: return "abstract"; - //case FINAL: return "final"; - case PUBLIC: return "public"; - case PRIVATE: return "private"; - case PROTECTED: return "protected"; - case PACKAGE: return ""; - case ORDERED: return "ordered"; - case AGGREGATE: return "aggregate"; - case COMPOSITE: return "composite"; - } - return ""; +// switch (this) { +// //case STATIC: return "static"; +// //case ABSTRACT: return "abstract"; +// //case FINAL: return "final"; +// case PUBLIC: return "public"; +// case PRIVATE: return "private"; +// case PROTECTED: return "protected"; +// case PACKAGE: return ""; +// case ORDERED: return "ordered"; +// case AGGREGATE: return "aggregate"; +// case COMPOSITE: return "composite"; +// } + return stringValue; } public static ObjectModelModifier toValue(String name) { - if (name.equals("public")) { + if (name.equals(PUBLIC.toString())) { return PUBLIC; - } else if (name.equals("private")) { + } else if (name.equals(PRIVATE.toString())) { return PRIVATE; - } else if (name.equals("protected")) { + } else if (name.equals(PROTECTED.toString())) { return PROTECTED; - } else if (name.equals("")) { + } else if (name.equals(PACKAGE.toString())) { return PACKAGE; } else { return null; Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilder.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilder.java 2009-12-08 15:55:00 UTC (rev 739) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilder.java 2009-12-11 09:58:30 UTC (rev 740) @@ -108,7 +108,8 @@ } protected ObjectModelClass createClass(ObjectModelClassImpl clazz, - String name, String packageName, ObjectModelModifier... modifiers) { + String name, String packageName, ObjectModelModifier... modifiers) + throws IllegalArgumentException { clazz.setName(name); clazz.setPackage(packageName); for (ObjectModelModifier modifier : modifiers) { @@ -161,10 +162,11 @@ * @param value default value for the attribute * @param modifiers attribute modifiers * @return the new ObjectModelAttribute added - * @see org.nuiton.eugene.models.object.ObjectModelModifier#isVisibility() + * @throws IllegalArgumentException illegal Modifier + * @see org.nuiton.eugene.models.object.ObjectModelModifier#isVisibility() */ public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type, String value, - ObjectModelModifier... modifiers) { + ObjectModelModifier... modifiers) throws IllegalArgumentException { ObjectModelAttributeImpl attribute = new ObjectModelAttributeImpl(); attribute.setName(name); attribute.setType(type); @@ -208,9 +210,11 @@ * @param maxMultiplicity maximum multiplicity of A in association * @param modifiers for the association * @return the attribute corresponding to the association for classifierA + * @throws IllegalArgumentException illegal modifier */ public ObjectModelAttribute addAssociation(ObjectModelClassifier classifierA, ObjectModelClassifier classifierB, String roleName, - int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) { + int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) + throws IllegalArgumentException { ObjectModelAttributeImpl attribute = new ObjectModelAttributeImpl(); @@ -342,9 +346,11 @@ * @param returnType operation type (full qualified name) * @param modifiers operation modifiers * @return the new ObjectModelOperation added + * @throws IllegalArgumentException illegal Modifier */ public ObjectModelOperation addOperation(ObjectModelClassifier classifier, - String name, String returnType, ObjectModelModifier... modifiers) { + String name, String returnType, ObjectModelModifier... modifiers) + throws IllegalArgumentException{ ObjectModelOperationImpl result = new ObjectModelOperationImpl(); result.setName(name);

1 0

r739 - in branches/eugene-2.0: . eugene eugene-test maven-eugene-plugin
by fdesbois＠users.nuiton.org Dec. 8, 2009

Dec. 8, 2009

Author: fdesbois Date: 2009-12-08 16:55:00 +0100 (Tue, 08 Dec 2009) New Revision: 739 Modified: branches/eugene-2.0/eugene-test/pom.xml branches/eugene-2.0/eugene/pom.xml branches/eugene-2.0/maven-eugene-plugin/pom.xml branches/eugene-2.0/pom.xml Log: Simplification of names : use a convention " :: " for a module Modified: branches/eugene-2.0/eugene/pom.xml =================================================================== --- branches/eugene-2.0/eugene/pom.xml 2009-12-07 17:27:21 UTC (rev 738) +++ branches/eugene-2.0/eugene/pom.xml 2009-12-08 15:55:00 UTC (rev 739) @@ -101,7 +101,7 @@    - <name>EUGene</name> + <name>EUGene :: EUGene</name> <description>Efficient Universal Generator.</description> <inceptionYear>2004</inceptionYear> Modified: branches/eugene-2.0/eugene-test/pom.xml =================================================================== --- branches/eugene-2.0/eugene-test/pom.xml 2009-12-07 17:27:21 UTC (rev 738) +++ branches/eugene-2.0/eugene-test/pom.xml 2009-12-08 15:55:00 UTC (rev 739) @@ -36,7 +36,7 @@   - <name>EUGene Test</name> + <name>EUGene :: Test</name> <description>Test module for generators.</description> <inceptionYear>2007</inceptionYear> Modified: branches/eugene-2.0/maven-eugene-plugin/pom.xml =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-07 17:27:21 UTC (rev 738) +++ branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-08 15:55:00 UTC (rev 739) @@ -57,7 +57,7 @@    - <name>EUGene - plugin maven</name> + <name>EUGene :: Maven plugin</name> <inceptionYear>2006</inceptionYear> <description>maven plugin to use the eugene library</description> Modified: branches/eugene-2.0/pom.xml =================================================================== --- branches/eugene-2.0/pom.xml 2009-12-07 17:27:21 UTC (rev 738) +++ branches/eugene-2.0/pom.xml 2009-12-08 15:55:00 UTC (rev 739) @@ -234,7 +234,7 @@    - <name>EUGene - project</name> + <name>EUGene</name> <description>Efficient Universal Generator</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/eugene</url>

1 0

r738 - in branches/eugene-2.0: . eugene eugene-test maven-eugene-plugin
by fdesbois＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: fdesbois Date: 2009-12-07 18:27:21 +0100 (Mon, 07 Dec 2009) New Revision: 738 Modified: branches/eugene-2.0/eugene-test/pom.xml branches/eugene-2.0/eugene/pom.xml branches/eugene-2.0/maven-eugene-plugin/pom.xml branches/eugene-2.0/pom.xml Log: Increment version to snapshot Modified: branches/eugene-2.0/eugene/pom.xml =================================================================== --- branches/eugene-2.0/eugene/pom.xml 2009-12-07 17:21:35 UTC (rev 737) +++ branches/eugene-2.0/eugene/pom.xml 2009-12-07 17:27:21 UTC (rev 738) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.0/eugene-test/pom.xml =================================================================== --- branches/eugene-2.0/eugene-test/pom.xml 2009-12-07 17:21:35 UTC (rev 737) +++ branches/eugene-2.0/eugene-test/pom.xml 2009-12-07 17:27:21 UTC (rev 738) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.0/maven-eugene-plugin/pom.xml =================================================================== --- branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-07 17:21:35 UTC (rev 737) +++ branches/eugene-2.0/maven-eugene-plugin/pom.xml 2009-12-07 17:27:21 UTC (rev 738) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.0/pom.xml =================================================================== --- branches/eugene-2.0/pom.xml 2009-12-07 17:21:35 UTC (rev 737) +++ branches/eugene-2.0/pom.xml 2009-12-07 17:27:21 UTC (rev 738) @@ -14,7 +14,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> <modules> <module>eugene</module>

1 0

r737 - in trunk: . eugene maven-eugene-plugin
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 18:21:35 +0100 (Mon, 07 Dec 2009) New Revision: 737 Modified: trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2009-12-07 17:21:32 UTC (rev 736) +++ trunk/eugene/pom.xml 2009-12-07 17:21:35 UTC (rev 737) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2009-12-07 17:21:32 UTC (rev 736) +++ trunk/maven-eugene-plugin/pom.xml 2009-12-07 17:21:35 UTC (rev 737) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 17:21:32 UTC (rev 736) +++ trunk/pom.xml 2009-12-07 17:21:35 UTC (rev 737) @@ -13,7 +13,7 @@ </parent> <artifactId>eugene</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>eugene</module> @@ -277,9 +277,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-1.0.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-1.0.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-1.0.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0

r736 - tags
by tchemit＠users.nuiton.org Dec. 7, 2009

Dec. 7, 2009

Author: tchemit Date: 2009-12-07 18:21:32 +0100 (Mon, 07 Dec 2009) New Revision: 736 Added: tags/eugene-1.0.1/ Log: [maven-scm] copy for tag eugene-1.0.1

1 0