FORGE-1689 Fix ambiguous dependency resolution for ScaffoldProvider

forge · Mar 19, 2014 · 08cc781 · 08cc781
1 parent bdf3dba
commit 08cc781
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...mpl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java b/...mpl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java
@@ -7,6 +7,7 @@
 
 package org.jboss.forge.addon.scaffold.impl.ui;
 
+import java.util.Iterator;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -63,7 +64,11 @@ public class ScaffoldGenerateCommandImpl extends AbstractProjectCommand implemen
    @Override
    public void initializeUI(UIBuilder builder) throws Exception
    {
-      provider.setDefaultValue(scaffoldProviders.get());
+      Iterator<ScaffoldProvider> scaffolds = scaffoldProviders.iterator();
+      if (scaffolds.hasNext())
+      {
+         provider.setDefaultValue(scaffolds.next());
+      }
       provider.setValueChoices(scaffoldProviders);
       provider.setItemLabelConverter(new Converter<ScaffoldProvider, String>()
       {

diff --git a/...ld/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldSetupWizardImpl.java b/...ld/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldSetupWizardImpl.java
@@ -7,6 +7,7 @@
 
 package org.jboss.forge.addon.scaffold.impl.ui;
 
+import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
@@ -73,7 +74,11 @@ public Boolean call() throws Exception
          }
       });
 
-      provider.setDefaultValue(scaffoldProviders.get());
+      Iterator<ScaffoldProvider> scaffolds = scaffoldProviders.iterator();
+      if (scaffolds.hasNext())
+      {
+         provider.setDefaultValue(scaffolds.next());
+      }
       provider.setValueChoices(scaffoldProviders);
       provider.setItemLabelConverter(new Converter<ScaffoldProvider, String>()
       {