From 43e8cc1e0b7576d94c96f07f64b25affb5b07af0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 06 Apr 2007 19:09:13 +0000
Subject: [PATCH] - There are 3 new classes for describing an instance of OpenDS: Installation which describes the filesystem, Status which can answer questions like 'is the server running' and Configuration which represents an instance of config.ldif. Part of the implementations of these classes were pulled from CurrentInstallStatus, Installer and Utils with some new methods to support upgrader needs. There is still some overlap in functionality that I don't like but my attempt at converting the exiting applications to use the new classes ran into problems so I leave that for a future exercise.
---
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index b6e5708..75ea871 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -162,7 +162,7 @@
public void finishClicked(final WizardStep cStep, final QuickSetup qs) {
if (cStep == Step.REVIEW) {
updateUserDataForReviewPanel(qs);
- qs.launchInstallation();
+ qs.launch();
qs.setCurrentStep(Step.PROGRESS);
} else {
throw new IllegalStateException(
@@ -250,9 +250,7 @@
if (installStatus.isInstalled() && !forceToDisplaySetup) {
p = dlg.getInstalledPanel();
} else {
- p = new FramePanel(dlg.getStepsPanel(),
- dlg.getCurrentStepPanel(),
- dlg.getButtonsPanel());
+ p = super.createFramePanel(dlg);
}
return p;
}
@@ -260,7 +258,7 @@
/**
* {@inheritDoc}
*/
- public Set<WizardStep> getWizardSteps() {
+ public Set<? extends WizardStep> getWizardSteps() {
return Collections.unmodifiableSet(new HashSet<WizardStep>(lstSteps));
}
@@ -365,7 +363,7 @@
/**
* {@inheritDoc}
*/
- public ProgressStep getStatus()
+ public ProgressStep getCurrentProgressStep()
{
return status;
}
@@ -438,7 +436,7 @@
argList.add(CONFIG_CLASS_NAME);
argList.add("-c");
- argList.add(getConfigFilePath());
+ argList.add(Utils.getPath(getInstallation().getCurrentConfigurationFile()));
argList.add("-p");
argList.add(String.valueOf(getUserData().getServerPort()));
argList.add("-j");
@@ -494,7 +492,7 @@
argList.add(CONFIG_CLASS_NAME);
argList.add("-f");
- argList.add(getConfigFilePath());
+ argList.add(Utils.getPath(getInstallation().getCurrentConfigurationFile()));
argList.add("-n");
argList.add(getBackendName());
@@ -543,7 +541,7 @@
argList.add(CONFIG_CLASS_NAME);
argList.add("-f");
- argList.add(getConfigFilePath());
+ argList.add(Utils.getPath(getInstallation().getCurrentConfigurationFile()));
argList.add("-n");
argList.add(getBackendName());
argList.add("-l");
@@ -590,7 +588,7 @@
argList.add(CONFIG_CLASS_NAME);
argList.add("-f");
- argList.add(getConfigFilePath());
+ argList.add(Utils.getPath(getInstallation().getCurrentConfigurationFile()));
argList.add("-n");
argList.add(getBackendName());
argList.add("-t");
@@ -729,15 +727,6 @@
}
/**
- * {@inheritDoc}
- */
- protected String getBinariesPath()
- {
- return Utils.getPath(getInstallationPath(),
- Utils.getBinariesRelativePath());
- }
-
- /**
* Validate the data provided by the user in the server settings panel and
* update the userData object according to that content.
*
--
Gitblit v1.10.0