From b8f523c95f4fd5fc705f2c6c2a2d98217b9da450 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Apr 2015 20:10:37 +0000
Subject: [PATCH] Converted use of Collection.size() to Collection.isEmpty().
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index e2602fa..bfd8100 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -138,9 +138,9 @@
{
modifications.remove(passwordModification);
}
- hasModifications = modifications.size() > 0 ||
- !oldDn.equals(newEntry.getName()) ||
- (passwordModification != null);
+ hasModifications = !modifications.isEmpty()
+ || !oldDn.equals(newEntry.getName())
+ || passwordModification != null;
}
/**
@@ -195,13 +195,11 @@
// All the operations are incompatible if they apply to this
// backend for safety. This is a short operation so the limitation
// has not a lot of impact.
- Set<String> backends =
- new TreeSet<String>(taskToBeLaunched.getBackends());
+ Set<String> backends = new TreeSet<>(taskToBeLaunched.getBackends());
backends.retainAll(getBackends());
- if (backends.size() > 0)
+ if (!backends.isEmpty())
{
- incompatibilityReasons.add(getIncompatibilityMessage(this,
- taskToBeLaunched));
+ incompatibilityReasons.add(getIncompatibilityMessage(this, taskToBeLaunched));
return false;
}
}
@@ -227,7 +225,7 @@
useAdminCtx = controller.isConfigurationNode(node);
if (!mustRename)
{
- if (modifications.size() > 0) {
+ if (!modifications.isEmpty()) {
ModificationItem[] mods =
new ModificationItem[modifications.size()];
modifications.toArray(mods);
@@ -303,7 +301,7 @@
ResetUserPasswordTask newTask = new ResetUserPasswordTask(getInfo(),
getProgressDialog(), (BasicNode)treePath.getLastPathComponent(),
controller, sPwd.toCharArray());
- if ((modifications.size() > 0) || mustRename)
+ if (!modifications.isEmpty() || mustRename)
{
getProgressDialog().appendProgressHtml("<br><br>");
}
@@ -569,7 +567,7 @@
{
vs.remove(rdnValue);
}
- if (vs.size() > 0)
+ if (!vs.isEmpty())
{
modifications.add(new ModificationItem(
DirContext.ADD_ATTRIBUTE,
@@ -595,20 +593,20 @@
}
else
{
- if (toDelete.size() > 0)
+ if (!toDelete.isEmpty())
{
modifications.add(new ModificationItem(
DirContext.REMOVE_ATTRIBUTE,
createAttribute(attrName, toDelete)));
}
- if (toAdd.size() > 0)
+ if (!toAdd.isEmpty())
{
List<ByteString> vs = new ArrayList<ByteString>(toAdd);
if (rdnValue != null)
{
vs.remove(rdnValue);
}
- if (vs.size() > 0)
+ if (!vs.isEmpty())
{
modifications.add(new ModificationItem(
DirContext.ADD_ATTRIBUTE,
@@ -644,7 +642,7 @@
}
}
}
- if (!found && (oldValues.size() > 0))
+ if (!found && !oldValues.isEmpty())
{
modifications.add(new ModificationItem(
DirContext.REMOVE_ATTRIBUTE,
--
Gitblit v1.10.0