1 files changed, 11 insertions, 24 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
index b111f1558..4f6d11ac3 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
@@ -36,12 +36,10 @@ import com.netscape.cmstools.cli.MainCLI;
  */
 public class UserCLI extends CLI {
 
-    public MainCLI parent;
-    public UserClient client;
+    public UserClient userClient;
 
-    public UserCLI(MainCLI parent) {
-        super("user", "User management commands");
-        this.parent = parent;
+    public UserCLI(CLI parent) {
+        super("user", "User management commands", parent);
 
         addModule(new UserFindCLI(this));
         addModule(new UserShowCLI(this));
@@ -59,30 +57,19 @@ public class UserCLI extends CLI {
         addModule(new UserRemoveMembershipCLI(this));
     }
 
-    public void printHelp() {
-
-        System.out.println("Commands:");
-
-        int leftPadding = 1;
-        int rightPadding = 25;
-
-        for (CLI module : modules.values()) {
-            String label = name + "-" + module.getName();
-
-            int padding = rightPadding - leftPadding - label.length();
-            if (padding < 1)
-                padding = 1;
-
-            System.out.print(StringUtils.repeat(" ", leftPadding));
-            System.out.print(label);
-            System.out.print(StringUtils.repeat(" ", padding));
-            System.out.println(module.getDescription());
+    public String getFullName() {
+        if (parent instanceof MainCLI) {
+            // do not include MainCLI's name
+            return name;
+        } else {
+            return parent.getFullName() + "-" + name;
         }
     }
 
     public void execute(String[] args) throws Exception {
 
-        client = new UserClient(parent.client);
+        client = parent.getClient();
+        userClient = new UserClient(client);
 
         if (args.length == 0) {
             printHelp();