Index: lutingenerator/src/java/org/codelutin/generator/ObjectModelGenerator.java
diff -u lutingenerator/src/java/org/codelutin/generator/ObjectModelGenerator.java:1.16 lutingenerator/src/java/org/codelutin/generator/ObjectModelGenerator.java:1.17
--- lutingenerator/src/java/org/codelutin/generator/ObjectModelGenerator.java:1.16	Fri Aug  6 17:46:45 2004
+++ lutingenerator/src/java/org/codelutin/generator/ObjectModelGenerator.java	Fri Sep 30 17:30:21 2005
@@ -23,10 +23,10 @@
 *
 * @author Benjamin Poussin <poussin@codelutin.com>
 * Copyright Code Lutin
-* @version $Revision: 1.16 $
+* @version $Revision: 1.17 $
 *
-* Mise a jour: $Date: 2004/08/06 17:46:45 $
-* par : $Author: bpoussin $
+* Mise a jour: $Date: 2005/09/30 17:30:21 $
+* par : $Author: pineau $
 */
 
 package org.codelutin.generator;
@@ -92,8 +92,8 @@
     }
 
     /**
-    * @param filename le nom d'un fichier existant contenant du XML
-    *                 représentant un ObjectModel
+    * @param files les noms des fichiers existant contenant du XML
+    *                 représentant des ObjectModel
     * @param destDir le répertoire dans lequel il faudra mettre les fichiers
     *                générés
     */

Index: lutingenerator/src/java/org/codelutin/generator/GeneratorTask.java
diff -u lutingenerator/src/java/org/codelutin/generator/GeneratorTask.java:1.9 lutingenerator/src/java/org/codelutin/generator/GeneratorTask.java:1.10
--- lutingenerator/src/java/org/codelutin/generator/GeneratorTask.java:1.9	Wed Aug  4 08:53:16 2004
+++ lutingenerator/src/java/org/codelutin/generator/GeneratorTask.java	Fri Sep 30 17:30:21 2005
@@ -23,23 +23,22 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  *
- * Mise a jour: $Date: 2004/08/04 08:53:16 $
- * par : $Author: bpoussin $
+ * Mise a jour: $Date: 2005/09/30 17:30:21 $
+ * par : $Author: pineau $
  */
 
 package org.codelutin.generator;
 
 import java.io.File;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.MatchingTask;
