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

r891 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:51:07 +0200 (Sat, 08 May 2010) New Revision: 891 Url: http://nuiton.org/repositories/revision/eugene/891 Log: improve log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-08 16:50:39 UTC (rev 890) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-08 16:51:07 UTC (rev 891) @@ -48,7 +48,7 @@ * Created: 22 oct. 2009 * * @author fdesbois - * @version $Revision$ + * @version $Id$ * * Stupid generation of an ObjectModel with Java classes and interfaces. * Use of ImportsManager to get imports for a classifier (added in model in the JavaBuilder which construct @@ -56,8 +56,7 @@ * * The JavaGenerator is based on a ObjectModelGenerator : Java classes are represented by ObjectModelClass, ... * - * Mise a jour: $Date$ - * par : * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" */ public class JavaGenerator extends ObjectModelGenerator { @@ -104,7 +103,7 @@ throws IOException { if (log.isDebugEnabled()) { - log.debug(clazz.getQualifiedName()); + log.debug("Will generate class "+clazz.getQualifiedName()); } preparePrefix(clazz);

1 0

r890 - trunk/maven-eugene-plugin
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:50:39 +0200 (Sat, 08 May 2010) New Revision: 890 Url: http://nuiton.org/repositories/revision/eugene/890 Log: make its works with maven 3 Modified: trunk/maven-eugene-plugin/pom.xml Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-05-08 16:50:20 UTC (rev 889) +++ trunk/maven-eugene-plugin/pom.xml 2010-05-08 16:50:39 UTC (rev 890) @@ -153,6 +153,7 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin>

1 0

r889 - in trunk/maven-eugene-plugin/src/it: . copyVersionFiles/anomalie163 smart-generate/all smart-generate/all/src smart-generate/all/src/main smart-generate/generators
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:50:20 +0200 (Sat, 08 May 2010) New Revision: 889 Url: http://nuiton.org/repositories/revision/eugene/889 Log: make its works with maven 3 Added: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/ Removed: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/java/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/test/ Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml trunk/maven-eugene-plugin/src/it/settings.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -138,7 +138,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.3.0-beta-7</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/maven-eugene-plugin/src/it/settings.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -64,6 +64,18 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> </pluginRepositories> </profile> </profiles> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -50,40 +50,24 @@ <build> <plugins> - - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${project.version}</version> <configuration> - <testPhase>true</testPhase> + <verbose>true</verbose> +  <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <fullPackagePath>org.nuiton</fullPackagePath> - <templates>org.nuiton.eugene.test.BeanTransformer</templates> + <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> </configuration> <executions> <execution> <id>Zargo to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>zargo:src/test/zargo:*.zargo</inputs> + <inputs>zargo:src/main/zargo:*.zargo</inputs> <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> </configuration> <goals> @@ -105,7 +89,7 @@ <id>Model to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>model:target/generated-sources-zargo2Java/test-models:topiatest.objectmodel</inputs> + <inputs>model:target/generated-sources-zargo2Java/models:topiatest.objectmodel</inputs> <outputDirectory>target/generated-sources-objectModel2Java</outputDirectory> </configuration> <goals> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:50:20 UTC (rev 889) @@ -2,46 +2,47 @@ // Zargo to java assert new File(basedir, 'target/generated-sources-zargo2Java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); // Xmi to java + assert new File(basedir, 'target/generated-sources-xmi2Java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Siege.java').exists(); // ObjectModel to java assert new File(basedir, 'target/generated-sources-objectModel2Java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); return true; Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -1,147 +1,152 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>@pom.version@</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>@pom.version@</version> + </parent> - <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-modelreader</artifactId> + <groupId>org.nuiton.test</groupId> + <artifactId>eugene-test-modelreader</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> +  +  +  -  -  -  + <name>EUGene :: Test</name> + <description>Test module for generators.</description> + <inceptionYear>2007</inceptionYear> - <name>EUGene :: Test</name> - <description>Test module for generators.</description> - <inceptionYear>2007</inceptionYear> + <contributors> + <contributor> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <timezone>+2</timezone> + <roles> + <role>Developpeur</role> + </roles> + </contributor> + </contributors> - <contributors> - <contributor> - <name>Florian Desbois</name> - <email>fdesbois(a)codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> +  +  +  -  -  -  + <packaging>jar</packaging> - <packaging>jar</packaging> + <properties> + <processor.version>1.0.3</processor.version> + </properties> + <build> - <build> + <plugins> - <plugins> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <testPhase>true</testPhase> + <defaultPackage>org.nuiton.eugene.test</defaultPackage> + <generatedPackages>org.nuiton</generatedPackages> + </configuration> + <executions> + <execution> + <id>Test Regression Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <execution> + <id>Test Bean Transformer</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest2.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> +  + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <testPhase>true</testPhase> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <generatedPackages>org.nuiton</generatedPackages> - </configuration> - <executions> - <execution> - <id>Test Regression Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - <execution> - <id>Test Bean Transformer</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest2.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> -  - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> + </plugins> - </plugins> + </build> - </build> - </project>

