FORGE-1426: Implemented annotation support for single-step UI commands.

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonBuildAndInstallCommand.java

@@ -10,7 +10,7 @@
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonInstallCommand.java

@@ -9,7 +9,7 @@
 import org.jboss.forge.addon.projects.ProjectFactory;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonListCommand.java

@@ -6,7 +6,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/commands/AddonRemoveCommand.java

@@ -11,7 +11,7 @@
 import org.jboss.forge.addon.projects.ProjectFactory;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

addons/impl/src/main/java/org/jboss/forge/addon/addons/NewUICommandWizard.java

@@ -20,7 +20,7 @@
 import org.jboss.forge.addon.projects.ui.AbstractProjectCommand;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

database-tools/impl/src/main/java/org/jboss/forge/addon/database/tools/connections/ConnectionProfileDetailsPage.java

@@ -17,12 +17,12 @@
 
 import org.jboss.forge.addon.convert.Converter;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.UIValidator;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
 import org.jboss.forge.addon.ui.input.UIInput;
 import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
+import org.jboss.forge.addon.ui.validate.UIValidator;
 
 public class ConnectionProfileDetailsPage
 {

database-tools/impl/src/main/java/org/jboss/forge/addon/database/tools/connections/CreateConnectionProfileCommand.java

@@ -6,7 +6,7 @@
 
 import org.jboss.forge.addon.database.tools.connections.ConnectionProfile;
 import org.jboss.forge.addon.database.tools.connections.ConnectionProfileManagerProvider;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

database-tools/impl/src/main/java/org/jboss/forge/addon/database/tools/connections/RemoveConnectionProfileCommand.java

@@ -6,7 +6,7 @@
 
 import org.jboss.forge.addon.database.tools.connections.ConnectionProfile;
 import org.jboss.forge.addon.database.tools.connections.ConnectionProfileManagerProvider;
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

dev-tools-java/src/main/java/org/jboss/forge/addon/devtools/java/RegisterAsServiceCommand.java

@@ -19,13 +19,13 @@
 import org.jboss.forge.addon.projects.facets.ResourcesFacet;
 import org.jboss.forge.addon.projects.ui.AbstractProjectCommand;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.InputComponentFactory;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.facets.HintsFacet;
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.InputComponent;
+import org.jboss.forge.addon.ui.input.InputComponentFactory;
 import org.jboss.forge.addon.ui.input.UICompleter;
 import org.jboss.forge.addon.ui.input.UIInput;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;

javaee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ui/GenerateConstraintWizardStep.java

@@ -16,14 +16,14 @@
 import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
 import org.jboss.forge.addon.parser.java.beans.Property;
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
-import org.jboss.forge.addon.ui.InputComponentFactory;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.context.UINavigationContext;
 import org.jboss.forge.addon.ui.facets.HintsFacet;
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.InputComponent;
+import org.jboss.forge.addon.ui.input.InputComponentFactory;
 import org.jboss.forge.addon.ui.input.ManyValued;
 import org.jboss.forge.addon.ui.input.SelectComponent;
 import org.jboss.forge.addon.ui.result.NavigationResult;

javaee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ui/setup/ClassInputValidator.java

@@ -9,9 +9,9 @@
 import org.jboss.forge.addon.parser.java.utils.ResultType;
 import org.jboss.forge.addon.parser.java.utils.ValidationResult;
 import org.jboss.forge.addon.parser.java.utils.JLSValidator;
-import org.jboss.forge.addon.ui.UIValidator;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
 import org.jboss.forge.addon.ui.input.UIInput;
+import org.jboss.forge.addon.ui.validate.UIValidator;
 import org.jboss.forge.furnace.util.Strings;
 
 public class ClassInputValidator implements UIValidator

javaee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ui/setup/ValidationProviderSetupCommand.java

@@ -15,7 +15,7 @@
 import org.jboss.forge.addon.javaee.validation.ValidationOperations;
 import org.jboss.forge.addon.javaee.validation.provider.ValidationProvider;
 import org.jboss.forge.addon.javaee.validation.providers.JavaEEValidatorProvider;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/JPASetupWizardTest.java

@@ -23,8 +23,8 @@
 import org.jboss.forge.addon.javaee.jpa.providers.JavaEEDefaultProvider;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
-import org.jboss.forge.addon.ui.AbstractCommandExecutionListener;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.AbstractCommandExecutionListener;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.controller.WizardCommandController;
 import org.jboss.forge.addon.ui.result.Failed;

javaee/tests/src/test/java/org/jboss/forge/addon/javaee/validation/ui/setup/ValidationSetupCommandTest.java

@@ -8,8 +8,8 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
-import org.jboss.forge.addon.ui.AbstractCommandExecutionListener;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.AbstractCommandExecutionListener;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
 import org.jboss.forge.addon.ui.controller.CommandController;
 import org.jboss.forge.addon.ui.result.Result;

projects/api/src/main/java/org/jboss/forge/addon/projects/ui/AbstractProjectCommand.java

@@ -15,8 +15,8 @@
 import org.jboss.forge.addon.projects.ProjectFacet;
 import org.jboss.forge.addon.projects.ProjectFactory;
 import org.jboss.forge.addon.resource.FileResource;
-import org.jboss.forge.addon.ui.AbstractUICommand;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIContextProvider;
 import org.jboss.forge.addon.ui.context.UISelection;
@@ -39,7 +39,7 @@ public boolean isEnabled(UIContext context)
 
    private boolean constraintsSatisfied(UIContext context)
    {
-      Set<Class<ProjectFacet>> facets = FacetInspector.getRequiredFacets(getMetadata(null).getType());
+      Set<Class<ProjectFacet>> facets = FacetInspector.getRequiredFacets(getMetadata(context).getType());
       return FacetInspector.isConstraintSatisfied(getSelectedProject(context), facets);
    }
 

projects/impl/src/main/java/org/jboss/forge/addon/projects/impl/Gender.java

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2013 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.jboss.forge.addon.projects.impl;
+
+public enum Gender
+{
+   MALE, FEMALE;
+}

projects/impl/src/main/java/org/jboss/forge/addon/projects/ui/NewProjectWizard.java

@@ -24,7 +24,6 @@
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
-import org.jboss.forge.addon.ui.UIValidator;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;
@@ -41,6 +40,7 @@
 import org.jboss.forge.addon.ui.result.Results;
 import org.jboss.forge.addon.ui.util.Categories;
 import org.jboss.forge.addon.ui.util.Metadata;
+import org.jboss.forge.addon.ui.validate.UIValidator;
 import org.jboss.forge.addon.ui.wizard.UIWizard;
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.furnace.util.OperatingSystemUtils;

scaffold/faces/src/main/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldProvider.java

@@ -50,7 +50,7 @@
 import org.jboss.forge.addon.scaffold.spi.ScaffoldGenerationContext;
 import org.jboss.forge.addon.scaffold.spi.ScaffoldSetupContext;
 import org.jboss.forge.addon.scaffold.spi.ScaffoldProvider;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
 import org.jboss.forge.parser.JavaParser;
 import org.jboss.forge.parser.java.Annotation;

scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java

@@ -20,7 +20,7 @@
 import org.jboss.forge.addon.scaffold.spi.ScaffoldGenerationContext;
 import org.jboss.forge.addon.scaffold.spi.ScaffoldProvider;
 import org.jboss.forge.addon.scaffold.ui.ScaffoldGenerateCommand;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldSetupWizardImpl.java

@@ -21,7 +21,7 @@
 import org.jboss.forge.addon.scaffold.spi.ScaffoldProvider;
 import org.jboss.forge.addon.scaffold.spi.ScaffoldSetupContext;
 import org.jboss.forge.addon.scaffold.ui.ScaffoldSetupWizard;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIExecutionContext;

scaffold/spi/src/main/java/org/jboss/forge/addon/scaffold/spi/ScaffoldProvider.java

@@ -12,8 +12,8 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFacet;
 import org.jboss.forge.addon.resource.Resource;
-import org.jboss.forge.addon.ui.UICommand;
-import org.jboss.forge.addon.ui.UIValidator;
+import org.jboss.forge.addon.ui.command.UICommand;
+import org.jboss.forge.addon.ui.validate.UIValidator;
 
 /**
  * Provides an implementation of Scaffolding for various UI code generation operations.

shell/api/src/main/java/org/jboss/forge/addon/shell/Shell.java

@@ -10,7 +10,7 @@
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.ui.UIProvider;
-import org.jboss.forge.addon.ui.controller.CommandExecutionListener;
+import org.jboss.forge.addon.ui.command.CommandExecutionListener;
 import org.jboss.forge.furnace.spi.ListenerRegistration;
 
 /**

shell/api/src/main/java/org/jboss/forge/addon/shell/ui/AbstractShellCommand.java

@@ -7,7 +7,7 @@
 
 package org.jboss.forge.addon.shell.ui;
 
-import org.jboss.forge.addon.ui.AbstractUICommand;
+import org.jboss.forge.addon.ui.command.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.util.Categories;

shell/api/src/main/java/org/jboss/forge/addon/shell/ui/ShellContext.java

@@ -1,7 +1,7 @@
 package org.jboss.forge.addon.shell.ui;
 
 import org.jboss.forge.addon.shell.Shell;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.wizard.UIWizard;
 import org.jboss.forge.addon.ui.wizard.UIWizardStep;

shell/impl/src/main/java/org/jboss/forge/addon/shell/CommandManager.java

@@ -1,25 +1,20 @@
 package org.jboss.forge.addon.shell;
 
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.jboss.forge.addon.convert.ConverterFactory;
 import org.jboss.forge.addon.shell.aesh.ShellSingleCommand;
 import org.jboss.forge.addon.shell.ui.ShellContext;
 import org.jboss.forge.addon.shell.util.ShellUtil;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.CommandFactory;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.util.Commands;
 import org.jboss.forge.furnace.addons.AddonRegistry;
-import org.jboss.forge.furnace.event.PostStartup;
-import org.jboss.forge.furnace.event.PreShutdown;
-import org.jboss.forge.furnace.services.Imported;
 
 /**
  * Manages {@link ShellSingleCommand} objects
@@ -31,27 +26,15 @@ public class CommandManager
 {
    private final AddonRegistry addonRegistry;
 
-   private Imported<UICommand> allCommands;
    private ConverterFactory converterFactory;
-
-   private List<UICommand> commandCache;
+   private CommandFactory commandFactory;
 
    @Inject
    public CommandManager(final AddonRegistry addonRegistry)
    {
       this.addonRegistry = addonRegistry;
    }
 
-   public void addonStarted(@Observes PostStartup event)
-   {
-      commandCache = null;
-   }
-
-   public void addonStopped(@Observes PreShutdown event)
-   {
-      commandCache = null;
-   }
-
    public UICommand lookup(Class<? extends UICommand> type)
    {
       return addonRegistry.getServices(type).get();
@@ -74,19 +57,11 @@ public String getCommandName(UIContext context, UICommand cmd)
 
    public Iterable<UICommand> getAllCommands()
    {
-      if (allCommands == null)
-      {
-         allCommands = addonRegistry.getServices(UICommand.class);
-      }
-      if (commandCache == null)
+      if (commandFactory == null)
       {
-         commandCache = new LinkedList<>();
-         for (UICommand command : allCommands)
-         {
-            commandCache.add(command);
-         }
+         commandFactory = addonRegistry.getServices(CommandFactory.class).get();
       }
-      return allCommands;
+      return commandFactory.getCommands();
    }
 
    ConverterFactory getConverterFactory()

shell/impl/src/main/java/org/jboss/forge/addon/shell/ShellImpl.java

@@ -32,15 +32,15 @@
 import org.jboss.forge.addon.shell.ui.ShellContextImpl;
 import org.jboss.forge.addon.shell.ui.ShellUIOutputImpl;
 import org.jboss.forge.addon.shell.ui.ShellUIPromptImpl;
-import org.jboss.forge.addon.ui.DefaultUIProgressMonitor;
-import org.jboss.forge.addon.ui.UIProgressMonitor;
+import org.jboss.forge.addon.ui.UIRuntime;
+import org.jboss.forge.addon.ui.command.CommandExecutionListener;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIContextListener;
 import org.jboss.forge.addon.ui.controller.CommandControllerFactory;
-import org.jboss.forge.addon.ui.controller.CommandExecutionListener;
 import org.jboss.forge.addon.ui.input.UIPrompt;
 import org.jboss.forge.addon.ui.output.UIOutput;
-import org.jboss.forge.addon.ui.spi.UIRuntime;
+import org.jboss.forge.addon.ui.progress.DefaultUIProgressMonitor;
+import org.jboss.forge.addon.ui.progress.UIProgressMonitor;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.furnace.spi.ListenerRegistration;

shell/impl/src/main/java/org/jboss/forge/addon/shell/aesh/ForgeCommandRegistry.java

@@ -25,7 +25,7 @@
 import org.jboss.forge.addon.shell.ui.AeshUICommand;
 import org.jboss.forge.addon.shell.ui.ShellContext;
 import org.jboss.forge.addon.shell.ui.ShellContextImpl;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.controller.CommandControllerFactory;
 import org.jboss.forge.addon.ui.controller.SingleCommandController;
 import org.jboss.forge.addon.ui.util.Commands;

shell/impl/src/main/java/org/jboss/forge/addon/shell/aesh/ForgeManProvider.java

@@ -21,7 +21,7 @@
 import org.jboss.forge.addon.shell.CommandManager;
 import org.jboss.forge.addon.shell.ShellImpl;
 import org.jboss.forge.addon.shell.ui.ShellContextImpl;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.input.InputComponent;

shell/impl/src/main/java/org/jboss/forge/addon/shell/aesh/ShellSingleCommand.java

@@ -8,7 +8,7 @@
 
 import org.jboss.aesh.cl.parser.CommandLineParser;
 import org.jboss.forge.addon.shell.ui.ShellContext;
-import org.jboss.forge.addon.ui.UICommand;
+import org.jboss.forge.addon.ui.command.UICommand;
 import org.jboss.forge.addon.ui.controller.CommandController;
 
 /**