From 2e73b396009004784eb9f883dd8f0bc79e7c9fac Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 08 Jan 2010 10:05:47 +0000
Subject: [PATCH] Fix for issue 4471 (Default upgrade path in Webstart upgrader is not correct) Calculate the path instead of using the one provided by the installer.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
index 518cbc6..b6e677f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installandupgrader.ui;
@@ -44,6 +44,7 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.File;
/**
* This panel is used to show a welcome message asking the user whether to
@@ -83,7 +84,16 @@
super.beginDisplay(data);
if (!initialized)
{
- tcServerLocation.setText(data.getServerLocation());
+ String userDir = System.getProperty("user.home");
+ String firstLocation =
+ userDir + File.separator
+ + org.opends.server.util.DynamicConstants.SHORT_NAME;
+ String serverLocation = firstLocation;
+ if (!Utils.directoryExistsAndIsNotEmpty(serverLocation))
+ {
+ serverLocation = data.getServerLocation();
+ }
+ tcServerLocation.setText(serverLocation);
boolean isUpgrade = appl.getInstallAndUpgradeUserData().isUpgrade();
rbInstall.setSelected(!isUpgrade);
rbUpgrade.setSelected(isUpgrade);
--
Gitblit v1.10.0