FORGE-1479: RestEndpointFromEntity now doesn't require a JPA Facet to be

enabled
forge · Feb 14, 2014 · 6f93b4a · 6f93b4a
1 parent 1a1013c
commit 6f93b4a
Showing 1 changed file with 5 additions and 42 deletions.
diff --git a/...rest/ui/RestEndpointFromEntityWizard.java → ...est/ui/RestEndpointFromEntityCommand.java b/...rest/ui/RestEndpointFromEntityWizard.java → ...est/ui/RestEndpointFromEntityCommand.java
@@ -35,20 +35,16 @@
 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.context.UIValidationContext;
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.UIInput;
 import org.jboss.forge.addon.ui.input.UISelectMany;
 import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
-import org.jboss.forge.addon.ui.result.NavigationResult;
 import org.jboss.forge.addon.ui.result.Result;
 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.wizard.UIWizard;
 import org.jboss.forge.parser.java.JavaClass;
 import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceCommonDescriptor;
 import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
@@ -58,7 +54,7 @@
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-public class RestEndpointFromEntityWizard extends AbstractJavaEECommand implements UIWizard
+public class RestEndpointFromEntityCommand extends AbstractJavaEECommand
 {
    @Inject
    @WithAttributes(label = "Content Type", defaultValue = MediaType.APPLICATION_XML, required = true)
@@ -192,28 +188,6 @@ private Set<JavaClass> generateEndpoints(RestGenerationContextImpl generationCon
       return classes;
    }
 
-   @Override
-   public void validate(final UIValidationContext validator)
-   {
-      super.validate(validator);
-   }
-
-   @Override
-   public boolean isEnabled(final UIContext context)
-   {
-      boolean enabled;
-      if (super.isEnabled(context))
-      {
-         Project project = getSelectedProject(context);
-         enabled = project.hasFacet(JPAFacet.class) && project.hasFacet(JavaSourceFacet.class);
-      }
-      else
-      {
-         enabled = false;
-      }
-      return enabled;
-   }
-
    @Override
    protected boolean isProjectRequired()
    {
@@ -225,27 +199,12 @@ private RestGenerationContextImpl createContextFor(final UIContext context)
       RestGenerationContextImpl generationContext = new RestGenerationContextImpl();
       generationContext.setProject(getSelectedProject(context));
       generationContext.setContentType(contentType.getValue());
-      // generationContext.setEntity(entity);
       generationContext.setPersistenceUnitName(persistenceUnit.getValue());
       generationContext.setTargetPackageName(packageName.getValue());
       generationContext.setInflector(inflector);
       return generationContext;
    }
 
-   @Override
-   public NavigationResult next(UINavigationContext context) throws Exception
-   {
-      Project project = getSelectedProject(context);
-      if (project.hasFacet(EJBFacet.class))
-      {
-         return null;
-      }
-      else
-      {
-         return Results.navigateTo(EJBSetupWizard.class);
-      }
-   }
-
    @Override
    public List<Class<? extends UICommand>> getSetupSteps(UIContext context)
    {
@@ -259,6 +218,10 @@ public List<Class<? extends UICommand>> getSetupSteps(UIContext context)
       {
          setup.add(JPASetupWizard.class);
       }
+      if (!project.hasFacet(EJBFacet.class))
+      {
+         setup.add(EJBSetupWizard.class);
+      }
       return setup;
    }