From ba07fc549fdcfe6d30524daf17ad33832b0efc75 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 11 Mar 2014 09:18:47 +0000
Subject: [PATCH] EntryContainer.java: Matt said we can get rid of the KeyReverseComparator: "It is not used any more, but has been kept for backwards compatibility with OpenDS 2.2 (the comparator is persisted in the JE database)"
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 971063a..d9b3cf7 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -53,6 +53,7 @@
import org.opends.guitools.controlpanel.datamodel.ConnectionProtocolPolicy;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
import org.opends.quicksetup.*;
+import org.opends.quicksetup.ReturnCode;
import org.opends.quicksetup.event.ProgressUpdateEvent;
import org.opends.quicksetup.event.ProgressUpdateListener;
import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
@@ -62,13 +63,11 @@
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;
-
-import com.forgerock.opendj.cli.ConsoleApplication;
-
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.Menu;
import com.forgerock.opendj.cli.MenuBuilder;
import com.forgerock.opendj.cli.MenuResult;
@@ -76,7 +75,7 @@
import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
+import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
@@ -967,9 +966,9 @@
return s;
}
- private boolean startServer(boolean supressOutput)
+ private boolean startServer(boolean suppressOutput)
{
- logger.info(LocalizableMessage.raw("startServer, supressOutput: "+supressOutput));
+ logger.info(LocalizableMessage.raw("startServer, suppressOutput: " + suppressOutput));
boolean serverStarted = false;
Application application = new Application()
{
@@ -1083,7 +1082,7 @@
};
application.setProgressMessageFormatter(
new PlainTextProgressMessageFormatter());
- if (!supressOutput)
+ if (!suppressOutput)
{
application.addProgressUpdateListener(
new ProgressUpdateListener() {
@@ -1098,12 +1097,12 @@
Installation.getLocal());
try
{
- if (!supressOutput)
+ if (!suppressOutput)
{
println();
}
- controller.startServer(supressOutput);
- if (!supressOutput)
+ controller.startServer(suppressOutput);
+ if (!suppressOutput)
{
println();
}
@@ -1114,7 +1113,7 @@
catch (ApplicationException ae)
{
logger.warn(LocalizableMessage.raw("ApplicationException: "+ae, ae));
- if (!supressOutput)
+ if (!suppressOutput)
{
printErrorMessage(ae.getMessageObject());
}
--
Gitblit v1.10.0