Author: tchemit Date: 2008-11-01 19:51:42 +0000 (Sat, 01 Nov 2008) New Revision: 359 Modified: lutingenerator/trunk/changelog lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java maven-generator-plugin/trunk/changelog maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: fix javadoc add excludeTempates property on Generator, GeneratorTaks and GeneratorPlugin to excludes some generators on composite generators Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/changelog 2008-11-01 19:51:42 UTC (rev 359) @@ -1,6 +1,7 @@ 0.61 chemit 200811?? * 20081101 [chemit] - - add a prent setter on ChildGenerator + - add a parent setter on ChildGenerator + - add an excludeTemplates property on Generator and GeneratorTask to permit exclusion of generators for some composite generator 0.60 chemit 20081013 * 20081013 [chemit] Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-01 19:51:42 UTC (rev 359) @@ -26,6 +26,7 @@ import java.io.File; import java.util.Properties; +import java.util.List; import java.io.Writer; import java.io.IOException; import java.io.FileWriter; @@ -48,6 +49,8 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource = 0; + protected List<String> excludeTemplates; + public Generator(){ } @@ -73,17 +76,19 @@ } /** - * Permet de recuperer les proprietes passé en argument - */ + * Permet de recuperer la proprieté passé en argument + * @param name le nom de la propriete + * @return la valeur de la propriété + */ public String getProperty(String name){ return properties.getProperty(name); } protected void setLastModifiedSource(File [] files){ - for (int i = 0; i < files.length; i++) { - if(isNewerThanSource(files[i])){ - lastModifiedSource = files[i].lastModified(); - log.debug("source date: "+lastModifiedSource+" files[i] date: "+files[i].lastModified()+ "("+files[i]+")"); + for (File file : files) { + if (isNewerThanSource(file)) { + lastModifiedSource = file.lastModified(); + log.debug("source date: " + lastModifiedSource + " files[i] date: " + file.lastModified() + "(" + file + ")"); } } } @@ -93,7 +98,8 @@ } /** - * @return vrai si le fichier passé en parametre est plus recent que + * @param file fichier a tester + * @return vrai si le fichier passé en parametre est plus recent que * les sources sur generateur. */ protected boolean isNewerThanSource(File file){ @@ -121,6 +127,14 @@ } } + public List<String> getExcludeTemplates() { + return excludeTemplates; + } + + public void setExcludeTemplates(List<String> excludeTemplates) { + this.excludeTemplates = excludeTemplates; + } + public abstract void generate(File[] file, File destDir); } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-01 19:51:42 UTC (rev 359) @@ -32,6 +32,9 @@ import java.io.File; import java.util.Properties; +import java.util.List; +import java.util.Arrays; +import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; @@ -69,8 +72,10 @@ protected String templates = null; - protected File srcDir = null; + protected List<String> excludeTemplates; + protected File srcDir = null; + protected File srcFile = null; protected File destDir = null; @@ -87,7 +92,11 @@ this.templates = templates; } - /** + public void setExcludeTemplates(List<String> excludeTemplates) { + this.excludeTemplates = excludeTemplates; + } + + /** * Permet d'ajouter des properties. exemple: toto=1,package=org.codelutin * @param properties TODO */ @@ -119,27 +128,36 @@ throw new BuildException("templates attribute must be set!", getLocation()); } - String[] templateGenerators = templates.split(","); - generators = new Generator[templateGenerators.length]; - for (int i = 0; i < templateGenerators.length; i++) { - try { - generators[i] = (Generator) Class - .forName(templateGenerators[i]).newInstance(); - } catch (ClassCastException eee) { + List<String> templateGenerators = Arrays.asList(templates.split(",")); + for (Iterator<String> it = templateGenerators.iterator(); it.hasNext();) { + String templateGenerator = it.next(); + if (excludeTemplates.contains(templateGenerator)) { + it.remove(); + } + } + generators = new Generator[templateGenerators.size()]; + for (int i = 0; i < templateGenerators.size(); i++) { + String templateName = templateGenerators.get(i); + try { + generators[i] = (Generator) Class + .forName(templateName).newInstance(); + generators[i].setExcludeTemplates(excludeTemplates); + + } catch (ClassCastException eee) { System.out.println("Generator don't herite Generator Class : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (ClassNotFoundException eee) { System.out.println("Unable to find generator : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (InstantiationException eee) { System.out.println("Unable to instanciate template : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (IllegalAccessException eee) { System.out.println("Unable to parse topia input file : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } } Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-01 18:58:52 UTC (rev 358) +++ maven-generator-plugin/trunk/changelog 2008-11-01 19:51:42 UTC (rev 359) @@ -1,5 +1,6 @@ 0.61 chemit 200811?? * 20081101 [chemit] + - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator - bump lutingenerator to 0.61 0.60 chemit 20081013 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 18:58:52 UTC (rev 358) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 19:51:42 UTC (rev 359) @@ -29,11 +29,11 @@ package org.codelutin.generator.plugin; +import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import org.apache.maven.model.Resource; import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; @@ -41,6 +41,7 @@ import java.io.File; import java.util.Arrays; +import java.util.List; /** * Effectue toutes les générations et copie les fichiers générés @@ -82,6 +83,14 @@ protected String templates; /** + * Templates à ne pas utiliser + * + * @parameter + */ + protected List<String> excludeTemplates; + + + /** * Fichier à inclure * * @parameter @@ -135,10 +144,11 @@ generator.setDestdir(destDirGen); fixCompileSourceRoots(); - + generator.setProperties("defaultPackage=" + defaultPackage); generator.setIncludes(includes); + generator.setExcludeTemplates(excludeTemplates); /* Execution */ generator.execute(); @@ -150,12 +160,12 @@ */ protected void fixCompileSourceRoots() { if (!project.getCompileSourceRoots().contains(destDirGen.getPath())) { - getLog().info("add compile source root : "+destDirGen); + getLog().info("add compile source root : " + destDirGen); project.addCompileSourceRoot(destDirGen.getPath()); - Resource resources =new Resource(); + Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("add resource root :"+resources); + getLog().info("add resource root :" + resources); project.addResource(resources); }