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/server/org/opends/server/tools/InstallDS.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 0d34fd4..86a5a19 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -432,7 +432,9 @@
// and force to accept it.
String yes = INFO_LICENSE_CLI_ACCEPT_YES.get().toString();
String no = INFO_LICENSE_CLI_ACCEPT_NO.get().toString();
- println(INFO_LICENSE_DETAILS_LABEL.get());
+ String yesShort = INFO_PROMPT_YES_FIRST_LETTER_ANSWER.get().toString();
+ String noShort = INFO_PROMPT_NO_FIRST_LETTER_ANSWER.get().toString();
+ println(INFO_LICENSE_DETAILS_CLI_LABEL.get());
BufferedReader in = getInputStream();
while (true)
@@ -442,13 +444,15 @@
{
String response = in.readLine();
if ((response == null)
- || (response.toLowerCase().equals(no.toLowerCase()))
+ || (response.equalsIgnoreCase(no))
+ || (response.equalsIgnoreCase(noShort))
|| (response.length() == 0))
{
return ErrorReturnCode.ERROR_LICENSE_NOT_ACCEPTED.getReturnCode();
}
else
- if (response.toLowerCase().equals(yes.toLowerCase()))
+ if (response.equalsIgnoreCase(yes)
+ || response.equalsIgnoreCase(yesShort))
{
LicenseFile.setApproval(true);
break ;
--
Gitblit v1.10.0