From e85e6d0af6875147e77127f10e0211c014ca28d9 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 10 May 2007 14:16:11 +0000
Subject: [PATCH] This commit addresses several issues that Brian brought up regarding the upgrader.
---
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 24b7e7f..8d16787 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -151,6 +151,15 @@
/**
* {@inheritDoc}
*/
+ public UserData createUserData() {
+ UserData ud = new UserData();
+ ud.setServerLocation(Utils.getDefaultServerLocation());
+ return ud;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void forceToDisplay() {
forceToDisplaySetup = true;
}
@@ -300,6 +309,15 @@
/**
* {@inheritDoc}
*/
+ public boolean isFinished()
+ {
+ return getCurrentProgressStep() == InstallProgressStep.FINISHED_SUCCESSFULLY
+ || getCurrentProgressStep() == InstallProgressStep.FINISHED_WITH_ERROR;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void cancelClicked(WizardStep cStep, QuickSetup qs) {
// do nothing;
}
@@ -408,14 +426,21 @@
/**
* {@inheritDoc}
*/
- public String getCloseButtonToolTip() {
+ public String getCloseButtonToolTipKey() {
return "close-button-install-tooltip";
}
/**
* {@inheritDoc}
*/
- public String getFinishButtonToolTip() {
+ public String getQuitButtonToolTipKey() {
+ return "quit-button-install-tooltip";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getFinishButtonToolTipKey() {
return "finish-button-install-tooltip";
}
@@ -1938,7 +1963,7 @@
* Validate the data provided by the user in the create global administrator
* panel and update the UserInstallData object according to that content.
*
- * @throws an
+ * @throws
* UserInstallDataException if the data provided by the user is not
* valid.
*
@@ -2010,7 +2035,7 @@
* Validate the data provided by the user in the replicate suffixes options
* panel and update the UserInstallData object according to that content.
*
- * @throws an
+ * @throws
* UserInstallDataException if the data provided by the user is not
* valid.
*
@@ -2072,8 +2097,7 @@
* Validate the data provided by the user in the new suffix data options panel
* and update the UserInstallData object according to that content.
*
- * @throws an
- * UserInstallDataException if the data provided by the user is not
+ * @throws UserInstallDataException if the data provided by the user is not
* valid.
*
*/
--
Gitblit v1.10.0