Added category to JavaEE addons and improved AbstractUICommand

forge · Jun 1, 2013 · b87efe2 · b87efe2
1 parent c2e8fb1
commit b87efe2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewEntityCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewEntityCommand.java
@@ -22,7 +22,6 @@
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.UIInput;
 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.Result;
 import org.jboss.forge.addon.ui.result.Results;
@@ -53,9 +52,9 @@ public class NewEntityCommand extends AbstractProjectUICommand
    private PersistenceOperations persistenceOperations;
 
    @Override
-   public UICommandMetadata getMetadata()
+   public Metadata getMetadata()
    {
-      return Metadata.forCommand(getClass()).name("JPA: New Entity").description("Create a new JPA Entity");
+      return super.getMetadata().name("JPA: New Entity").description("Create a new JPA Entity");
    }
 
    @Override

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldCommand.java
@@ -14,7 +14,6 @@
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.UIInput;
-import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.metadata.WithAttributes;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.result.Results;
@@ -32,9 +31,9 @@ public class NewFieldCommand extends AbstractProjectUICommand
    private UIInput<String> typeName;
 
    @Override
-   public UICommandMetadata getMetadata()
+   public Metadata getMetadata()
    {
-      return Metadata.forCommand(getClass()).name("JPA: New Field").description("Create a new field");
+      return super.getMetadata().name("JPA: New Field").description("Create a new field");
    }
 
    @Override

diff --git a/...c/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupConnectionStep.java b/...c/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupConnectionStep.java
@@ -27,7 +27,6 @@
 import org.jboss.forge.addon.ui.hints.InputType;
 import org.jboss.forge.addon.ui.input.UIInput;
 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;
@@ -78,9 +77,9 @@ public NavigationResult next(UIContext context) throws Exception
    }
 
    @Override
-   public UICommandMetadata getMetadata()
+   public Metadata getMetadata()
    {
-      return Metadata.forCommand(PersistenceSetupConnectionStep.class).name("JPA: Connection Settings")
+      return super.getMetadata().name("JPA: Connection Settings")
                .description("Configure your connection settings");
    }
 

diff --git a/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizard.java b/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizard.java
@@ -20,7 +20,6 @@
 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.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;
@@ -51,9 +50,9 @@ public class PersistenceSetupWizard extends AbstractProjectUICommand implements
    private HibernateProvider defaultProvider;
 
    @Override
-   public UICommandMetadata getMetadata()
+   public Metadata getMetadata()
    {
-      return Metadata.forCommand(PersistenceSetupWizard.class).name("JPA: Setup")
+      return super.getMetadata().name("JPA: Setup")
                .description("Setup JPA in your project").category(Categories.create("JPA"));
    }
 

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ui/AbstractProjectUICommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/ui/AbstractProjectUICommand.java
@@ -15,6 +15,8 @@
 import org.jboss.forge.addon.ui.AbstractUICommand;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UISelection;
+import org.jboss.forge.addon.ui.util.Categories;
+import org.jboss.forge.addon.ui.util.Metadata;
 
 public abstract class AbstractProjectUICommand extends AbstractUICommand
 {
@@ -34,4 +36,10 @@ protected Project getSelectedProject(UIContext context)
       }
       return project;
    }
+
+   @Override
+   public Metadata getMetadata()
+   {
+      return super.getMetadata().category(Categories.create("Java EE"));
+   }
 }
diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/AbstractUICommand.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/AbstractUICommand.java
@@ -9,7 +9,6 @@
 
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
-import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.util.Metadata;
 
 /**
@@ -26,7 +25,7 @@ public boolean isEnabled(UIContext context)
    }
 
    @Override
-   public UICommandMetadata getMetadata()
+   public Metadata getMetadata()
    {
       return Metadata.forCommand(getClass());
    }