Support a "simple variable with defaults" for the simple installer

- Provide an annotation to mark a variable that can be used in products
in the installer's simple mode and will simply take on the variable's
default value, or the value of the variable's first choice, without
prompting and will be handled as usual in the installer's advanced mode.

Author: merks

plugins/org.eclipse.oomph.setup.editor/src/org/eclipse/oomph/setup/presentation/SetupActionBarContributor.java

@@ -719,6 +719,19 @@ private Collection<IAction> addSpecializedAnnotationCreationActions(Collection<?
           }
         }
 
+        if (variable.getAnnotation(AnnotationConstants.ANNOTATION_SIMPLE_MODE_DEFAULT_VARIABLE) == null)
+        {
+          String name = variable.getName();
+          if (name != null && !name.startsWith("*") && (variable.getDefaultValue() != null || !variable.getChoices().isEmpty())) //$NON-NLS-1$
+          {
+            Annotation annotation = BaseFactory.eINSTANCE.createAnnotation(AnnotationConstants.ANNOTATION_SIMPLE_MODE_DEFAULT_VARIABLE);
+            CommandParameter descriptor = new CommandParameter(null, BasePackage.Literals.MODEL_ELEMENT__ANNOTATIONS, annotation);
+            Action action = sibling ? new CreateSiblingAction(domain, selection, descriptor) : new CreateChildAction(domain, selection, descriptor);
+            action.setText(action.getText() + " - " + AnnotationConstants.ANNOTATION_SIMPLE_MODE_DEFAULT_VARIABLE); //$NON-NLS-1$
+            actions.add(action);
+          }
+        }
+
         if (variable.getAnnotation(AnnotationConstants.ANNOTATION_INHERITED_CHOICES) == null)
         {
           Annotation annotation = BaseFactory.eINSTANCE.createAnnotation(AnnotationConstants.ANNOTATION_INHERITED_CHOICES);

plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleVariablePage.java

@@ -40,6 +40,7 @@
 import org.eclipse.oomph.setup.SetupTaskContext;
 import org.eclipse.oomph.setup.Trigger;
 import org.eclipse.oomph.setup.User;
+import org.eclipse.oomph.setup.VariableChoice;
 import org.eclipse.oomph.setup.VariableTask;
 import org.eclipse.oomph.setup.internal.core.AbstractSetupTaskContext;
 import org.eclipse.oomph.setup.internal.core.SetupContext;
@@ -1267,6 +1268,11 @@ public void run()
 
       SimplePrompter prompter = new SimplePrompter(OS.INSTANCE.getForBitness(javaController.getBitness()), vmPath);
       performer = SetupTaskPerformer.create(uriConverter, prompter, Trigger.BOOTSTRAP, setupContext, false);
+      List<VariableTask> resolvedSimpleDefaultVariables = prompter.getResolvedSimpleDefaultVariables();
+      if (performer == null)
+      {
+        performer = SetupTaskPerformer.create(uriConverter, prompter, Trigger.BOOTSTRAP, setupContext, false);
+      }
 
       final List<VariableTask> unresolvedVariables = prompter.getUnresolvedVariables();
       if (!unresolvedVariables.isEmpty())
@@ -1352,6 +1358,7 @@ public void init(UIServices serviceUI)
       performer.log(NLS.bind(Messages.SimpleVariablePage_ExecutingTasks_message, performer.getTrigger().toString().toLowerCase()));
       performer.put(org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener.class, new DownloadArtifactLister());
       performer.perform(progress);
+      performer.getUnresolvedVariables().addAll(resolvedSimpleDefaultVariables);
       performer.recordVariables(installation, null, user);
       performer.savePasswords();
 
@@ -1988,6 +1995,38 @@ public String getVMPath()
       return vmPath;
     }
 
+    public List<VariableTask> getResolvedSimpleDefaultVariables()
+    {
+      List<VariableTask> result = new ArrayList<VariableTask>();
+      for (Iterator<VariableTask> it = unresolvedVariables.iterator(); it.hasNext();)
+      {
+        VariableTask variable = it.next();
+        String name = variable.getName();
+        if (variable.getAnnotation(AnnotationConstants.ANNOTATION_SIMPLE_MODE_DEFAULT_VARIABLE) != null)
+        {
+          String value = variable.getDefaultValue();
+          if (value == null)
+          {
+            EList<VariableChoice> choices = variable.getChoices();
+            if (!choices.isEmpty())
+            {
+              value = choices.get(0).getLabel();
+            }
+          }
+
+          if (value != null)
+          {
+            variable.setValue(value);
+            put(name, value);
+            result.add(variable);
+            it.remove();
+          }
+        }
+      }
+
+      return result;
+    }
+
     public List<VariableTask> getUnresolvedVariables()
     {
       return unresolvedVariables;

plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java

@@ -73,6 +73,8 @@ public final class AnnotationConstants
 
   public static final String ANNOTATION_GLOBAL_VARIABLE = "http://www.eclipse.org/oomph/setup/GlobalVariable"; //$NON-NLS-1$
 
+  public static final String ANNOTATION_SIMPLE_MODE_DEFAULT_VARIABLE = "http://www.eclipse.org/oomph/setup/SimpleDefaultVariable"; //$NON-NLS-1$
+
   public static final String ANNOTATION_UNDECLARED_VARIABLE = "http://www.eclipse.org/oomph/setup/UndeclaredVariable"; //$NON-NLS-1$
 
   public static final String KEY_INHERIT = "inherit"; //$NON-NLS-1$