Add list-suites option to both reader and standalone.

 - Also add support for specifying the key algo for KDF in standalone ECDH.
 - Add descriptions to standalone options.

2 files changed, 7 insertions, 9 deletions

diff --git a/src/cz/crcs/ectester/common/cli/CLITools.java b/src/cz/crcs/ectester/common/cli/CLITools.java
index 91f121f..4aa58b0 100644
--- a/src/cz/crcs/ectester/common/cli/CLITools.java
+++ b/src/cz/crcs/ectester/common/cli/CLITools.java
@@ -37,7 +37,8 @@ public class CLITools {
             }
             tp.getParsers().forEach((key, value) -> {
                 pw.println();
-                help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, String.format("%" + depth + "s" + key + ":", " "));
+                String description = value.getDescription() == null ? "" : "    | " + value.getDescription() + " |";
+                help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, String.format("%" + depth + "s" + key + ":" + description, " "));
                 CLITools.help(help, pw, value.getParser(), value.getOptions(), depth + 1);
             });
         }
diff --git a/src/cz/crcs/ectester/common/cli/ParserOptions.java b/src/cz/crcs/ectester/common/cli/ParserOptions.java
index ee2097e..7300cbb 100644
--- a/src/cz/crcs/ectester/common/cli/ParserOptions.java
+++ b/src/cz/crcs/ectester/common/cli/ParserOptions.java
@@ -3,25 +3,22 @@ package cz.crcs.ectester.common.cli;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.Options;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class ParserOptions {
     private CommandLineParser parser;
     private Options options;
-    private List<Argument> arguments;
+    private String description;
 
     public ParserOptions(CommandLineParser parser, Options options) {
         this.parser = parser;
         this.options = options;
     }
 
-    public ParserOptions(CommandLineParser parser, Options options, List<Argument> arguments) {
+    public ParserOptions(CommandLineParser parser, Options options, String description) {
         this(parser, options);
-        this.arguments = arguments;
+        this.description = description;
     }
 
     public CommandLineParser getParser() {
@@ -32,7 +29,7 @@ public class ParserOptions {
         return options;
     }
 
-    public List<Argument> getArguments() {
-        return Collections.unmodifiableList(arguments);
+    public String getDescription() {
+        return description;
     }
 }