Changeset 2672

Timestamp:

03/08/10 13:26:05 (2 years ago)

Author:

mswertz

Message:

Enhanced log messages showing completion.

File:

• molgenis/3.3/src/org/molgenis/Molgenis.java (modified) (5 diffs)

molgenis/3.3/src/org/molgenis/Molgenis.java

@@ -14 +14 @@
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -33 +34 @@
 import org.molgenis.generators.csv.CsvImportGen;
 import org.molgenis.generators.csv.CsvReaderGen;
-import org.molgenis.generators.db.CopyMemoryToDatabaseGen;
 import org.molgenis.generators.db.InMemoryDatabaseGen;
 import org.molgenis.generators.db.JDBCDatabaseGen;
@@ -41 +41 @@
 import org.molgenis.generators.db.PStatementMapperGen;
 import org.molgenis.generators.db.ViewMapperGen;
-import org.molgenis.generators.doc.FileFormatDocGen;
 import org.molgenis.generators.doc.DotDocGen;
 import org.molgenis.generators.doc.DotDocMinimalGen;
 import org.molgenis.generators.doc.EntityModelDocGen;
+import org.molgenis.generators.doc.FileFormatDocGen;
 import org.molgenis.generators.doc.ObjectModelDocGen;
 import org.molgenis.generators.doc.TableDocGen;
@@ -79 +79 @@
 public class Molgenis
 {
-        Logger logger = Logger.getLogger("main");
+        Logger logger = Logger.getLogger("MOLGENIS");
         MolgenisOptions options = null;
         Model model = null;
         List<Generator> generators = new ArrayList<Generator>();
 
-        public <T extends Generator> Molgenis(Class<T> ... generatorsToUse) throws Exception
+        public Molgenis(Class ... generatorsToUse) throws Exception
         {
                 this(new MolgenisOptions("molgenis.properties"),generatorsToUse);
@@ -269 +269 @@
         {
                 logger.info("generating ....");
-                logger.info("\nUsing options:\n" + options.toString());         
+                logger.info("\nUsing options:\n" + options.toString()); 
+                
+                File generatedFolder = new File(options.output_src);
+                logger.info("removing previous generated folder "+generatedFolder);
+                generatedFolder.delete();
+                
                 for (Generator g : generators)
                 {
                         g.generate(model, options);
                 }
+                logger.info("Generation completed at "+new Date());
         }