From d76f709f8cd5f816ce8ff90cefa6e9b7fcf3ad49 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 04 Sep 2009 12:31:26 +0000
Subject: [PATCH] Use a different message for the license acceptance in CLI and GUI mode. In CLI mode the license appears above and in GUI mode below the message.
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
index 5f939bc..6804efc 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installer.ui;
@@ -39,8 +39,6 @@
import org.opends.quicksetup.ui.GuiApplication;
import org.opends.quicksetup.ui.QuickSetupStepPanel;
import org.opends.quicksetup.ui.UIFactory;
-import org.opends.quicksetup.util.Utils;
-import org.opends.quicksetup.Installation;
import org.opends.quicksetup.LicenseFile;
import org.opends.quicksetup.ButtonName;
@@ -74,22 +72,7 @@
*/
protected Message getInstructions()
{
- /*
- * We can use org.opends.server.util.DynamicConstants without problems as it
- * has been added to quicksetup.jar during build time.
- */
- Message message;
- if (Utils.isWebStart())
- {
- String cmd = Utils.isWindows()? Installation.WINDOWS_SETUP_FILE_NAME:
- Installation.UNIX_SETUP_FILE_NAME;
- message = INFO_LICENSE_PANEL_WEBSTART_INSTRUCTIONS.get();
- }
- else
- {
- message = INFO_LICENSE_PANEL_OFFLINE_INSTRUCTIONS.get();
- }
- return message;
+ return null;
}
private TextArea detailsTextArea;
--
Gitblit v1.10.0