Author: chatellier Date: 2009-03-04 09:38:47 +0000 (Wed, 04 Mar 2009) New Revision: 462 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: Fix NullPointerException Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-02-27 17:55:57 UTC (rev 461) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-04 09:38:47 UTC (rev 462) @@ -40,12 +40,14 @@ * * Exemple d'utilisation dans ant : * + * <pre> * <taskdef name="generator" classname="org.codelutin.generator.GeneratorTask" - * classpath="${lib}/lutingenerator-0.64.jar" /> + * classpath="lib/lutingenerator-0.64.jar" /> * * <generator * template="org.codelutin.generator.generators.persistence.TopiaModelToDTOGenerator.java,org.codelutin.generator.generators.persistence.TopiaModelToTJDOGenerator.java" - * destdir="target/gen/java" srcdir="target/gen/model" includes="*.xmi"/> + * destdir="target/gen/java" srcdir="target/gen/model" /> + * </pre> * * Created: 14 janv. 2004 * @@ -58,7 +60,35 @@ */ public class GeneratorTask extends MatchingTask { // GeneratorTask + /** Template used in generation (comma separated). */ + protected String templates = null; + + /** Template to exclude in templates list. */ + protected List<String> excludeTemplates; + + /** Model directory. */ + protected File srcDir = null; + + /** Single model file. */ + protected File srcFile = null; + + /** Destination directory. */ + protected File destDir = null; + + /** Additional generator properties. */ + protected Properties properties = new Properties(); + + /** Overwrite already existing generated files. */ + protected boolean overwrite = true; + + /** customized classloader. */ + protected ClassLoader loader; + + /** Enconding. Default to UTF-8. */ + protected String encoding = "UTF-8"; + public GeneratorTask() { + } protected void doExecute(File srcFile, File destDir, Generator[] generators) @@ -80,25 +110,6 @@ } } - protected String templates = null; - - protected List<String> excludeTemplates; - - protected File srcDir = null; - - protected File srcFile = null; - - protected File destDir = null; - - protected Properties properties = new Properties(); - - protected boolean overwrite = true; - - // to enable a customized classloader - protected ClassLoader loader; - - protected String encoding; - public void setOverwrite(boolean v) { overwrite = v; } @@ -155,7 +166,7 @@ List<String> templateGenerators = Arrays.asList(templates.split(",")); for (Iterator<String> it = templateGenerators.iterator(); it.hasNext();) { String templateGenerator = it.next(); - if (excludeTemplates.contains(templateGenerator)) { + if (excludeTemplates != null && excludeTemplates.contains(templateGenerator)) { it.remove(); } }