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/ui/TableViewEntryPanel.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 2bbfa2a..1a1f7e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -294,18 +294,9 @@
Set<String> values = getDisplayedStringValues(attrName);
if (!values.contains(value.toString()))
{
- if (values.size() > 0)
+ if (!values.isEmpty())
{
- String firstNonEmpty = null;
- for (String v : values)
- {
- v = v.trim();
- if (v.length() > 0)
- {
- firstNonEmpty = v;
- break;
- }
- }
+ String firstNonEmpty = getFirstNonEmpty(values);
if (firstNonEmpty != null)
{
AttributeType attr = rdn.getAttributeType(i);
@@ -322,7 +313,7 @@
attributeValues.add(value);
}
}
- if (attributeTypes.size() == 0)
+ if (attributeTypes.isEmpty())
{
// Check the attributes in the order that we display them and use
// the first one.
@@ -358,11 +349,11 @@
}
}
DN parent = oldDN.parent();
- if (attributeTypes.size() > 0)
+ if (!attributeTypes.isEmpty())
{
- DN newDN;
RDN newRDN = new RDN(attributeTypes, attributeNames, attributeValues);
+ DN newDN;
if (parent == null)
{
newDN = new DN(new RDN[]{newRDN});
@@ -389,6 +380,19 @@
return sb.toString();
}
+ private String getFirstNonEmpty(Set<String> values)
+ {
+ for (String v : values)
+ {
+ v = v.trim();
+ if (v.length() > 0)
+ {
+ return v;
+ }
+ }
+ return null;
+ }
+
private Set<String> getDisplayedStringValues(String attrName)
{
Set<String> values = new LinkedHashSet<String>();
--
Gitblit v1.10.0