SRADA-445: moved TracingArgumentsParser#printHelp() in cli.utils.Help

Change-Id: Id25ecfdf7c4f3ccfe9efdb3d6c9cf2c61dc00604

diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StartCommand.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StartCommand.java
index 56652f7..c4d1438 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StartCommand.java
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/commands/StartCommand.java
@@ -7,6 +7,7 @@ import org.apache.commons.cli.ParseException;
 import org.tizen.dynamicanalyzer.cli.CliInternals;
 import org.tizen.dynamicanalyzer.cli.tracing.TracingArguments;
 import org.tizen.dynamicanalyzer.cli.tracing.TracingArgumentsParser;
+import org.tizen.dynamicanalyzer.cli.utils.Help;
 import org.tizen.dynamicanalyzer.common.DAResult;
 import org.tizen.dynamicanalyzer.util.Logger;
 
@@ -43,7 +44,7 @@ public class StartCommand extends Command {
 
                try {
                        // print help message for command options to System.out
-                       TracingArgumentsParser.printHelp(message, System.out);
+                       Help.printHelp(message, TracingArgumentsParser.getOpts(), System.out);
                } catch (IOException e) {
                        Logger.exception(e);
                }

diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingArgumentsParser.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingArgumentsParser.java
index bf47fb6..2596e74 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingArgumentsParser.java
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/tracing/TracingArgumentsParser.java
@@ -1,16 +1,12 @@
 package org.tizen.dynamicanalyzer.cli.tracing;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
 import org.apache.commons.cli.Options;
@@ -71,6 +67,14 @@ public class TracingArgumentsParser {
        }
 
        /**
+        * Returns options used for {@link TracingArguments} parsing.
+        * @return options
+        */
+       public static Options getOpts() {
+               return opts;
+       }
+
+       /**
         * Parses given arguments into a {@link TracingArguments} object.
         * Returned {@link TracingArguments} object has valid state (<code>TracingArguments.isValid()</code>).
         * @param args arguments to parse
@@ -176,19 +180,4 @@ public class TracingArgumentsParser {
 
                return result.toArray(new String[0]);
        }
-
-       /**
-        * Prints 'start' command's help message to given <code>PrintStream</code>.
-        * @param commandDesc <code>String</code> with command description
-        * @param ps <code>PrintStream</code> object
-        * @throws IOException
-        */
-       public static void printHelp(String commandDesc, PrintStream ps) throws IOException {
-               PrintWriter pw = new PrintWriter(ps, true);
-               HelpFormatter formatter = new HelpFormatter();
-
-               formatter.printWrapped(pw, 80, 30, commandDesc);
-               pw.println();
-               formatter.printOptions(pw, 80, opts, 4, 6);
-       }
 }

diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/utils/Help.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/utils/Help.java
new file mode 100644 (file)
index 0000000..ae32fed
--- /dev/null
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/utils/Help.java
@@ -0,0 +1,26 @@
+package org.tizen.dynamicanalyzer.cli.utils;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+
+public class Help {
+       /**
+        * Prints command's help message to given <code>PrintStream</code>.
+        * @param commandDesc <code>String</code> with command description
+        * @param opts command options
+        * @param ps <code>PrintStream</code> object
+        * @throws IOException
+        */
+       public static void printHelp(String commandDesc, Options opts, PrintStream ps) throws IOException {
+               PrintWriter pw = new PrintWriter(ps, true);
+               HelpFormatter formatter = new HelpFormatter();
+
+               formatter.printWrapped(pw, 80, 30, commandDesc);
+               formatter.printOptions(pw, 80, opts, 4, 4);
+               pw.println();
+       }
+}