[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6473] trunk/sql12/plugins/dbcopy/src/main/java/ net/sourceforge/squirrel_sql/plugins/dbcopy/cli

[<man...@us...>]

Revision: 6473
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6473&view=rev
Author:   manningr
Date:     2011-11-06 21:02:29 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Don't present the user with a stack trace when required options are missing.

Modified Paths:
--------------
    trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
    trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java

Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java	2011-11-05 14:20:37 UTC (rev 6472)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java	2011-11-06 21:02:29 UTC (rev 6473)
@@ -65,7 +65,8 @@
 			cmd = parser.parse(options, args);
 		} catch (ParseException e) {
 			HelpFormatter formatter = new HelpFormatter();
-			System.err.println(e.getMessage());
+			System.out.println(e.getMessage());
+			System.out.println();
 			formatter.printHelp("DBCopyCLI", options, true);
 			throw e;
 		}

Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java	2011-11-05 14:20:37 UTC (rev 6472)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java	2011-11-06 21:02:29 UTC (rev 6473)
@@ -19,7 +19,9 @@
 
 package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
 
+import org.apache.commons.cli.MissingOptionException;
 
+
 public class DBCopyCLI
 {
 
@@ -31,15 +33,22 @@
 	 * @param args
 	 */
 	public static void main(String[] args) throws Exception
-	{		
-		CommandLineArgumentProcessor argProcessor = new CommandLineArgumentProcessor(args);
-		runner.setSourceSchemaName(argProcessor.getSourceSchemaName());
-		runner.setSourceCatalogName(argProcessor.getSourceCatalogName());
-		runner.setDestSchemaName(argProcessor.getDestSchemaName());
-		runner.setDestCatalogName(argProcessor.getDestCatalogName());
-		runner.setSourceSession(sessionUtil.getSessionForAlias(argProcessor.getSourceAliasName()));
-		runner.setDestSession(sessionUtil.getSessionForAlias(argProcessor.getDestAliasName()));
-		runner.run();		
+	{
+		try
+		{
+			CommandLineArgumentProcessor argProcessor = new CommandLineArgumentProcessor(args);
+			runner.setSourceSchemaName(argProcessor.getSourceSchemaName());
+			runner.setSourceCatalogName(argProcessor.getSourceCatalogName());
+			runner.setDestSchemaName(argProcessor.getDestSchemaName());
+			runner.setDestCatalogName(argProcessor.getDestCatalogName());
+			runner.setSourceSession(sessionUtil.getSessionForAlias(argProcessor.getSourceAliasName()));
+			runner.setDestSession(sessionUtil.getSessionForAlias(argProcessor.getDestAliasName()));
+			runner.run();
+		}
+		catch (MissingOptionException e)
+		{
+			// We handle printing the usage in the argProcessor, so no need to log it here.
+		}
 	}
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.