Code cleanup in the Main class

Author: pborissow

src/javaxt/orm/Main.java

@@ -1,77 +1,59 @@
 package javaxt.orm;
+import java.util.*;
+import javaxt.io.Jar;
+import static javaxt.utils.Console.console;
+
+//******************************************************************************
+//**  Main
+//******************************************************************************
+/**
+ *  Command line interface used to parse a model file and generate Java and SQL
+ *  output files.
+ *
+ ******************************************************************************/
 
 public class Main {
 
-    public static void main(String[] args) throws Exception {
-        
-      //Parse inputs
-        javaxt.io.File inputFile = new javaxt.io.File(args[0]);
-        javaxt.io.Directory outputDirectory = new javaxt.io.Directory(args[1]);
-        
-        
-      //Validate inputs
-        if (!inputFile.exists()) throw new IllegalArgumentException("Input file not found");
-        
-
-      //Get models
-        Model[] models = new Parser(inputFile.getText()).getModels();
 
-        
-      //Run tests
-        //testContact(models);
-        //testUser(models);
-        //testFile(models);
-        new Writer(models).write(outputDirectory);
-    }
-    
-    
-    private static void testContact(Model[] models){
-        for (Model model : models){
-            
-            String modelName = model.getName();
-            if (modelName.equals("Contact") || modelName.equals("Phone") || modelName.equals("Email")){} 
-            else continue;
-            
-            
-          //Create class
-            if (modelName.equals("Contact")) System.out.println(model.getJavaCode());
-            
-        
-          //Create DDL
-            System.out.println(model.getTableSQL());
-            System.out.println(model.getForeignKeySQL());
+  //**************************************************************************
+  //** main
+  //**************************************************************************
+  /** Entry point for the application
+   *  @param arguments Command line arguments
+   */
+    public static void main(String[] arguments) throws Exception {
+        HashMap<String, String> args = console.parseArgs(arguments);
+
+
+      //Print version as needed
+        if (args.containsKey("-version")){
+            Jar jar = new Jar(Main.class);
+            javaxt.io.File jarFile = new javaxt.io.File(jar.getFile());
+            String version = jar.getVersion();
+            if (version==null) version = "Unknown";
+            System.out.println(jarFile.getName(false) + " version \"" + version + "\"");
+            return;
         }
-    }
-    
-    
-    private static void testUser(Model[] models){
-        for (Model model : models){
 
 
-            
-            String modelName = model.getName();
-            if (!modelName.equals("UserAccount")) continue;
-            
-            
-            System.out.println(model.getJavaCode());
-            System.out.println(model.getTableSQL());
-            System.out.println(model.getForeignKeySQL());
+      //Parse inputs
+        String input = args.get("-input");
+        String output = args.get("-output");
+        if (input==null){
+            input = arguments[0];
+            if (arguments.length>1) output = arguments[1];
         }
-    }
-    
-    
-    private static void testFile(Model[] models){
-        for (Model model : models){
+        javaxt.io.File inputFile = new javaxt.io.File(input);
+        if (!inputFile.exists()) throw new IllegalArgumentException("Input file not found");
+        javaxt.io.Directory outputDirectory = output==null ?
+                inputFile.getDirectory() : new javaxt.io.Directory(output);
 
 
-            
-            String modelName = model.getName();
-            if (!modelName.equals("File")) continue;
-            
-            
-            System.out.println(model.getJavaCode());
-            System.out.println(model.getTableSQL());
-            System.out.println(model.getForeignKeySQL());
-        }
+      //Create models
+        Model[] models = new Parser(inputFile.getText()).getModels();
+
+
+      //Create files
+        Writer.write(models, outputDirectory);
     }
 }