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/TableViewEntryPanel.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 234555c..490eb24 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
@@ -800,18 +800,16 @@
List<Object> values = new ArrayList<Object>();
for (AttributeValuePair valuePair : dataArray)
{
- if (valuePair.attrName.equalsIgnoreCase(attrName))
+ if (valuePair.attrName.equalsIgnoreCase(attrName)
+ && hasValue(valuePair))
{
- if (hasValue(valuePair))
+ if (valuePair.value instanceof Collection<?>)
{
- if (valuePair.value instanceof Collection<?>)
- {
- values.addAll((Collection<?>) valuePair.value);
- }
- else
- {
- values.add(valuePair.value);
- }
+ values.addAll((Collection<?>) valuePair.value);
+ }
+ else
+ {
+ values.add(valuePair.value);
}
}
}
--
Gitblit v1.10.0