From 7d2698d372148b72f317bd9ff4d16c34e522c96d Mon Sep 17 00:00:00 2001
From: jcduff <jcduff@localhost>
Date: Mon, 22 Dec 2008 15:32:17 +0000
Subject: [PATCH] Implement support for click-thru license approval in quicksetup. A new panel will show up to present the license if the license file Legal/license_to_accept.txt exists in the layout. Otherwise, quicksetup will have the same behavior as before.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 6dfe642..005aebe 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
@@ -63,6 +63,7 @@
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.LicenseFile;
import org.opends.quicksetup.ProgressStep;
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.ReturnCode;
@@ -87,6 +88,7 @@
import org.opends.quicksetup.installer.ui.GlobalAdministratorPanel;
import org.opends.quicksetup.installer.ui.InstallReviewPanel;
import org.opends.quicksetup.installer.ui.InstallWelcomePanel;
+import org.opends.quicksetup.installer.ui.InstallLicensePanel;
import org.opends.quicksetup.installer.ui.RemoteReplicationPortsPanel;
import org.opends.quicksetup.installer.ui.ServerSettingsPanel;
import org.opends.quicksetup.installer.ui.SuffixesToReplicatePanel;
@@ -192,6 +194,9 @@
*/
public Installer() {
lstSteps.add(WELCOME);
+ if (LicenseFile.exists()) {
+ lstSteps.add(LICENSE);
+ }
lstSteps.add(SERVER_SETTINGS);
lstSteps.add(REPLICATION_OPTIONS);
lstSteps.add(CREATE_GLOBAL_ADMINISTRATOR);
@@ -511,6 +516,8 @@
QuickSetupStepPanel p = null;
if (step == WELCOME) {
p = new InstallWelcomePanel(this);
+ } else if (step == LICENSE) {
+ p = new InstallLicensePanel(this);
} else if (step == SERVER_SETTINGS) {
p = new ServerSettingsPanel(this);
} else if (step == REPLICATION_OPTIONS) {
@@ -716,6 +723,9 @@
{
LinkedHashSet<WizardStep> orderedSteps = new LinkedHashSet<WizardStep>();
orderedSteps.add(WELCOME);
+ if (lstSteps.contains(LICENSE)) {
+ orderedSteps.add(LICENSE);
+ }
orderedSteps.add(SERVER_SETTINGS);
orderedSteps.add(REPLICATION_OPTIONS);
orderedSteps.add(CREATE_GLOBAL_ADMINISTRATOR);
--
Gitblit v1.10.0