From 6292beaede500c125091a84263ed7cda454ba299 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 21 Oct 2015 16:05:43 +0000
Subject: [PATCH] OPENDJ-2348 PR-96 Remove webstart and netscape support
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 53 +++++++++++++----------------------------------------
1 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 2f4c09f..432e209 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -94,8 +94,6 @@
private boolean isCheckingVisible;
- private static boolean userAgreedWithWebStart;
-
/**
* Constructor of the JavaArgumentsDialog.
* @param parent the parent frame for this dialog.
@@ -585,11 +583,8 @@
}
else
{
- if (displayWebStartWarningIfRequired())
- {
- isCanceled = false;
- dispose();
- }
+ isCanceled = false;
+ dispose();
}
}
}
@@ -749,24 +744,21 @@
checkOptions(options, errorMsgs, new JLabel[]{l}, errorMsg);
}
- private void checkOptions(String options, Collection<LocalizableMessage> errorMsgs,
- JLabel[] ls, LocalizableMessage errorMsg)
+ private void checkOptions(
+ String options, Collection<LocalizableMessage> errorMsgs, JLabel[] ls, LocalizableMessage errorMsg)
{
- if (!Utils.isWebStart())
+ String javaHome = System.getProperty("java.home");
+ if (javaHome == null || javaHome.length() == 0)
{
- String javaHome = System.getProperty("java.home");
- if (javaHome == null || javaHome.length() == 0)
+ javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
+ }
+ if (!Utils.supportsOption(options, javaHome, INSTALL_PATH))
+ {
+ for (JLabel l : ls)
{
- javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
+ setValidLater(l, false);
}
- if (!Utils.supportsOption(options, javaHome, INSTALL_PATH))
- {
- for (JLabel l : ls)
- {
- setValidLater(l, false);
- }
- errorMsgs.add(errorMsg);
- }
+ errorMsgs.add(errorMsg);
}
}
@@ -909,23 +901,4 @@
ERR_GENERIC_JAVA_ARGUMENT.get(sb));
}
}
-
- private boolean displayWebStartWarningIfRequired()
- {
- if (Utils.isWebStart() && !userAgreedWithWebStart)
- {
- JavaArguments args = getJavaArguments();
- if (!args.equals(javaArguments) &&
- (args.getInitialMemory() != -1 ||
- args.getMaxMemory() != -1 ||
- args.getAdditionalArguments().length > 0))
- {
- userAgreedWithWebStart = displayConfirmationDialog(
- INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART.get(),
- INFO_CONFIRMATION_TITLE.get());
- return userAgreedWithWebStart;
- }
- }
- return true;
- }
}
--
Gitblit v1.10.0