From 49c8560679d3e0217f34ed017d2382ec43e4f300 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 05 Jul 2016 12:57:45 +0000
Subject: [PATCH] Inlined useless methods from InstallerHelper
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 83416a3..1d8449c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -30,6 +30,7 @@
import static org.opends.quicksetup.installer.DataReplicationOptions.Type.*;
import static org.opends.quicksetup.installer.InstallProgressStep.*;
import static org.opends.quicksetup.util.Utils.*;
+import static org.opends.server.backends.task.TaskState.*;
import java.awt.event.WindowEvent;
import java.io.BufferedWriter;
@@ -123,6 +124,7 @@
import org.opends.quicksetup.util.IncompatibleVersionException;
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.backends.task.TaskState;
import org.opends.server.tools.BackendTypeHelper;
import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
import org.opends.server.types.HostPort;
@@ -4334,8 +4336,9 @@
}
InstallerHelper helper = new InstallerHelper();
String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
isOver = true;
LocalizableMessage errorMsg;
@@ -4358,14 +4361,14 @@
}
logger.warn(LocalizableMessage.raw("Processed errorMsg: " + errorMsg));
- if (helper.isCompletedWithErrors(state))
+ if (taskState == COMPLETED_WITH_ERRORS)
{
if (displayProgress)
{
notifyListeners(getFormattedWarning(errorMsg));
}
}
- else if (!helper.isSuccessful(state) || helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
ApplicationException ae = new ApplicationException(ReturnCode.APPLICATION_ERROR, errorMsg, null);
if (lastLogMsg == null || helper.isPeersNotFoundError(lastLogMsg))
@@ -4493,22 +4496,22 @@
logger.info(LocalizableMessage.raw(logMsg));
lastLogMsg = logMsg;
}
- InstallerHelper helper = new InstallerHelper();
- String state = getFirstValue(sr, "ds-task-state");
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
isOver = true;
LocalizableMessage errorMsg = lastLogMsg != null ?
INFO_ERROR_DURING_INITIALIZATION_LOG.get(sourceServerDisplay, lastLogMsg, state, sourceServerDisplay)
: INFO_ERROR_DURING_INITIALIZATION_NO_LOG.get(sourceServerDisplay, state, sourceServerDisplay);
- if (helper.isCompletedWithErrors(state))
+ if (taskState == COMPLETED_WITH_ERRORS)
{
logger.warn(LocalizableMessage.raw("Completed with error: " + errorMsg));
notifyListeners(getFormattedWarning(errorMsg));
}
- else if (!helper.isSuccessful(state) || helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
logger.warn(LocalizableMessage.raw("Error: " + errorMsg));
throw new ApplicationException(ReturnCode.APPLICATION_ERROR, errorMsg, null);
--
Gitblit v1.10.0