diff options
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java index 903b72eb2..281d2ab36 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java @@ -37,21 +37,15 @@ public class UserAddCLI extends CLI { public UserAddCLI(UserCLI userCLI) { super("add", "Add user", userCLI); this.userCLI = userCLI; + + createOptions(); } public void printHelp() { - formatter.printHelp(getFullName() + " <User ID> [OPTIONS...]", options); + formatter.printHelp(getFullName() + " <User ID> --fullName <fullname> [OPTIONS...]", options); } - public void execute(String[] args) throws Exception { - - // Check for "--help" prior to parsing due to required option - if (Arrays.asList(args).contains("--help")) { - // Display usage - printHelp(); - System.exit(0); - } - + public void createOptions() { Option option = new Option(null, "fullName", true, "Full name"); option.setArgName("fullName"); option.setRequired(true); @@ -76,6 +70,15 @@ public class UserAddCLI extends CLI { option = new Option(null, "state", true, "State"); option.setArgName("state"); options.addOption(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); + } CommandLine cmd = null; @@ -85,14 +88,15 @@ public class UserAddCLI 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 User ID specified."); printHelp(); - System.exit(1); + System.exit(-1); } String userID = cmdArgs[0]; |