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/installandupgrader/InstallAndUpgrader.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java b/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
index ff016c2..5d14717 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
@@ -40,6 +40,7 @@
import java.util.logging.Logger;
import org.opends.quicksetup.ButtonName;
+import org.opends.quicksetup.Constants;
import org.opends.quicksetup.CurrentInstallStatus;
import org.opends.quicksetup.ProgressStep;
import org.opends.quicksetup.QuickSetupLog;
@@ -49,8 +50,6 @@
import org.opends.quicksetup.WizardStep;
import org.opends.quicksetup.event.ProgressUpdateListener;
import org.opends.quicksetup.installandupgrader.ui.WelcomePanel;
-import org.opends.quicksetup.installer.Installer;
-import org.opends.quicksetup.installer.SetupLauncher;
import org.opends.quicksetup.installer.offline.OfflineInstaller;
import org.opends.quicksetup.installer.webstart.WebStartInstaller;
import org.opends.quicksetup.ui.FieldName;
@@ -70,8 +69,8 @@
{
static private final Logger LOG =
Logger.getLogger(InstallAndUpgrader.class.getName());
- private Installer installer;
- private Upgrader upgrader;
+ private GuiApplication installer;
+ private GuiApplication upgrader;
private InstallAndUpgradeUserData userData;
/**
@@ -84,7 +83,7 @@
if (!QuickSetupLog.isInitialized())
QuickSetupLog.initLogFileHandler(
File.createTempFile(
- SetupLauncher.LOG_FILE_PREFIX,
+ Constants.LOG_FILE_PREFIX,
QuickSetupLog.LOG_FILE_SUFFIX));
} catch (IOException e) {
System.err.println(INFO_ERROR_INITIALIZING_LOG.get());
--
Gitblit v1.10.0