diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2014-04-25 19:55:35 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-04-29 14:19:36 -0700 |
commit | 7b6b60b7d8d26799ea1bda48e6e51fa05854c80e (patch) | |
tree | e51a0d515e8a9a2b9f80dee491fca5217054adf5 /base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java | |
parent | 05fea2520ae50d74f18017b26f5d58936e29af07 (diff) | |
download | pki-7b6b60b7d8d26799ea1bda48e6e51fa05854c80e.tar.gz pki-7b6b60b7d8d26799ea1bda48e6e51fa05854c80e.tar.xz pki-7b6b60b7d8d26799ea1bda48e6e51fa05854c80e.zip |
Fixed issue by streamlining code to be more consistent.
* PKI TRAC Ticket #843 - Incorrect CLI argument parsing
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java index 396dbc63f..a63df2e80 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java @@ -37,26 +37,29 @@ public class TokenAddCLI extends CLI { public TokenAddCLI(TokenCLI tokenCLI) { super("add", "Add token", tokenCLI); this.tokenCLI = tokenCLI; + + createOptions(); } public void printHelp() { - formatter.printHelp(getFullName() + " <Token ID> [OPTIONS...]", options); + formatter.printHelp(getFullName() + " <Token ID> --user <User ID> [OPTIONS...]", options); } - public void execute(String[] args) throws Exception { + public void createOptions() { + Option option = new Option(null, "user", true, "User ID"); + option.setArgName("User ID"); + option.setRequired(true); + options.addOption(option); + } - // Check for "--help" prior to parsing due to required option + public void execute(String[] args) throws Exception { + // Always check for "--help" prior to parsing if (Arrays.asList(args).contains("--help")) { // Display usage printHelp(); System.exit(0); } - Option option = new Option(null, "user", true, "User ID"); - option.setArgName("User ID"); - option.setRequired(true); - options.addOption(option); - CommandLine cmd = null; try { @@ -65,14 +68,15 @@ public class TokenAddCLI extends CLI { } catch (Exception e) { System.err.println("Error: " + e.getMessage()); printHelp(); - System.exit(1); + System.exit(-1); } String[] cmdArgs = cmd.getArgs(); if (cmdArgs.length != 1) { + System.err.println("Error: No Token ID specified."); printHelp(); - System.exit(1); + System.exit(-1); } String tokenID = cmdArgs[0]; |