From bd152511e28cb9c92f844d798a08dc951602036f Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Fri, 24 Aug 2007 14:07:27 +0000
Subject: [PATCH] Issue 466 preparation.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 28 ++++++++++++++--------------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 30 +++++++++++++++---------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index 807b44a..1824c12 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -131,6 +131,14 @@
checkAbort();
}
+ if (mustCreateAds())
+ {
+ notifyListeners(getTaskSeparator());
+ setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
+ updateADS();
+ checkAbort();
+ }
+
if (mustInitializeSuffixes())
{
notifyListeners(getTaskSeparator());
@@ -140,14 +148,6 @@
checkAbort();
}
- if (mustCreateAds())
- {
- notifyListeners(getTaskSeparator());
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
- updateADS();
- checkAbort();
- }
-
if (mustStop())
{
notifyListeners(getTaskSeparator());
@@ -384,6 +384,12 @@
totalTime += hmTime.get(InstallProgressStep.CONFIGURING_REPLICATION);
}
+ if (mustCreateAds())
+ {
+ totalTime += hmTime.get(InstallProgressStep.CONFIGURING_ADS);
+ steps.add(InstallProgressStep.CONFIGURING_ADS);
+ }
+
if (mustInitializeSuffixes())
{
totalTime += hmTime.get(
@@ -391,12 +397,6 @@
steps.add(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
}
- if (mustCreateAds())
- {
- totalTime += hmTime.get(InstallProgressStep.CONFIGURING_ADS);
- steps.add(InstallProgressStep.CONFIGURING_ADS);
- }
-
if (mustStop())
{
totalTime += hmTime.get(InstallProgressStep.STOPPING_SERVER);
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index d7cdc61..54c70c3 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -186,6 +186,15 @@
checkAbort();
}
+ if (mustCreateAds())
+ {
+ notifyListeners(getTaskSeparator());
+ setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
+ updateADS();
+
+ checkAbort();
+ }
+
if (mustInitializeSuffixes())
{
notifyListeners(getTaskSeparator());
@@ -196,15 +205,6 @@
checkAbort();
}
- if (mustCreateAds())
- {
- notifyListeners(getTaskSeparator());
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
- updateADS();
-
- checkAbort();
- }
-
if (mustStop())
{
notifyListeners(getTaskSeparator());
@@ -366,6 +366,12 @@
totalTime += hmTime.get(InstallProgressStep.CONFIGURING_REPLICATION);
}
+ if (mustCreateAds())
+ {
+ totalTime += hmTime.get(InstallProgressStep.CONFIGURING_ADS);
+ steps.add(InstallProgressStep.CONFIGURING_ADS);
+ }
+
if (mustInitializeSuffixes())
{
totalTime += hmTime.get(
@@ -373,12 +379,6 @@
steps.add(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
}
- if (mustCreateAds())
- {
- totalTime += hmTime.get(InstallProgressStep.CONFIGURING_ADS);
- steps.add(InstallProgressStep.CONFIGURING_ADS);
- }
-
if (mustStop())
{
totalTime += hmTime.get(InstallProgressStep.STOPPING_SERVER);
--
Gitblit v1.10.0