From d7527cb0c55d3e89e89ab1d532dc511521c5a264 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 10 Aug 2008 23:43:10 +0000
Subject: [PATCH] Fix for 3475 (Java Web Start setup is broken in Mac OS).
---
opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
index d91826f..25ecab2 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
@@ -27,12 +27,19 @@
package org.opends.quicksetup.ui;
-import org.opends.quicksetup.*;
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.InProcessServerController;
import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.util.Utils;
+import org.opends.quicksetup.Application;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.ButtonName;
+import org.opends.quicksetup.ReturnCode;
+import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.UserDataCertificateException;
+import org.opends.quicksetup.UserDataException;
import org.opends.quicksetup.UserInteraction;
+import org.opends.quicksetup.WizardStep;
import org.opends.quicksetup.webstart.WebStartDownloader;
import org.opends.messages.Message;
import static org.opends.messages.QuickSetupMessages.*;
@@ -600,7 +607,17 @@
UserInteraction ui = null;
if (getUserData().isInteractive()) {
if (Utils.isCli()) {
- ui = new CliUserInteraction();
+ // Use reflection to avoid breaking the java web start in some
+ // platforms.
+ try
+ {
+ Class cl = Class.forName("org.opends.quicksetup.CliUserInteraction");
+ ui = (UserInteraction) cl.newInstance();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
} else {
ui = new GuiUserInteraction(qs.getFrame());
}
--
Gitblit v1.10.0