From 3441212c28272f189c1690bedbf06e8a3c18df99 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 30 Jan 2008 19:56:53 +0000
Subject: [PATCH] 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/upgrader/Upgrader.java | 2 +-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 4 ++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java | 8 ++++++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java | 4 ++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 4 ++--
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index d44288f..ddbdf5f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/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);
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index b46ca9d..dc089ef 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ 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();
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
index 252af42..f9fb6c3 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
+++ b/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.
*/
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 9b28a53..3d2bda2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/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);
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java
index 454894d..08017bb 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/UpgraderReviewPanel.java
+++ b/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;
--
Gitblit v1.10.0