From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 37722a4..5bb97d5 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
@@ -295,7 +295,7 @@
controller.getTree().setSelectionPath(pathToSelect);
}
else if (!selectedPath.equals(pathToSelect) &&
- (pathToSelect.getPathCount() < selectedPath.getPathCount()))
+ pathToSelect.getPathCount() < selectedPath.getPathCount())
{
controller.getTree().setSelectionPath(pathToSelect);
}
@@ -309,9 +309,9 @@
lastDn = dnToRemove;
long t = System.currentTimeMillis();
+ boolean canDelete = nToDelete > 0 && nToDelete > nDeleted;
boolean displayProgress =
- (((nDeleted % 20) == 0) || ((t - lastProgressTime) > 5000)) &&
- (nToDelete > 0) && (nToDelete > nDeleted);
+ canDelete && ((nDeleted % 20) == 0 || t - lastProgressTime > 5000);
if (displayProgress)
{
--
Gitblit v1.10.0