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/guitools/controlpanel/task/DeleteEntryTask.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 5ad6bac..0777d6b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -179,25 +179,23 @@
public boolean canLaunch(Task taskToBeLaunched,
Collection<LocalizableMessage> incompatibilityReasons)
{
- boolean canLaunch = true;
- if (!isServerRunning())
+ if (!isServerRunning()
+ && state == State.RUNNING
+ && runningOnSameServer(taskToBeLaunched))
{
- if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
+ // All the operations are incompatible if they apply to this
+ // backend for safety.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
{
- // All the operations are incompatible if they apply to this
- // backend for safety.
- Set<String> backends =
- new TreeSet<String>(taskToBeLaunched.getBackends());
- backends.retainAll(getBackends());
- if (backends.size() > 0)
- {
- incompatibilityReasons.add(getIncompatibilityMessage(this,
- taskToBeLaunched));
- canLaunch = false;
- }
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ return false;
}
}
- return canLaunch;
+ return true;
}
/**
--
Gitblit v1.10.0