1 0

r888 - trunk
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:49:10 +0200 (Sat, 08 May 2010) New Revision: 888 Url: http://nuiton.org/repositories/revision/eugene/888 Log: Evolution #584: Use maven-helper-plugin 1.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-08 11:54:12 UTC (rev 887) +++ trunk/pom.xml 2010-05-08 16:49:10 UTC (rev 888) @@ -271,6 +271,7 @@ <processor.version>1.0.3</processor.version> <nuiton-utils.version>1.2.2</nuiton-utils.version> + <helper.version>1.2.4-SNAPSHOT</helper.version>  <siteLocales>en,fr</siteLocales>

1 0

r887 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 13:54:12 +0200 (Sat, 08 May 2010) New Revision: 887 Url: http://nuiton.org/repositories/revision/eugene/887 Log: improve MonitorWriter Modified: trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java 2010-05-08 11:12:02 UTC (rev 886) +++ trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java 2010-05-08 11:54:12 UTC (rev 887) @@ -28,6 +28,7 @@ import java.io.FilterWriter; import java.io.IOException; import java.io.StringWriter; +import java.io.Writer; /** * Permet de savoir si on a ecrit dans le flux ou non. L'ecriture d'une chaine @@ -45,16 +46,13 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter boolean modified; - //FIXME : ca sert a quoi duplique cette propriete qui existe dans FilterWriter ? - StringWriter out; public MonitorWriter(StringWriter out) { super(out); - this.out = out; } public StringBuffer getBuffer() { - return out.getBuffer(); + return ((StringWriter)out).getBuffer(); } public boolean isModified() { @@ -79,5 +77,37 @@ modified = true; } + @Override + public void write(String str) throws IOException { + super.write(str); + modified = true; + } + + @Override + public void write(char[] cbuf) throws IOException { + super.write(cbuf); + modified = true; + } + + @Override + public Writer append(CharSequence csq) throws IOException { + Writer writer = super.append(csq); + modified = true; + return writer; + } + + @Override + public Writer append(CharSequence csq, int start, int end) throws IOException { + Writer writer = super.append(csq, start, end); + modified = true; + return writer; + } + + @Override + public Writer append(char c) throws IOException { + Writer writer = super.append(c); + modified = true; + return writer; + } }// MonitorWriter

1 0

r886 - in trunk/eugene/src/main/java/org/nuiton/eugene: . models/object models/state
by fdesbois＠users.nuiton.org May 8, 2010

May 8, 2010

Author: fdesbois Date: 2010-05-08 13:12:02 +0200 (Sat, 08 May 2010) New Revision: 886 Url: http://nuiton.org/repositories/revision/eugene/886 Log: Correction of read method signature : "File[] files" becomes "File... files" Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -36,12 +36,10 @@ * * Created: 26 oct. 2009 * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @param <M> Model to create from reading input files - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public abstract class ModelReader<M extends Model> { private static final Log log = LogFactory.getLog(ModelReader.class); @@ -49,7 +47,7 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource = 0; - protected void setLastModifiedSource(File[] files) { + protected void setLastModifiedSource(File... files) { for (File file : files) { if (file.lastModified() > getLastModifiedSource()) { lastModifiedSource = file.lastModified(); @@ -67,10 +65,10 @@ //TODO-TC : il vaut mieux directement un type dit variable // example : public abstract M read(File... file) {} - public M read(File file) { - return read(new File[] { file }); - } +// public M read(File file) { +// return read(new File[] { file }); +// } - public abstract M read(File[] file); + public abstract M read(File... file); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -58,11 +58,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="objectmodel" */ public class ObjectModelReader extends ModelReader<ObjectModel> { @@ -90,7 +87,7 @@ * stereotype ou des tag value sur les class, attribute ou operation */ @Override - public ObjectModel read(File[] files) { + public ObjectModel read(File... files) { setLastModifiedSource(files); ObjectModel objectModel = new ObjectModelImpl(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -44,11 +44,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ public class StateModelReader extends ModelReader<StateModel> { @@ -56,7 +53,7 @@ private static final Log log = LogFactory.getLog(StateModelReader.class); @Override - public StateModel read(File[] files) { + public StateModel read(File... files) { Digester digester = new Digester(); digester.addRuleSet(new DigesterStateModelRuleSet());

