Added missing description and enabling grep usage in the command-list…

… output
forge · Jan 2, 2014 · 20568f5 · 20568f5
1 parent 220b66f
commit 20568f5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/addons/impl/src/main/java/org/jboss/forge/addon/addons/NewUICommandWizard.java b/addons/impl/src/main/java/org/jboss/forge/addon/addons/NewUICommandWizard.java
@@ -69,7 +69,7 @@ public class NewUICommandWizard extends AbstractProjectCommand
    public UICommandMetadata getMetadata(UIContext context)
    {
       return Metadata.forCommand(NewUICommandWizard.class)
-               .name("Addon: New Command")
+               .name("Addon: New Command").description("Generates a UICommand implementation")
                .category(Categories.create("Addon", "Generate"));
    }
 

diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/commands/CommandListCommand.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/commands/CommandListCommand.java
@@ -6,9 +6,11 @@
  */
 package org.jboss.forge.addon.shell.commands;
 
+import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javax.inject.Inject;
 
@@ -30,6 +32,7 @@
 import org.jboss.forge.addon.ui.controller.CommandController;
 import org.jboss.forge.addon.ui.controller.CommandControllerFactory;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
+import org.jboss.forge.addon.ui.output.UIOutput;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.result.Results;
 import org.jboss.forge.addon.ui.spi.UIRuntime;
@@ -68,24 +71,28 @@ public Result execute(UIExecutionContext context) throws Exception
       TerminalSize terminalSize = shell.getConsole().getShell().getSize();
       List<String> display = new ArrayList<>();
 
-      List<CommandController> controllers = new ArrayList<>();
+      Set<CommandController> controllers = new TreeSet<>(new CommandControllerComparator());
       for (UICommand command : manager.getAllCommands())
       {
          controllers.add(getCommandController(context, command));
       }
 
-      Collections.sort(controllers, new CommandControllerComparator());
-
       for (CommandController controller : controllers)
       {
          String name = manager.getCommandName(context.getUIContext(), controller.getCommand());
-         display.add(controller.getMetadata().getCategory()
-                  + " > " + new TerminalString(name, new TerminalColor(controller.isEnabled() ? Color.BLUE : Color.RED,
-                           Color.DEFAULT)).toString() + " - " + controller.getMetadata().getDescription());
+         UICommandMetadata metadata = controller.getMetadata();
+         display.add(metadata.getCategory()
+                  + " > "
+                  + new TerminalString(name, new TerminalColor(controller.isEnabled() ? Color.BLUE : Color.RED,
+                           Color.DEFAULT)).toString() + " - " + metadata.getDescription());
       }
 
-      return Results.success(Parser.formatDisplayList(display.toArray(new String[display.size()]),
+      UIOutput output = context.getUIContext().getProvider().getOutput();
+      PrintStream out = output.out();
+      out.println(Parser.formatDisplayList(display.toArray(new String[display.size()]),
                terminalSize.getHeight(), terminalSize.getWidth()));
+
+      return Results.success();
    }
 
    private CommandController getCommandController(UIExecutionContext context, UICommand command)

diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/util/Metadata.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/util/Metadata.java
@@ -59,7 +59,8 @@ public static Metadata forCommand(Class<? extends UICommand> type)
    private Metadata(Class<? extends UICommand> type)
    {
       this.type = type;
-      docLocation(getDocLocationFor(type)).name(type.getName()).category(Categories.create("Uncategorized"));
+      docLocation(getDocLocationFor(type)).name(type.getName()).category(Categories.create("Uncategorized"))
+               .description("No description");
    }
 
    /**