From a9037949c175770a591d75624d4b282264dfcf5b Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 04 Jul 2007 16:48:57 +0000
Subject: [PATCH] This commit's design changes have been reviewed and approved by Brian Ehret.

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 48d84d2..61973d7 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
@@ -91,7 +91,7 @@
 
       checkAbort();
 
-      setStatus(InstallProgressStep.CONFIGURING_SERVER);
+      setCurrentProgressStep(InstallProgressStep.CONFIGURING_SERVER);
       configureServer();
 
       checkAbort();
@@ -105,7 +105,7 @@
       if (Utils.isWindows() && getUserData().getEnableWindowsService())
       {
           notifyListeners(getTaskSeparator());
-          setStatus(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
+          setCurrentProgressStep(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
           enableWindowsService();
           checkAbort();
       }
@@ -113,14 +113,14 @@
       if (mustStart())
       {
         notifyListeners(getTaskSeparator());
-        setStatus(InstallProgressStep.STARTING_SERVER);
+        setCurrentProgressStep(InstallProgressStep.STARTING_SERVER);
         new ServerController(this).startServer();
         checkAbort();
       }
 
       if (mustConfigureReplication())
       {
-        setStatus(InstallProgressStep.CONFIGURING_REPLICATION);
+        setCurrentProgressStep(InstallProgressStep.CONFIGURING_REPLICATION);
         notifyListeners(getTaskSeparator());
 
         configureReplication();
@@ -130,7 +130,8 @@
       if (mustInitializeSuffixes())
       {
         notifyListeners(getTaskSeparator());
-        setStatus(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
+        setCurrentProgressStep(
+            InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
         initializeSuffixes();
         checkAbort();
       }
@@ -138,7 +139,7 @@
       if (mustCreateAds())
       {
         notifyListeners(getTaskSeparator());
-        setStatus(InstallProgressStep.CONFIGURING_ADS);
+        setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
         updateADS();
         checkAbort();
       }
@@ -146,24 +147,24 @@
       if (mustStop())
       {
         notifyListeners(getTaskSeparator());
-        setStatus(InstallProgressStep.STOPPING_SERVER);
+        setCurrentProgressStep(InstallProgressStep.STOPPING_SERVER);
         new ServerController(this).stopServer();
       }
 
       checkAbort();
-      setStatus(InstallProgressStep.FINISHED_SUCCESSFULLY);
+      setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
       notifyListeners(null);
 
     } catch (ApplicationException ex)
     {
       if (ApplicationException.Type.CANCEL.equals(ex.getType())) {
         uninstall();
-        setStatus(InstallProgressStep.FINISHED_CANCELED);
+        setCurrentProgressStep(InstallProgressStep.FINISHED_CANCELED);
         notifyListeners(null);
       } else {
         notifyListeners(getLineBreak());
         notifyListenersOfLog();
-        setStatus(InstallProgressStep.FINISHED_WITH_ERROR);
+        setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
         String html = getFormattedError(ex, true);
         notifyListeners(html);
         LOG.log(Level.SEVERE, "Error installing.", ex);
@@ -173,7 +174,7 @@
     {
       notifyListeners(getLineBreak());
       notifyListenersOfLog();
-      setStatus(InstallProgressStep.FINISHED_WITH_ERROR);
+      setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
       ApplicationException ex = new ApplicationException(
           ApplicationException.Type.BUG, getThrowableMsg("bug-msg", t), t);
       String msg = getFormattedError(ex, true);
@@ -205,6 +206,7 @@
    */
   protected void uninstall() {
 
+    notifyListeners(getTaskSeparator());
     Installation installation = getInstallation();
     FileManager fm = new FileManager(this);
 
@@ -393,7 +395,7 @@
   /**
    * {@inheritDoc}
    */
-  protected String getInstallationPath()
+  public String getInstallationPath()
   {
     return Utils.getInstallPathFromClasspath();
   }

--
Gitblit v1.10.0