From 85811b64468e9b7a876bd352a0299b904a53a3fb Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:16:23 +0000
Subject: [PATCH] Fix for Issue #615. Add support for multiple object-class inheritance. Support added in the schema, core server and tools including Control-Panel
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index cf4413f..33aad38 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -2022,7 +2022,7 @@
/**
* Returns the value that the component is displaying. The returned value
- * is a Set of Strings (for multivalued attributes), a byte[] for binary
+ * is a Set of Strings (for multi-valued attributes), a byte[] for binary
* values or a String for single-valued attributes. Single-valued
* attributes refer to the definition in the schema (and not to the fact
* that there is a single value for the attribute in this entry).
@@ -2047,12 +2047,7 @@
ObjectClass oc = schema.getObjectClass(structural.toLowerCase());
if (oc != null)
{
- ObjectClass parent = oc.getSuperiorClass();
- while (parent != null)
- {
- values.add(parent.getNameOrOID());
- parent = parent.getSuperiorClass();
- }
+ values.addAll(getObjectClassSuperiorValues(oc));
}
}
returnValue = values;
--
Gitblit v1.10.0