1 0

r885 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 10:14:32 +0200 (Sat, 08 May 2010) New Revision: 885 Url: http://nuiton.org/repositories/revision/eugene/885 Log: - Evolution #576: Create Code Extensions to allow inserting code into object model - Remove deprecated api - Fix javadoc Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java Removed: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java 2010-05-08 08:14:32 UTC (rev 885) @@ -0,0 +1,81 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene.java; + +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.HashMap; +import java.util.Map; + +/** + * To manage some verbatim code to inject in operations. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0.2 + */ +public class CodesManager { + + private static final String EMPTY_STRING = ""; + + /** store of codes associated to operations */ + protected Map<ObjectModelOperation, StringBuilder> codes; + + /** + * Add the {@code annotation} for the given {@code element} of + * the classifier. + * + * @param operation the operation on which add the code + * @param code the code to add + */ + public void addCode(ObjectModelOperation operation, String code) { + Map<ObjectModelOperation, StringBuilder> map = getCodes(); + + StringBuilder buffer = map.get(operation); + if (buffer == null) { + buffer = new StringBuilder(); + map.put(operation, buffer); + } + buffer.append('\n').append(code); + } + + /** + * Obtain the codes registred for a given operation of the classifier. + * + * @param operation the operation where to search for code + * @return the code for the operation (empty if none found) + */ + public String getCode(ObjectModelOperation operation) { + Map<ObjectModelOperation, StringBuilder> map = getCodes(); + StringBuilder buffer = map.get(operation); + return buffer == null ? EMPTY_STRING : buffer.toString(); + } + + protected Map<ObjectModelOperation, StringBuilder> getCodes() { + if (codes == null) { + codes = new HashMap<ObjectModelOperation, StringBuilder>(); + } + return codes; + } +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java 2010-05-08 08:14:32 UTC (rev 885) @@ -0,0 +1,89 @@ +package org.nuiton.eugene.java; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.HashMap; +import java.util.Map; + +/** + * Object model extensions to manage verbatim code to attzach to operations. + * + * @author tchemit <chemit(a)codelutin.com> + * @see CodesManager + * @since 2.0.2 + */ +public class CodesManagerExtension { + + private static final Log log = LogFactory.getLog(CodesManagerExtension.class); + + /** Extension static used to identify CodesManagerExtension in ObjectModel */ + public static final String OBJECTMODEL_EXTENSION = "codes"; + + /** + * Map of CodesManager with key equals to the classifier qualified name + * associated to the CodesManager + */ + protected Map<String, CodesManager> managers; + + /** + * Add the {@code code} for the given {@code operation} of the + * given {@code classifier}. + * + * @param classifier the classifier container of the operation + * @param operation the operation on which to add the code + * @param code the code to add for the operation + */ + public void addcode(ObjectModelClassifier classifier, + ObjectModelOperation operation, + String code) { + CodesManager codesManager = getManager(classifier); + codesManager.addCode(operation, code); + } + + /** + * Get body code for a operation of the given classifier. + * + * The CodesManager must be defined in the model. + * + * @param classifier reference for the codes + * @param operation the operation to seek + * @return the body code of the method + */ + public String getCode(ObjectModelClassifier classifier, + ObjectModelOperation operation) { + CodesManager manager = getManager(classifier); + return manager.getCode(operation); + } + + /** + * Get the CodesManager associated to the classifier. + * + * Note: If not exist, it will be created. + * + * @param classifier reference for the ImportsManager + * @return the codesManager associated to the classifier (never null) + */ + protected CodesManager getManager(ObjectModelClassifier classifier) { + Map<String, CodesManager> managers = getManagers(); + String fqn = classifier.getQualifiedName(); + CodesManager manager = managers.get(fqn); + if (manager == null) { + manager = new CodesManager(); + managers.put(fqn, manager); + if (log.isDebugEnabled()) { + log.debug("Add new codesManager for : " + fqn); + } + } + return manager; + } + + protected Map<String, CodesManager> getManagers() { + if (managers == null) { + managers = new HashMap<String, CodesManager>(); + } + return managers; + } +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-05-07 22:01:06 UTC (rev 884) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java 2010-05-08 08:14:32 UTC (rev 885) @@ -25,53 +25,65 @@ package org.nuiton.eugene.java; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelBuilder; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.ObjectModelType; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.*; -import org.nuiton.eugene.models.object.xml.*; - /** * JavaBuilder TODO heritates it from ModelBuilder * * Created: 29 oct. 2009 + * + * Builder to fill an empty ObjectModel with java specificities + * (imports, only one inheritance, constructor, ...). + * + * JavaBuilder uses some extensions to manage imports , constants, annotations, + * ...in the model. + * + * JavaBuilder is also based on ObjectModelBuilder for the simple filling of + * the model. * * @author fdesbois * @version $Revision$ * - * Builder to fill an empty ObjectModel with java specificities (imports, only one inheritance, constructor, ...). - * JavaBuilder uses ImportsManagerExtension to manage imports in the model. - * JavaBuilder is also based on ObjectModelBuilder for the simple filling of the model. - * - * Mise a jour: $Date$ - * par : */ + */ public class JavaBuilder { private static final Log log = LogFactory.getLog(JavaBuilder.class); - /** - * Builder where the filling is based on - */ + /** Builder where the filling is based on */ protected ObjectModelBuilder modelBuilder; - /** - * ObjectModel extension to manage imports : one ImportsManager by classifier - */ + /** ObjectModel extension to manage imports : one ImportsManager by classifier */ protected ImportsManagerExtension importsManagerExtension; - /** - * ObjectModel extension to manage imports : one ImportsManager by classifier - */ + + /** ObjectModel extension to manage imports : one ImportsManager by classifier */ protected AnnotationsManagerExtension annotationsManagerExtension; - /** - * ObjectModel extension to manage constants : one ConstantsManager for all - */ - protected ConstantsManagerExtension constanssManagerExtension; - @SuppressWarnings("unchecked") + /** ObjectModel extension to manage constants : one ConstantsManager for all */ + protected ConstantsManagerExtension constantsManagerExtension; + + /** ObjectModel extension to manage operation boby codes */ + protected CodesManagerExtension codesManagerExtension; + public JavaBuilder(String modelName) { modelBuilder = new ObjectModelBuilder(modelName); @@ -83,9 +95,13 @@ AnnotationsManagerExtension.OBJECTMODEL_EXTENSION, AnnotationsManagerExtension.class); - constanssManagerExtension = getModel().getExtension( + constantsManagerExtension = getModel().getExtension( ConstantsManagerExtension.OBJECTMODEL_EXTENSION, ConstantsManagerExtension.class); + + codesManagerExtension = getModel().getExtension( + CodesManagerExtension.OBJECTMODEL_EXTENSION, + CodesManagerExtension.class); } /** @@ -97,6 +113,12 @@ return modelBuilder.getModel(); } + /** + * Sets the documentation to the given {@code element}. + * + * @param element the element on which add the documentation + * @param documentation the documentation to add + */ public void setDocumentation(ObjectModelElement element, String documentation) { modelBuilder.setDocumentation(element, documentation); @@ -131,16 +153,16 @@ manager.addImport(oneType); if (log.isDebugEnabled()) { log.debug("Add import for : " + classifier.getQualifiedName() + - " _ import: " + oneType); + " _ import: " + oneType); } } } /** * Add an annotation on an element of a classifier. - * + * * @param classifier where the annotation will be added. - * @param element element on which add annotation + * @param element element on which add annotation * @param annotation annotation to add */ public void addAnnotation(ObjectModelClassifier classifier, @@ -156,23 +178,59 @@ manager.addAnnotation(element, annotation); if (log.isDebugEnabled()) { log.debug("Add annotation for <" + classifier.getQualifiedName() + - ":" + element.getName() + "> : " + annotation); + ":" + element.getName() + "> : " + annotation); } } + /** + * Add a body code to the operation of a classifier. + * + * @param classifier where the body code will be added. + * @param operation operation on which add body code + * @param code code to add + */ + public void addBodyCode(ObjectModelClassifier classifier, + ObjectModelOperation operation, + String code) { + if (code == null) { + return; + } + CodesManager manager = + codesManagerExtension.getManager(classifier); + code = code.trim(); + + manager.addCode(operation, code); + if (log.isDebugEnabled()) { + log.debug("Add code for <" + classifier.getQualifiedName() + + ":" + operation.getName() + "> : " + code); + } + } + + /** + * Converts the given {@code propertyName} to a constant name. + * + * For example : + * <pre> + * "CONSTANT_A" = getConstantName("constantA"); + * </pre> + * + * @param propertyName the name of the property to convert + * @return the constant name + */ public String getConstantName(String propertyName) { - String result = constanssManagerExtension.getConstantName(propertyName); + String result = constantsManagerExtension.getConstantName(propertyName); if (log.isDebugEnabled()) { log.debug("get constant name for <" + propertyName + "> : " + - result); + result); } return result; } + /** * Create a new class in the model. * - * @param name + * @param name the name of the new class to create * @param packageName package's name of the class to create * @return a new ObjectModelClass * @see ObjectModelBuilder#createClass(String, String, ObjectModelModifier...) @@ -184,7 +242,7 @@ /** * Create a new abstract class in the model. * - * @param name + * @param name the name of the abstract class to create * @param packageName package's name of the class to create * @return a new ObjectModelClass * @see ObjectModelBuilder#createClass(String, String, ObjectModelModifier...) @@ -192,13 +250,13 @@ public ObjectModelClass createAbstractClass(String name, String packageName) { return modelBuilder.createClass(name, packageName, - ObjectModelModifier.ABSTRACT); + ObjectModelModifier.ABSTRACT); } /** * Create a new interface in the model * - * @param name + * @param name the name of the interface to create * @param packageName package's name of the interface to create * @return a new ObjectModelInterface * @see ObjectModelBuilder#createInterface(String, String) @@ -211,7 +269,7 @@ /** * Create a new enumration in the model * - * @param name + * @param name the name of the enumeration to create * @param packageName package's name of the enumeration to create * @return a new ObjectModelEnumeration */ @@ -225,15 +283,16 @@ * to the class. * IMPORTS superclassQualifiedName. * - * @param classifier - * @param superclassQualifiedName + * @param classifier the classifier on which to set the super class + * @param superclassQualifiedName fully qualified name of the super class * @see ObjectModelBuilder#addInterface( *ObjectModelClassifier, String) */ public void setSuperClass(ObjectModelClass classifier, String superclassQualifiedName) { ObjectModelClassImpl impl = (ObjectModelClassImpl) classifier; - impl.clearSuperclasses(); // suppress all existing superclass: only one can be set for java + // suppress all existing superclass: only one can be set for java + impl.clearSuperclasses(); modelBuilder.addSuperclass(impl, superclassQualifiedName); addImport(classifier, superclassQualifiedName); } @@ -242,8 +301,8 @@ * Add an interface to a classifier (interface, class, enum). * IMPORTS interfaceQualifiedName. * - * @param classifier - * @param interfaceQualifiedName + * @param classifier the classifier on which to add the interface + * @param interfaceQualifiedName fully qualified name of the interface * @see ObjectModelBuilder#addInterface( *ObjectModelClassifier, String) */ @@ -257,11 +316,11 @@ * Add a new attribute to a classifier. * IMPORTS type, value. * - * @param classifier - * @param name - * @param type - * @param value - * @param modifiers + * @param classifier the classifier on which to add the attribute + * @param name name of attribute + * @param type type of attribute + * @param value initializer value of attribute + * @param modifiers modifiers of the attribute * @return a new ObjectModelAttribute * @see ObjectModelBuilder#addAttribute(ObjectModelClassifier, String, String, String, ObjectModelModifier...) */ @@ -274,8 +333,12 @@ // ANO#474 FD-20100408 : problem with import from defaultValue, will // not be supported from version 2.0.1 //this.addImport(classifier, value); - return modelBuilder.addAttribute(classifier, name, type, value, - modifiers); + return modelBuilder.addAttribute(classifier, + name, + type, + value, + modifiers + ); } /** @@ -283,10 +346,10 @@ * and have a value. * IMPORTS type, value. * - * @param classifier - * @param name - * @param type - * @param value + * @param classifier the classifier on which to add the constant field + * @param name name of the constant field + * @param type type of the constant field + * @param value initializer value of the constant field * @param visibility modifier allowed : PUBLIC, PRIVATE, PROTECTED, PACKAGE * @return a new ObjectModelAttribute * @throws IllegalArgumentException if the modifier is not a visibility @@ -298,13 +361,19 @@ ObjectModelModifier visibility) throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + - visibility.name() + + throw new IllegalArgumentException( + "Illegal visibility type : " + visibility.name() + " for " + classifier.getQualifiedName()); } - return addAttribute(classifier, name, type, value, visibility, - ObjectModelModifier.STATIC, ObjectModelModifier.FINAL); + return addAttribute(classifier, + name, + type, + value, + visibility, + ObjectModelModifier.STATIC, + ObjectModelModifier.FINAL + ); } /** @@ -312,24 +381,28 @@ * Default visibility is set to PROTECTED. * IMPORTS type. * - * @param classifier - * @param name - * @param type + * @param classifier the classifier on which add the attribute + * @param name name of the attribute + * @param type type of the attribute * @return a new ObjectModelAttribute */ public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type) { - return addAttribute(classifier, name, type, "", - ObjectModelModifier.PROTECTED); + return addAttribute(classifier, + name, + type, + "", + ObjectModelModifier.PROTECTED + ); } /** * Add a new attribute to a classifier from an existing attribute. * IMPORTS attribute.getType() and attribute.getDefaultValue(). * - * @param classifier - * @param attribute + * @param classifier the classifier on which to add the attribute + * @param attribute the attribute to add * @return a new ObjectModelAttribute */ public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, @@ -353,20 +426,22 @@ modifiers.add(ObjectModelModifier.PACKAGE); } - return addAttribute(classifier, + return addAttribute( + classifier, attribute.getName(), attribute.getType(), attribute.getDefaultValue(), - modifiers.toArray(new ObjectModelModifier[modifiers.size()])); + modifiers.toArray(new ObjectModelModifier[modifiers.size()]) + ); } /** * Add a new operation to a classifier. * - * @param classifier - * @param name - * @param type - * @param modifiers + * @param classifier the classifier on which to add the operation + * @param name the name of the operation + * @param type the return type of the operation + * @param modifiers the modifiers of the operation * @return a new ObjectModelOperation * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) */ @@ -381,13 +456,13 @@ /** * Add a new block to a classifier. * - * @param classifier - * @param modifiers + * @param classifier the classifier on which to add the block + * @param modifiers the modifiers of the operation * @return a new ObjectModelOperation * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) */ - public ObjectModelOperation addBlock(ObjectModelClassifier classifier, - ObjectModelModifier... modifiers) { + public ObjectModelOperation addBlock(ObjectModelClassifier classifier, + ObjectModelModifier... modifiers) { ObjectModelOperationImpl operation = (ObjectModelOperationImpl) modelBuilder.addOperation(classifier, null, null, modifiers); if (Arrays.asList(modifiers).contains(ObjectModelModifier.STATIC)) { @@ -399,17 +474,18 @@ /** * Add a constructor to a class. * - * @param clazz - * @param visibility + * @param clazz the classifier on which to add the constructor + * @param visibility the visibility of the operation * @return a new ObjectModelOperation * @throws IllegalArgumentException if the modifier is not a visibility + * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...) */ public ObjectModelOperation addConstructor(ObjectModelClass clazz, ObjectModelModifier visibility) throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + - visibility.name() + + throw new IllegalArgumentException( + "Illegal visibility type : " + visibility.name() + " for " + clazz.getQualifiedName()); } @@ -419,49 +495,46 @@ /** * Add a new parameter to an existing operation. * - * @param operation - * @param type - * @param name + * @param operation the operation on which to add a parameter + * @param type the type of the parameter + * @param name the name of the parameter * @return a new ObjectModelParameter - * @see ObjectModelBuilder#addParameter( - *ObjectModelOperation, String, String) + * @see ObjectModelBuilder#addParameter(ObjectModelOperation, String, String) */ public ObjectModelParameter addParameter(ObjectModelOperation operation, String type, String name) { addImport((ObjectModelClassifier) operation.getDeclaringElement(), - type); + type); return modelBuilder.addParameter(operation, type, name); } /** * Add an exception to an operation. * - * @param operation - * @param exception - * @see ObjectModelBuilder#addException( - *ObjectModelOperation, String) + * @param operation the operation on which to add a exeception + * @param exception the exception to add + * @see ObjectModelBuilder#addException(ObjectModelOperation, String) */ public void addException(ObjectModelOperation operation, String exception) { addImport((ObjectModelClassifier) operation.getDeclaringElement(), - exception); + exception); modelBuilder.addException(operation, exception); } /** * Set the operation body code. * - * @param operation - * @param body + * @param operation the operation on which to add the body code + * @param body the body code to set on the operation * @throws IllegalArgumentException if operation is abstract - * @see ObjectModelBuilder#setOperationBody( - *ObjectModelOperation, String) + * @see ObjectModelBuilder#setOperationBody(ObjectModelOperation, String) */ public void setOperationBody(ObjectModelOperation operation, String body) throws IllegalArgumentException { if (operation.isAbstract()) { - throw new IllegalArgumentException("Unable to add body for an " + - "abstract method"); + throw new IllegalArgumentException( + "Unable to add body for an abstract method"); } modelBuilder.setOperationBody(operation, body); } @@ -473,18 +546,36 @@ return modelBuilder.addInnerClassifier(clazz, type, name); } + /** + * Add a constructor to a enumeration. + * + * @param enumeration the enumeration on which to add the constructor + * @param visibility the visibility of the constructor (should always to private...) + * @return the new constructor + * @throws IllegalArgumentException if visibility is not ok + */ public ObjectModelOperation addConstructor(ObjectModelEnumeration enumeration, ObjectModelModifier visibility) throws IllegalArgumentException { if (!visibility.isVisibility()) { - throw new IllegalArgumentException("Illegal visibility type : " + - visibility.name() + + throw new IllegalArgumentException( + "Illegal visibility type : " + visibility.name() + " for " + enumeration.getQualifiedName()); } - return addOperation(enumeration, enumeration.getName(), null, visibility); + return addOperation(enumeration, + enumeration.getName(), + null, + visibility + ); } + /** + * Add a literal to the given {@code classifier}. + * + * @param classifier the enumeration on which to add the literal + * @param name the name of the literal to add + */ public void addLiteral(ObjectModelEnumeration classifier, String name) { modelBuilder.addLiteral(classifier, name); } Deleted: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java 2010-05-07 22:01:06 UTC (rev 884) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelVisibility.java 2010-05-08 08:14:32 UTC (rev 885) @@ -1,35 +0,0 @@ -/* - * #%L - * EUGene :: EUGene - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.eugene.models.object; - -/** - * - * @author fdesbois - */ -@Deprecated -public enum ObjectModelVisibility { - PUBLIC, PROTECTED, PRIVATE, PACKAGE -}

