Fix some regressions introduced with the QuickSetup code refactorization:

jvergara

03.08.2007 613e2b4c5fb2eb2f443d4902cb98b69e8431cc19

Fix some regressions introduced with the QuickSetup code refactorization:

1. The default button in the panel was not set.
2. When we asked the user to overwrite the current installation and the user clicked "Continue" we did not move to the setup and remained always in the confirmation dialog.

 opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java

@@ -527,7 +527,8 @@
      throw new NullPointerException("step is null");
    }
    currentStep = step;
    getDialog().setDisplayedStep(step, application.getUserData());
    application.setDisplayedWizardStep(step, application.getUserData(),
        getDialog());
  }

  /**

 opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java

@@ -344,18 +344,15 @@

      // Set the default button for the frame
      if (step == REVIEW) {
          dlg.setDefaultButton(ButtonName.FINISH);
          dlg.setFocusOnButton(ButtonName.FINISH);
        dlg.setFocusOnButton(ButtonName.FINISH);
        dlg.setDefaultButton(ButtonName.FINISH);
      } else if (step == PROGRESS) {
          dlg.setDefaultButton(ButtonName.CLOSE);
        dlg.setDefaultButton(ButtonName.CLOSE);
      } else if (step == WELCOME) {
          dlg.setFocusOnButton(ButtonName.NEXT);
      } else if (step == SERVER_SETTINGS) {
          // The focus is set by the panel itself
      } else if (step == DATA_OPTIONS) {
          // The focus is set by the panel itself
        dlg.setDefaultButton(ButtonName.NEXT);
        dlg.setFocusOnButton(ButtonName.NEXT);
      } else if (step == REVIEW) {
          // do nothing?
        dlg.setDefaultButton(ButtonName.NEXT);
      } else if (step == PROGRESS) {
        dlg.setFocusOnButton(ButtonName.CLOSE);
        dlg.setButtonEnabled(ButtonName.CLOSE, false);

 opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java

@@ -143,6 +143,7 @@
  public void forceToDisplay()
  {
    this.forceToDisplay = true;
    framePanel = null;
    frame.getContentPane().removeAll();
    frame.getContentPane().add(getFramePanel());
    frame.pack();