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/BrowseEntriesPanel.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index 4732ff5..7aacff7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -495,26 +495,23 @@
*/
private boolean hasUserPassword(String[] ocs)
{
- boolean hasUserPassword = false;
Schema schema = getInfo().getServerDescriptor().getSchema();
- if ((ocs != null) && (schema != null))
+ if (ocs != null && schema != null)
{
AttributeType attr = schema.getAttributeType(
ServerConstants.ATTR_USER_PASSWORD);
for (String oc : ocs)
{
ObjectClass objectClass = schema.getObjectClass(oc);
- if ((objectClass != null) && (attr != null))
+ if (objectClass != null
+ && attr != null
+ && objectClass.isRequiredOrOptional(attr))
{
- if (objectClass.isRequiredOrOptional(attr))
- {
- hasUserPassword = true;
- break;
- }
+ return true;
}
}
}
- return hasUserPassword;
+ return false;
}
/**
--
Gitblit v1.10.0