From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
index 132c9b2..0ef0e2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
@@ -1216,22 +1216,16 @@
*/
public String getImportProgressMessage(String msg)
{
- String parsedMsg = null;
- if (msg != null)
+ if (msg != null
+ && (msg.contains("msgID=" + JebMessages.NOTE_JEB_IMPORT_FINAL_STATUS.ordinal())
+ || msg.contains("msgID=" + JebMessages.NOTE_JEB_IMPORT_PROGRESS_REPORT.ordinal())))
{
- if ((msg.contains("msgID=" + JebMessages
- .NOTE_JEB_IMPORT_FINAL_STATUS.ordinal())) ||
- (msg.contains("msgID=" + JebMessages
- .NOTE_JEB_IMPORT_PROGRESS_REPORT.ordinal())))
+ int index = msg.indexOf("msg=");
+ if (index != -1)
{
- int index = msg.indexOf("msg=");
- if (index != -1)
- {
- parsedMsg = msg.substring(index + 4);
- }
+ return msg.substring(index + 4);
}
}
- return parsedMsg;
+ return null;
}
}
-
--
Gitblit v1.10.0