From b54e25e8af0e73b7ddaca4eaec088803ea6a7e4f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 22 Feb 2007 09:30:33 +0000
Subject: [PATCH] Fix for Issues #1025 and #1248 ('stop-ds.bat should be able to stop server even if LDAP port' and 'cannot stop server through status panel').
---
opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java b/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
index 753f91e..056d119 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
@@ -54,7 +54,6 @@
import org.opends.quicksetup.installer.offline.OfflineInstaller;
import org.opends.quicksetup.installer.webstart.WebStartDownloader;
import org.opends.quicksetup.installer.webstart.WebStartInstaller;
-import org.opends.quicksetup.ui.DirectoryManagerAuthenticationDialog;
import org.opends.quicksetup.ui.QuickSetupDialog;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.uninstaller.UninstallProgressDescriptor;
@@ -463,42 +462,16 @@
}
else
{
- if (Utils.isUnix())
+ if (displayConfirmation(
+ getMsg("confirm-uninstall-server-running-msg"),
+ getMsg("confirm-uninstall-server-running-title")))
{
- if (displayConfirmation(
- getMsg("confirm-uninstall-server-running-unix-msg"),
- getMsg("confirm-uninstall-server-running-unix-title")))
- {
getUserUninstallData().setStopServer(true);
launchUninstallation();
setCurrentStep(nextStep(cStep));
- }
- else
- {
- getUserUninstallData().setStopServer(false);
- }
- }
- else
+ } else
{
- DirectoryManagerAuthenticationDialog dlg =
- new DirectoryManagerAuthenticationDialog(
- getDialog().getFrame(), installStatus);
- dlg.setModal(true);
- dlg.packAndShow();
- if (dlg.isCancelled())
- {
getUserUninstallData().setStopServer(false);
- }
- else
- {
- getUserUninstallData().setStopServer(dlg.getStopServer());
- getUserUninstallData().setDirectoryManagerDn(
- dlg.getDirectoryManagerDn());
- getUserUninstallData().setDirectoryManagerPwd(
- dlg.getDirectoryManagerPwd());
- launchUninstallation();
- setCurrentStep(nextStep(cStep));
- }
}
}
}
--
Gitblit v1.10.0