[460831] Disable advanced settings when the installation proceeds

https://bugs.eclipse.org/bugs/show_bug.cgi?id=460831

2 files changed, 21 insertions, 1 deletions

diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleInstallerDialog.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleInstallerDialog.java
index d35b825aa..ebc113421 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleInstallerDialog.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleInstallerDialog.java
@@ -65,6 +65,8 @@ public final class SimpleInstallerDialog extends AbstractSimpleDialog implements
 
   private Resolution updateResolution;
 
+  private ToolButton advancedButton;
+
   public SimpleInstallerDialog(Display display, final Installer installer)
   {
     super(display, OS.INSTANCE.isMac() ? SWT.TOOL : SWT.BORDER, 800, 600, MARGIN_WIDTH, MARGIN_HEIGHT);
@@ -109,7 +111,7 @@ public final class SimpleInstallerDialog extends AbstractSimpleDialog implements
       }
     });
 
-    ToolButton advancedButton = new ToolButton(titleComposite, SWT.PUSH, SetupInstallerPlugin.INSTANCE.getSWTImage("simple/advanced.png"), true);
+    advancedButton = new ToolButton(titleComposite, SWT.PUSH, SetupInstallerPlugin.INSTANCE.getSWTImage("simple/advanced.png"), true);
     advancedButton.setLayoutData(new GridData(GridData.END, GridData.BEGINNING, false, false));
     advancedButton.setToolTipText("Switch to advanced mode");
     advancedButton.addSelectionListener(new SelectionAdapter()
@@ -166,6 +168,19 @@ public final class SimpleInstallerDialog extends AbstractSimpleDialog implements
     return installer;
   }
 
+  public void setButtonsEnabled(boolean enabled)
+  {
+    if (updateButton != null)
+    {
+      updateButton.setEnabled(enabled);
+    }
+
+    if (advancedButton != null)
+    {
+      advancedButton.setEnabled(enabled);
+    }
+  }
+
   public boolean refreshJREs()
   {
     if (variablePage != null)
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleVariablePage.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleVariablePage.java
index a17c0ef93..179dc7121 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleVariablePage.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/SimpleVariablePage.java
@@ -437,6 +437,7 @@ public class SimpleVariablePage extends SimpleInstallerPage
         }
         else
         {
+          dialog.setButtonsEnabled(false);
           setEnabled(false);
 
           installButton.setImage(SetupInstallerPlugin.INSTANCE.getSWTImage("simple/download_small.png"));
@@ -911,7 +912,9 @@ public class SimpleVariablePage extends SimpleInstallerPage
       installThread.interrupt();
     }
 
+    dialog.setButtonsEnabled(true);
     setEnabled(true);
+
     progressLabel.setForeground(getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
     progressLabel.setText("Installation canceled");
 
@@ -970,6 +973,8 @@ public class SimpleVariablePage extends SimpleInstallerPage
 
     cancelButton.setVisible(false);
     installStack.setTopControl(installButton);
+
+    dialog.setButtonsEnabled(true);
   }
 
   private void launchProduct()