FORGE-2316: Renamed NullStack to NoStack and changed the shell option…

… values format
forge · Jan 14, 2016 · 0342c00 · 0342c00
1 parent 415f03a
commit 0342c00
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 41 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/JavaEE6FacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/JavaEE6FacetImpl.java
@@ -71,12 +71,6 @@ public Stack getStack()
       return JavaEE6Facet.STACK;
    }
 
-   @Override
-   public int priority()
-   {
-      return 1;
-   }
-
    @Override
    public boolean supports(ProjectType projectType)
    {

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/JavaEE7FacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/JavaEE7FacetImpl.java
@@ -82,12 +82,6 @@ public boolean supports(ProjectType projectType)
       return facets.contains(JavaSourceFacet.class);
    }
 
-   @Override
-   public int priority()
-   {
-      return 1;
-   }
-
    @Override
    public boolean uninstall()
    {

diff --git a/projects/api/src/main/java/org/jboss/forge/addon/projects/stacks/StackFacet.java b/projects/api/src/main/java/org/jboss/forge/addon/projects/stacks/StackFacet.java
@@ -23,13 +23,6 @@ public interface StackFacet extends ProjectFacet
     */
    Stack getStack();
 
-   /**
-    * @return The priority this {@link StackFacet} has related to other {@link StackFacet}s.
-    * 
-    *         Lower values receive a higher priority
-    */
-   int priority();
-
    /**
     * Does this {@link StackFacet} support the given {@link ProjectType} in the New Project wizard?
     * 

diff --git a/...orge/addon/projects/stacks/NullStack.java → .../forge/addon/projects/stacks/NoStack.java b/...orge/addon/projects/stacks/NullStack.java → .../forge/addon/projects/stacks/NoStack.java
@@ -18,11 +18,11 @@
  *
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  */
-public class NullStack implements Stack
+public class NoStack implements Stack
 {
-   public static final NullStack INSTANCE = new NullStack();
+   public static final NoStack INSTANCE = new NoStack();
 
-   private NullStack()
+   private NoStack()
    {
    }
 

diff --git a/...addon/projects/stacks/NullStackFacet.java → ...e/addon/projects/stacks/NoStackFacet.java b/...addon/projects/stacks/NullStackFacet.java → ...e/addon/projects/stacks/NoStackFacet.java
@@ -16,7 +16,7 @@
  * 
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  */
-public class NullStackFacet extends AbstractFacet<Project> implements StackFacet
+public class NoStackFacet extends AbstractFacet<Project> implements StackFacet
 {
    @Override
    public boolean install()
@@ -33,19 +33,12 @@ public boolean isInstalled()
    @Override
    public Stack getStack()
    {
-      return NullStack.INSTANCE;
+      return NoStack.INSTANCE;
    }
 
    @Override
    public boolean supports(ProjectType projectType)
    {
       return true;
    }
-
-   @Override
-   public int priority()
-   {
-      return Integer.MIN_VALUE;
-   }
-
 }
diff --git a/projects/impl/src/main/java/org/jboss/forge/addon/projects/stacks/StackFacetComparator.java b/projects/impl/src/main/java/org/jboss/forge/addon/projects/stacks/StackFacetComparator.java
@@ -18,12 +18,7 @@ public class StackFacetComparator implements Comparator<StackFacet>
    @Override
    public int compare(StackFacet o1, StackFacet o2)
    {
-      int result = o2.priority() - o1.priority();
-      if (result == 0)
-      {
-         result = o2.getStack().getName().compareTo(o1.getStack().getName());
-      }
-      return result;
+      return o2.getStack().getName().compareTo(o1.getStack().getName());
    }
 
 }
diff --git a/projects/impl/src/main/java/org/jboss/forge/addon/projects/ui/NewProjectWizardImpl.java b/projects/impl/src/main/java/org/jboss/forge/addon/projects/ui/NewProjectWizardImpl.java
@@ -20,7 +20,7 @@
 import org.jboss.forge.addon.projects.ProvidedProjectFacet;
 import org.jboss.forge.addon.projects.facets.MetadataFacet;
 import org.jboss.forge.addon.projects.facets.PackagingFacet;
-import org.jboss.forge.addon.projects.stacks.NullStackFacet;
+import org.jboss.forge.addon.projects.stacks.NoStackFacet;
 import org.jboss.forge.addon.projects.stacks.StackFacet;
 import org.jboss.forge.addon.projects.stacks.StackFacetComparator;
 import org.jboss.forge.addon.resource.DirectoryResource;
@@ -276,7 +276,7 @@ public ProjectProvider call() throws Exception
 
    private void configureStack(InputComponentFactory factory, final UIContext context)
    {
-      NullStackFacet defaultStack = SimpleContainer.getServices(getClass().getClassLoader(), NullStackFacet.class)
+      NoStackFacet defaultStack = SimpleContainer.getServices(getClass().getClassLoader(), NoStackFacet.class)
                .get();
       Imported<StackFacet> stacks = SimpleContainer.getServices(getClass().getClassLoader(), StackFacet.class);
       final List<StackFacet> list = Lists.toList(stacks);
@@ -289,7 +289,7 @@ private void configureStack(InputComponentFactory factory, final UIContext conte
                         .collect(Collectors.toSet()))
                .setDefaultValue(defaultStack)
                .setItemLabelConverter((facet) -> context.getProvider().isGUI() ? facet.getStack().getName()
-                        : Commands.shellifyOptionNameDashed(facet.getStack().getName()));
+                        : Commands.shellifyOptionValue(facet.getStack().getName()));
    }
 
    private boolean isProjectTypeBuildable(ProjectType type, ProjectProvider buildSystem)

diff --git a/...mpl/src/main/resources/META-INF/services/org.jboss.forge.furnace.container.simple.Service b/...mpl/src/main/resources/META-INF/services/org.jboss.forge.furnace.container.simple.Service
@@ -1,7 +1,7 @@
 org.jboss.forge.addon.projects.impl.DependencyInstallerImpl
 org.jboss.forge.addon.projects.impl.facets.ClassLoaderFacetImpl
 org.jboss.forge.addon.projects.shell.ProjectRootCdTokenHandler
-org.jboss.forge.addon.projects.stacks.NullStackFacet
+org.jboss.forge.addon.projects.stacks.NoStackFacet
 org.jboss.forge.addon.projects.types.ParentProjectType
 org.jboss.forge.addon.projects.types.ResourcesProjectType
 org.jboss.forge.addon.projects.ui.BuildCommand

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
@@ -107,6 +107,17 @@ public static String shellifyOptionName(String name)
       return shellifyName(name);
    }
 
+   /**
+    * Shellifies an option value
+    * 
+    * @param value
+    * @return
+    */
+   public static String shellifyOptionValue(String value)
+   {
+      return COLONS.matcher(WHITESPACES.matcher(value.trim()).replaceAll("_")).replaceAll("").toUpperCase();
+   }
+
    /**
     * Shellifies an option name using the provided style
     * 

diff --git a/ui/api/src/test/java/org/jboss/forge/addon/ui/util/CommandsTest.java b/ui/api/src/test/java/org/jboss/forge/addon/ui/util/CommandsTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 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.ui.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
+ */
+public class CommandsTest
+{
+   /**
+    * Test method for {@link org.jboss.forge.addon.ui.util.Commands#shellifyOptionValue(java.lang.String)}.
+    */
+   @Test
+   public void testShellifyOptionValue()
+   {
+      Assert.assertEquals("JAVA_EE_7", Commands.shellifyOptionValue("Java EE 7"));
+   }
+
+}