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/ui/WindowsServicePanel.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
index 75fd5f5..9588fe2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -341,18 +341,16 @@
public boolean canLaunch(Task taskToBeLaunched,
Collection<LocalizableMessage> incompatibilityReasons)
{
- boolean canLaunch = true;
- if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
+ Type type = taskToBeLaunched.getType();
+ if (state == State.RUNNING
+ && runningOnSameServer(taskToBeLaunched)
+ && (type == Type.ENABLE_WINDOWS_SERVICE
+ || type == Type.DISABLE_WINDOWS_SERVICE))
{
- if ((taskToBeLaunched.getType() == Type.ENABLE_WINDOWS_SERVICE) ||
- (taskToBeLaunched.getType() == Type.DISABLE_WINDOWS_SERVICE))
- {
- incompatibilityReasons.add(getIncompatibilityMessage(this,
- taskToBeLaunched));
- canLaunch = false;
- }
+ incompatibilityReasons.add(getIncompatibilityMessage(this, taskToBeLaunched));
+ return false;
}
- return canLaunch;
+ return true;
}
/**
--
Gitblit v1.10.0