Changeset 3068 for DataCleaner

Timestamp:

01/19/12 09:13:49 (4 months ago)

Author:

kasper

Message:

Ticket #749: Added CLI output type options.

File:

• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/bootstrap/Bootstrap.java (modified) (4 diffs)

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/bootstrap/Bootstrap.java

@@ -94 +94 @@
                         if (arguments.isUsageMode()) {
                                 final PrintWriter out = new PrintWriter(System.out);
-                                CliArguments.printUsage(out);
+                                try {
+                                        CliArguments.printUsage(out);
+                                } finally {
+                                        FileHelper.safeClose(out);
+                                }
 
                                 exitCommandLine(null, 1);
@@ -123 +127 @@
                 if (cliMode) {
 
-                        final PrintWriter out = new PrintWriter(System.out);
                         // run in CLI mode
 
                         int exitCode = 0;
+                        final CliArguments arguments = _options.getCommandLineArguments();
+                        final CliRunner runner = new CliRunner(arguments);
                         try {
-                                final CliArguments arguments = _options.getCommandLineArguments();
-                                final CliRunner runner = new CliRunner(arguments, out);
                                 runner.run(configuration);
                         } catch (Throwable e) {
@@ -135 +138 @@
                                 exitCode = 1;
                         } finally {
-                                out.flush();
+                                runner.close();
                                 exitCommandLine(configuration, exitCode);
                         }
@@ -143 +146 @@
                         final MacOSManager macOsManager = injector.getInstance(MacOSManager.class);
                         macOsManager.init();
-                        
+
                         // run in GUI mode
                         final AnalysisJobBuilderWindow analysisJobBuilderWindow = injector.getInstance(AnalysisJobBuilderWindow.class);