From 04f1cc0b5351b6d39dc43cd574d92359573c9ea2 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 06 Aug 2013 15:39:09 +0000
Subject: [PATCH] CR-2124 Fix OPENDJ-1016 Control panel does not follow static group recommendation from documentation
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 0481541..161864d 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.ui;
@@ -2097,15 +2097,15 @@
}
/**
- * Tells whether a given entry exists and contains the specified object class.
+ * Tells whether a given entry exists and contains one of the specified object
+ * classes.
* @param dn the DN of the entry.
- * @param objectClass the object class.
- * @return <CODE>true</CODE> if the entry exists and contains the specified
- * object class and <CODE>false</CODE> otherwise.
+ * @param objectClasses the object classes to check.
+ * @return <CODE>true</CODE> if the entry exists and contains one of the
+ * specified object classes and <CODE>false</CODE> otherwise.
*/
- protected boolean hasObjectClass(String dn, String objectClass)
+ protected boolean hasObjectClass(String dn, String... objectClasses)
{
- boolean hasObjectClass = false;
try
{
SearchControls ctls = new SearchControls();
@@ -2130,10 +2130,12 @@
{
for (String s : values)
{
- if (s.equalsIgnoreCase(objectClass))
+ for (String objectClass: objectClasses)
{
- hasObjectClass = true;
- break;
+ if (s.equalsIgnoreCase(objectClass))
+ {
+ return true;
+ }
}
}
}
@@ -2147,7 +2149,7 @@
catch (Throwable t)
{
}
- return hasObjectClass;
+ return false;
}
/**
--
Gitblit v1.10.0