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/uninstaller/ui/ConfirmUninstallPanel.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
index 189162f..47eae32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 package org.opends.guitools.uninstaller.ui;
@@ -90,24 +90,20 @@
     {
     case EXTERNAL_DB_DIRECTORIES:
       Set<String> s1 = new HashSet<String>();
-      if (outsideDbs.size() > 0)
+      if (outsideDbs.size() > 0
+          && getCheckBox(FieldName.EXTERNAL_DB_DIRECTORIES).isSelected())
       {
-        if (getCheckBox(FieldName.EXTERNAL_DB_DIRECTORIES).isSelected())
-        {
-          s1.addAll(outsideDbs);
-        }
+        s1.addAll(outsideDbs);
       }
       value = s1;
       break;
 
     case EXTERNAL_LOG_FILES:
       Set<String> s2 = new HashSet<String>();
-      if (outsideLogs.size() > 0)
+      if (outsideLogs.size() > 0
+          && getCheckBox(FieldName.EXTERNAL_LOG_FILES).isSelected())
       {
-        if (getCheckBox(FieldName.EXTERNAL_LOG_FILES).isSelected())
-        {
-          s2.addAll(outsideLogs);
-        }
+        s2.addAll(outsideLogs);
       }
       value = s2;
       break;

--
Gitblit v1.10.0