From 4a48f1cf6caab40fa3741d93f8c825078e4820f2 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 04 May 2007 21:15:31 +0000
Subject: [PATCH] Fix a number of issues with David's approval:
---
opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
index 1032d64..f22b29f 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
@@ -30,7 +30,6 @@
import org.opends.quicksetup.*;
import static org.opends.quicksetup.Step.PROGRESS;
import static org.opends.quicksetup.Step.REVIEW;
-import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.ui.*;
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.util.BackgroundTask;
@@ -39,6 +38,7 @@
import java.io.*;
import java.util.*;
+import java.util.logging.Logger;
import java.awt.event.WindowEvent;
/**
@@ -60,6 +60,9 @@
private UninstallCliHelper cliHelper = new UninstallCliHelper();
+ private static final Logger LOG =
+ Logger.getLogger(Uninstaller.class.getName());
+
/**
* {@inheritDoc}
*/
@@ -950,7 +953,8 @@
getMsg("progress-disabling-windows-service")));
int code = ConfigureWindowsService.disableService(System.out, System.err);
- String errorMessage = getMsg("error-disabling-windows-service");
+ String errorMessage = getMsg("error-disabling-windows-service",
+ getInstallationPath());
switch (code) {
case ConfigureWindowsService.SERVICE_DISABLE_SUCCESS:
--
Gitblit v1.10.0