Update the code to avoid and aleatory bug on the web start installer, where...

jvergara

30.56.2008 3441212c28272f189c1690bedbf06e8a3c18df99

Update the code to avoid and aleatory bug on the web start installer, where the value for the checkbox 'Start Server' is not taken into account.  The fix consists basically on using different FieldNames for this checkbox in the upgrade and in the installer.

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.quicksetup.installer;

@@ -3709,7 +3709,7 @@
   */
  private void updateUserDataForReviewPanel(QuickSetup qs)
  {
    Boolean b = (Boolean) qs.getFieldValue(FieldName.SERVER_START);
    Boolean b = (Boolean) qs.getFieldValue(FieldName.SERVER_START_INSTALLER);
    getUserData().setStartServer(b);
    b = (Boolean) qs.getFieldValue(FieldName.ENABLE_WINDOWS_SERVICE);
    getUserData().setEnableWindowsService(b);

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer.ui;
@@ -136,7 +136,7 @@
  public Object getFieldValue(FieldName fieldName)
  {
    Object value = null;
    if (fieldName == FieldName.SERVER_START)
    if (fieldName == FieldName.SERVER_START_INSTALLER)
    {
      value = getStartCheckBox().isSelected();
    }

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;
@@ -163,7 +163,11 @@
  /**
   * The value associated with this is a Boolean.
   */
  SERVER_START,
  SERVER_START_INSTALLER,
  /**
   * The value associated with this is a Boolean.
   */
  SERVER_START_UPGRADER,
  /**
   * The value associated with this is a Boolean.
   */

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java

@@ -607,7 +607,7 @@

    } else if (cStep == UpgradeWizardStep.REVIEW) {
      Boolean startServer =
              (Boolean) qs.getFieldValue(FieldName.SERVER_START);
              (Boolean) qs.getFieldValue(FieldName.SERVER_START_UPGRADER);
      uud.setStartServer(startServer);
    }


 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2008 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.upgrader.ui;
@@ -89,7 +89,7 @@
   */
  public Object getFieldValue(FieldName fieldName) {
    Object value = null;
    if (fieldName == FieldName.SERVER_START) {
    if (fieldName == FieldName.SERVER_START_UPGRADER) {
      value = getBottomComponent().isSelected();
    }
    return value;