1 files changed, 20 insertions, 17 deletions

diff --git a/src/com/ibm/ServerWizard2/ServerWizard2.java b/src/com/ibm/ServerWizard2/ServerWizard2.java
index 3119483..ff4ee02 100644
--- a/src/com/ibm/ServerWizard2/ServerWizard2.java
+++ b/src/com/ibm/ServerWizard2/ServerWizard2.java
@@ -2,21 +2,33 @@ package com.ibm.ServerWizard2;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import com.ibm.ServerWizard2.controller.TargetWizardController;
+import com.ibm.ServerWizard2.model.SystemModel;
+import com.ibm.ServerWizard2.utility.MyLogFormatter;
+import com.ibm.ServerWizard2.view.MainDialog;
 public class ServerWizard2 {
 
 	/**
 	 * @param args
 	 */
 	public final static Logger LOGGER = Logger.getLogger(ServerWizard2.class.getName());
-	public static void printUsage() {
+	public final static int VERSION_MAJOR = 2;
+	public final static int VERSION_MINOR = 1;
+
+	public static String getVersionString() {
+		return VERSION_MAJOR+"."+VERSION_MINOR;
+	}
+	private static void printUsage() {
 		System.out.println("Usage:");
 		System.out.println("   -i [xml filename]");
 		System.out.println("   -v [update to version]");
+		System.out.println("   -f = run xml clean up");
 		System.out.println("   -h = print this usage");
 	}
 	public static void main(String[] args) {
 		String inputFilename="";
-		String version="";
+		Boolean cleanupMode = false;
 		for (int i=0;i<args.length;i++) {
 			if (args[i].equals("-i")) {
 				if (i==args.length-1) {
@@ -30,12 +42,14 @@ public class ServerWizard2 {
 					printUsage();
 					System.exit(3);
 				}
-				version=args[i+1];
 			}
 			if (args[i].equals("-h")) {
 				printUsage();
 				System.exit(0);
 			}
+			if (args[i].equals("-f")) {
+				cleanupMode = true;
+			}
 		}
 		LOGGER.setLevel(Level.CONFIG);
 		LOGGER.setUseParentHandlers(false);
@@ -44,30 +58,19 @@ public class ServerWizard2 {
 		LOGGER.addHandler(logConsole);
 		MyLogFormatter formatter = new MyLogFormatter();
 		logConsole.setFormatter(formatter);
-		/*
-		try {
-			FileHandler logFile = new FileHandler("serverwiz2.%u.%g.log",20000,2,true);
-			LOGGER.addHandler(logFile);
-			logFile.setFormatter(formatter);
-			logFile.setLevel(Level.CONFIG);
-		} catch (IOException e) {
-			System.err.println("Unable to create logfile");
-			System.exit(3);
-		}
-		*/
+
 		LOGGER.config("======================================================================");
-		LOGGER.config("ServerWiz2 Starting...");
+		LOGGER.config("ServerWiz2 Version "+getVersionString()+" Starting...");
 		TargetWizardController tc = new TargetWizardController();
 		SystemModel systemModel = new SystemModel();
 	    MainDialog view = new MainDialog(null);
 	    tc.setView(view);
 	    tc.setModel(systemModel);
-	    systemModel.addPropertyChangeListener(tc);
 	    view.setController(tc);
+	    systemModel.cleanupMode = cleanupMode;
 		if (!inputFilename.isEmpty()) {
 			view.mrwFilename=inputFilename;
 		}
 	    view.open();
-	    //d.dispose();
 	}
 }