FORGE-1479: AddConstraint now calls setup before running

forge · Feb 14, 2014 · 1a1013c · 1a1013c
1 parent 9d54b0a
commit 1a1013c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java
@@ -398,10 +398,6 @@ public List<Class<? extends UICommand>> getSetupSteps(UIContext context)
       {
          setup.add(JPASetupWizard.class);
       }
-      else if (project.getFacet(JPAFacet.class).getAllEntities().isEmpty())
-      {
-         setup.add(NewEntityCommand.class);
-      }
       return setup;
    }
 

diff --git a/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ui/AddConstraintWizard.java b/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/validation/ui/AddConstraintWizard.java
@@ -14,12 +14,14 @@
 
 import org.jboss.forge.addon.javaee.ui.AbstractJavaEECommand;
 import org.jboss.forge.addon.javaee.validation.ValidationFacet;
+import org.jboss.forge.addon.javaee.validation.ui.setup.ValidationProviderSetupCommand;
 import org.jboss.forge.addon.parser.java.facets.JavaSourceFacet;
 import org.jboss.forge.addon.parser.java.resources.JavaResource;
 import org.jboss.forge.addon.parser.java.resources.JavaResourceVisitor;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.visit.VisitContext;
+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;
@@ -115,15 +117,21 @@ public NavigationResult next(UINavigationContext context) throws Exception
    }
 
    @Override
-   public boolean isEnabled(UIContext context)
+   protected boolean isProjectRequired()
    {
-      return super.isEnabled(context) && getSelectedProject(context).hasFacet(ValidationFacet.class);
+      return true;
    }
 
    @Override
-   protected boolean isProjectRequired()
+   public List<Class<? extends UICommand>> getSetupSteps(UIContext context)
    {
-      return true;
+      List<Class<? extends UICommand>> setup = new ArrayList<>();
+      Project project = getSelectedProject(context);
+      if (!project.hasFacet(ValidationFacet.class))
+      {
+         setup.add(ValidationProviderSetupCommand.class);
+      }
+      return setup;
    }
 
 }