Changeset 2446

Timestamp:

11/30/09 22:56:20 (2 years ago)

Author:

mswertz

Message:

Copied cmdline package into MOLGENIS.

Location:

molgenis/3.3/src/org/molgenis

Files:

• Molgenis.java (modified) (2 diffs)
• MolgenisOptions.java (modified) (4 diffs)

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

@@ -68 +68 @@
 import org.molgenis.model.elements.Model;
 
-import cmdline.CmdLineException;
+import org.molgenis.util.cmdline.CmdLineException;
 
 /**
@@ -211 +211 @@
 
                 // HTML
-                generators.add(new HtmlFormGen());
+                //generators.add(new HtmlFormGen());
 
                 // ServletContext

molgenis/3.3/src/org/molgenis/MolgenisOptions.java

@@ -11 +11 @@
 import org.apache.log4j.Logger;
 
-import cmdline.CmdLineException;
-import cmdline.CmdLineParser;
-import cmdline.Option;
+import org.molgenis.util.cmdline.CmdLineException;
+import org.molgenis.util.cmdline.CmdLineParser;
+import org.molgenis.util.cmdline.Option;
 
 /**
@@ -194 +194 @@
                 }
 
-                CmdLineParser parser = new CmdLineParser(this, "loading...");
+                CmdLineParser parser = new CmdLineParser(this);
                 parser.parse(props);
                 if (props.getProperty("mapper_implementation") != null) this.mapper_implementation = MapperImplementation
@@ -216 +216 @@
         public MolgenisOptions(Properties properties) throws CmdLineException
         {
-                CmdLineParser parser = new CmdLineParser(this, "loading...");
+                CmdLineParser parser = new CmdLineParser(this);
                 parser.parse(properties);
                 Logger.getLogger(this.getClass().getSimpleName()).debug("parsed properties file.");
@@ -223 +223 @@
         public String toString()
         {
-                return new CmdLineParser(this, "").toString(this);
+                return new CmdLineParser(this).toString(this);
         }