Minor perf improvement

forge · Mar 17, 2014 · 5b89f5a · 5b89f5a
1 parent e06e65b
commit 5b89f5a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/util/Commands.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/util/Commands.java
@@ -12,7 +12,7 @@
 
 /**
  * A utiliy class to handle commands
- * 
+ *
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
@@ -31,7 +31,7 @@ public static Iterable<UICommand> getEnabledCommands(Iterable<UICommand> command
       {
          try
          {
-            if (uiCommand.isEnabled(context) && !(uiCommand instanceof UIWizardStep))
+            if (isEnabled(uiCommand, context))
             {
                result.add(uiCommand);
             }
@@ -46,6 +46,14 @@ public static Iterable<UICommand> getEnabledCommands(Iterable<UICommand> command
       return result;
    }
 
+   /**
+    * Returns true if this command can be invoked
+    */
+   public static boolean isEnabled(UICommand command, UIContext context)
+   {
+      return (command.isEnabled(context) && !(command instanceof UIWizardStep));
+   }
+
    private static String getMetadata(UICommand command, UIContext context)
    {
       String result = "!!! Failed to load Metadata via `" + UICommand.class.getName()

diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/command/CommandFactoryImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/command/CommandFactoryImpl.java
@@ -25,7 +25,7 @@
 
 /**
  * Creates and manages commands
- * 
+ *
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
@@ -64,9 +64,13 @@ public Iterable<UICommand> getCommands()
    public Set<String> getEnabledCommandNames(UIContext context)
    {
       Set<String> commands = new TreeSet<>();
-      for (UICommand cmd : Commands.getEnabledCommands(getCommands(), context))
+      Iterable<UICommand> allCommands = getCommands();
+      for (UICommand cmd : allCommands)
       {
-         commands.add(getCommandName(context, cmd));
+         if (Commands.isEnabled(cmd, context))
+         {
+            commands.add(getCommandName(context, cmd));
+         }
       }
       return commands;
    }