1 0

r884 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 7, 2010

May 7, 2010

Author: tchemit Date: 2010-05-08 00:01:06 +0200 (Sat, 08 May 2010) New Revision: 884 Url: http://nuiton.org/repositories/revision/eugene/884 Log: remove logs Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-07 21:57:37 UTC (rev 883) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-07 22:01:06 UTC (rev 884) @@ -102,7 +102,6 @@ ObjectModelClassifier classifier = constantsDependencies.getSupplier(); - log.info("constantsDependencies = " + classifier); if (classifier instanceof ObjectModelEnumeration) { ObjectModelEnumeration constants = @@ -122,8 +121,6 @@ ); } } - } else { - log.info("No constantsDependencies for " + interfacez); } // interface operations

1 0

r883 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 7, 2010

May 7, 2010

Author: tchemit Date: 2010-05-07 23:57:37 +0200 (Fri, 07 May 2010) New Revision: 883 Url: http://nuiton.org/repositories/revision/eugene/883 Log: - Evolution #581: Do not generates modifiers on a constant for an Interface - Evolution #582: Add dependency 'constants' Enumeration to attach constants to an Interface Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-04 12:49:54 UTC (rev 882) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-07 21:57:37 UTC (rev 883) @@ -394,6 +394,14 @@ String attrType = GeneratorUtil.getSimpleName(attr.getType()); String attrStatic = attr.isStatic() ? " static" : ""; String attrFinal = attr.isFinal() ? " final" : ""; + if (clazz instanceof ObjectModelInterface) { + + //tchemit 20100507 no modifier for constants in interfaces + attrFinal = ""; + attrStatic = ""; + attrVisibility = ""; + } + String attrValue = StringUtils.isNotEmpty(attr.getDefaultValue()) ? // ANO#474 FD-20100408 : Don't do any simplification for // defaultValue, must be managed when the attribute is added Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-04 12:49:54 UTC (rev 882) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-05-07 21:57:37 UTC (rev 883) @@ -42,6 +42,15 @@ public static final String STEREOTYPE_BEAN = "bean"; /** + * dependency to add constants in interfaces via an enumeration. + * + * The literals of enumeration will be the value, and constant names will + * be generated by transformers. + * @since 2.0.2 + */ + public static final String DEPENDENCIES_CONSTANTS = "constants"; + + /** * Duplicates in the {@code target} classifier the given {@code operations} * using a {@code transformer} to modify model. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-04 12:49:54 UTC (rev 882) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-05-07 21:57:37 UTC (rev 883) @@ -29,9 +29,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; +import java.util.Collection; import java.util.Iterator; /*{generator option: parentheses = false}*/ @@ -81,16 +85,52 @@ // only static attribut with value if (!attr.isStatic() && StringUtils.isNotEmpty(attr.getDefaultValue())) { - addConstant(resultInterface, attr.getName(), attr.getType(), - attr.getDefaultValue(), ObjectModelModifier.PUBLIC); + addConstant(resultInterface, + attr.getName(), + attr.getType(), + attr.getDefaultValue(), + ObjectModelModifier.PUBLIC + ); } } + // constant attributes via 'constants' enumeration dependency + // literals of enumeration will be values and constant name will be generated + ObjectModelDependency constantsDependencies = + interfacez.getDependency(JavaGeneratorUtil.DEPENDENCIES_CONSTANTS); + if (constantsDependencies != null) { + + ObjectModelClassifier classifier = constantsDependencies.getSupplier(); + + log.info("constantsDependencies = " + classifier); + if (classifier instanceof ObjectModelEnumeration) { + + ObjectModelEnumeration constants = + (ObjectModelEnumeration) classifier; + + // add all literal of dependency as constants in interface + Collection<String> literals = constants.getLiterals(); + for (String literal : literals) { + + String constantName = getConstantName(literal); + + addConstant(resultInterface, + constantName, + String.class, + "\"" + literal + "\"", + ObjectModelModifier.PUBLIC + ); + } + } + } else { + log.info("No constantsDependencies for " + interfacez); + } + // interface operations JavaGeneratorUtil.cloneOperations(this, - interfacez.getOperations(), - resultInterface, - false + interfacez.getOperations(), + resultInterface, + false ); } }

1 0

r882 - trunk/eugene/src/main/java/org/nuiton/eugene
by fdesbois＠users.nuiton.org May 4, 2010

May 4, 2010

Author: fdesbois Date: 2010-05-04 14:49:54 +0200 (Tue, 04 May 2010) New Revision: 882 Url: http://nuiton.org/repositories/revision/eugene/882 Log: remove import *, give explicit imports to classes Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-04-29 12:01:12 UTC (rev 881) +++ trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-05-04 12:49:54 UTC (rev 882) @@ -25,9 +25,14 @@ package org.nuiton.eugene; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; import org.nuiton.eugene.models.Model; -import java.io.*; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0