-import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.logging.Level;
 
 /**
  * exemple d'utilisation dans ant <generator
@@ -48,139 +47,144 @@
  */
 public class GeneratorTask extends MatchingTask { // GeneratorTask
 
-    public GeneratorTask() {
-    }
+	public GeneratorTask() {
+	}
 
-    protected void doExecute(File srcFile, File destDir, Generator[] generators)
-            throws BuildException {
-        doExecute(new File[] { srcFile }, destDir, generators);
-
-    }
-
-    protected void doExecute(File[] srcFiles, File destDir,
-            Generator[] generators) throws BuildException {
-        log("Transforming " + srcFile + " into " + destDir);
-        for (int i = 0; i < generators.length; i++) {
-            if (generators[i] != null) {
-                generators[i].setProperties(properties);
-                generators[i].setOverwrite(overwrite);
-                generators[i].generate(srcFiles, destDir);
-            }
-        }
-    }
-
-    protected String templates = null;
-    protected File srcDir = null;
-    protected File srcFile = null;
-    protected File destDir = null;
-    protected Properties properties = new Properties();
-    protected boolean overwrite = true;
-
-    public void setOverwrite(boolean v){
-        overwrite = v;
-    }
-
-    public void setTemplates(String templates) {
-        this.templates = templates;
-    }
-
-    /**
-    * Permet d'ajouter des properties.
-    * exemple: toto=1,package=org.codelutin
-    */
-    public void setProperties(String properties){
-        String [] props = properties.split(",");
-        for(int i=0; i<props.length; i++){
-            String [] pv = props[i].split("=");
-            this.properties.put(pv[0], pv[1]);
-        }
-        Logger.getLogger(getClass().getName() + ".setProperties").log(Level.FINE, "Properties "+this.properties);
-    }
-
-    public void setSrcdir(File srcDir) {
-        this.srcDir = srcDir;
-    }
-
-    public void setDestdir(File destDir) {
-        this.destDir = destDir;
-    }
-
-    public void setSrcFile(File srcFile) {
-        this.srcFile = srcFile;
-    }
-
-    public void execute() throws BuildException {
-        Generator[] generators = null;
-        if (templates == null) {
-            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) {
-                System.out.println("Generator don't herite Generator Class : "
-                        + templateGenerators[i]);
-                eee.printStackTrace();
-            } catch (ClassNotFoundException eee) {
-                System.out.println("Unable to find generator : "
-                        + templateGenerators[i]);
-                eee.printStackTrace();
-            } catch (InstantiationException eee) {
-                System.out.println("Unable to instanciate template : "
-                        + templateGenerators[i]);
-                eee.printStackTrace();
-            } catch (IllegalAccessException eee) {
-                System.out.println("Unable to parse topia input file : "
-                        + templateGenerators[i]);
-                eee.printStackTrace();
-            }
-        }
-
-        if (generators == null) {
-            throw new BuildException("templates " + templates
-                    + " can't be found!", getLocation());
-        }
-
-        if (destDir == null) {
-            throw new BuildException("destDir attribute must be set!",
-                    getLocation());
-        }
-
-        if (!destDir.isDirectory()) {
-            throw new BuildException("destination directory \"" + destDir
-                    + "\" does not exist or is not a directory", getLocation());
-        }
-
-        if (srcFile == null && srcDir == null) {
-            throw new BuildException(
-                    "srcFile or srcdir attribute must be set!", getLocation());
-        }
-
-        if (srcFile != null && !srcFile.isFile()) {
-            throw new BuildException("src file \"" + srcFile
-                    + "\" does not exist or is not a file", getLocation());
-        }
-
-        if (srcFile != null) {
-            // generate the source files
-            doExecute(srcFile, destDir, generators);
-        } else {
-            DirectoryScanner scanner;
-            String[] includedFilenames;
-            scanner = getDirectoryScanner(srcDir);
-
-            // Process all the files marked for styling
-            includedFilenames = scanner.getIncludedFiles();
-            File[] includedFiles = new File[includedFilenames.length];
-            for (int i = 0; i < includedFilenames.length; ++i) {
-                includedFiles[i] = new File(srcDir, includedFilenames[i]);
-            }
-            doExecute(includedFiles, destDir, generators);
-        }
-    }
+	protected void doExecute(File srcFile, File destDir, Generator[] generators)
+			throws BuildException {
+		doExecute(new File[] { srcFile }, destDir, generators);
+
+	}
+
+	protected void doExecute(File[] srcFiles, File destDir,
+			Generator[] generators) throws BuildException {
+		for (int i = 0; i < generators.length; i++) {
+			log("Applying " + generators[i].getClass().getName() + " into " + destDir);
+			if (generators[i] != null) {
+				generators[i].setProperties(properties);
+				generators[i].setOverwrite(overwrite);
+				generators[i].generate(srcFiles, destDir);
+			}
+		}
+	}
+
+	protected String templates = null;
+
+	protected File srcDir = null;
+
+	protected File srcFile = null;
+
+	protected File destDir = null;
+
+	protected Properties properties = new Properties();
+
+	protected boolean overwrite = true;
+
+	public void setOverwrite(boolean v) {
+		overwrite = v;
+	}
+
+	public void setTemplates(String templates) {
+		this.templates = templates;
+	}
+
+	/**
+	 * Permet d'ajouter des properties. exemple: toto=1,package=org.codelutin
+	 */
+	public void setProperties(String properties) {
+		String[] props = properties.split(",");
+		for (int i = 0; i < props.length; i++) {
+			String[] pv = props[i].split("=");
+			this.properties.put(pv[0], pv[1]);
+		}
+		Logger.getLogger(getClass().getName() + ".setProperties").log(
+				Level.FINE, "Properties " + this.properties);
+	}
+
+	public void setSrcdir(File srcDir) {
+		this.srcDir = srcDir;
+	}
+
+	public void setDestdir(File destDir) {
+		this.destDir = destDir;
+	}
+
+	public void setSrcFile(File srcFile) {
+		this.srcFile = srcFile;
+	}
+
+	public void execute() throws BuildException {
+		Generator[] generators = null;
+		if (templates == null) {
+			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) {
+				System.out.println("Generator don't herite Generator Class : "
+						+ templateGenerators[i]);
+				eee.printStackTrace();
+			} catch (ClassNotFoundException eee) {
+				System.out.println("Unable to find generator : "
+						+ templateGenerators[i]);
+				eee.printStackTrace();
+			} catch (InstantiationException eee) {
+				System.out.println("Unable to instanciate template : "
+						+ templateGenerators[i]);
+				eee.printStackTrace();
+			} catch (IllegalAccessException eee) {
+				System.out.println("Unable to parse topia input file : "
+						+ templateGenerators[i]);
+				eee.printStackTrace();
+			}
+		}
+
+		if (generators == null) {
+			throw new BuildException("templates " + templates
+					+ " can't be found!", getLocation());
+		}
+
+		if (destDir == null) {
+			throw new BuildException("destDir attribute must be set!",
+					getLocation());
+		}
+
+		if (!destDir.isDirectory()) {
+			throw new BuildException("destination directory \"" + destDir
+					+ "\" does not exist or is not a directory", getLocation());
+		}
+
+		if (srcFile == null && srcDir == null) {
+			throw new BuildException(
+					"srcFile or srcdir attribute must be set!", getLocation());
+		}
+
+		if (srcFile != null && !srcFile.isFile()) {
+			throw new BuildException("src file \"" + srcFile
+					+ "\" does not exist or is not a file", getLocation());
+		}
+
+		if (srcFile != null) {
+			// generate the source files
+			doExecute(srcFile, destDir, generators);
+		} else {
+			DirectoryScanner scanner;
+			String[] includedFilenames;
+			scanner = getDirectoryScanner(srcDir);
+
+			// Process all the files marked for styling
+			includedFilenames = scanner.getIncludedFiles();
+			File[] includedFiles = new File[includedFilenames.length];
+			for (int i = 0; i < includedFilenames.length; ++i) {
+				includedFiles[i] = new File(srcDir, includedFilenames[i]);
+			}
+			doExecute(includedFiles, destDir, generators);
+		}
+	}
 
 } // GeneratorTask