Ordered items and set default values

forge · May 21, 2013 · 06feb79 · 06feb79
1 parent 1dcc32f
commit 06feb79
Showing 1 changed file with 30 additions and 4 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/PersistenceSetupWizard.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/PersistenceSetupWizard.java
@@ -7,15 +7,17 @@
 
 package org.jboss.forge.addon.javaee.jpa.ui;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Comparator;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javax.inject.Inject;
 
 import org.jboss.forge.addon.convert.Converter;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
 import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
+import org.jboss.forge.addon.javaee.jpa.containers.JBossEAP6Container;
+import org.jboss.forge.addon.javaee.jpa.providers.HibernateProvider;
 import org.jboss.forge.addon.ui.context.UIBuilder;
 import org.jboss.forge.addon.ui.context.UIContext;
 import org.jboss.forge.addon.ui.context.UIValidationContext;
@@ -42,6 +44,12 @@ public class PersistenceSetupWizard implements UIWizard
    @WithAttributes(label = "Provider:", required = true, requiredMessage = "Please select a persistence provider")
    private UISelectOne<PersistenceProvider> providers;
 
+   @Inject
+   private JBossEAP6Container defaultContainer;
+
+   @Inject
+   private HibernateProvider defaultProvider;
+
    @Inject
    private AddonRegistry addonRegistry;
 
@@ -68,7 +76,15 @@ public void initializeUI(UIBuilder builder) throws Exception
 
    private void initContainers()
    {
-      List<PersistenceContainer> persistenceContainers = new ArrayList<PersistenceContainer>();
+      Set<PersistenceContainer> persistenceContainers = new TreeSet<PersistenceContainer>(
+               new Comparator<PersistenceContainer>()
+               {
+                  @Override
+                  public int compare(PersistenceContainer o1, PersistenceContainer o2)
+                  {
+                     return o1.getName().compareTo(o2.getName());
+                  }
+               });
       Set<ExportedInstance<PersistenceContainer>> exportedInstances = addonRegistry
                .getExportedInstances(PersistenceContainer.class);
       for (ExportedInstance<PersistenceContainer> exportedInstance : exportedInstances)
@@ -84,11 +100,20 @@ public String convert(PersistenceContainer source)
          }
       });
       containers.setValueChoices(persistenceContainers);
+      containers.setDefaultValue(defaultContainer);
    }
 
    private void initProviders()
    {
-      List<PersistenceProvider> persistenceProviders = new ArrayList<PersistenceProvider>();
+      Set<PersistenceProvider> persistenceProviders = new TreeSet<PersistenceProvider>(
+               new Comparator<PersistenceProvider>()
+               {
+                  @Override
+                  public int compare(PersistenceProvider o1, PersistenceProvider o2)
+                  {
+                     return o1.getName().compareTo(o2.getName());
+                  }
+               });
       Set<ExportedInstance<PersistenceProvider>> exportedInstances = addonRegistry
                .getExportedInstances(PersistenceProvider.class);
       for (ExportedInstance<PersistenceProvider> exportedInstance : exportedInstances)
@@ -104,6 +129,7 @@ public String convert(PersistenceProvider source)
          }
       });
       providers.setValueChoices(persistenceProviders);
+      providers.setDefaultValue(defaultProvider);
    }
 
    @Override