From 6411dcff8da8710f140a8782967ddf0876f52b81 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 09:55:31 +0000
Subject: [PATCH] Provide the necessary operational attributes for External Changelog entries, to make them LDAP compliant and to allow browsing them through the Control-Panel. Improve browsing in the Control-Panel to make use of hasSubordinates as well as numSubordinates operational attributes. Improve Control-Panel look and feel when browsing the ECL
---
opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 698d22f..f7e3c7c 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -406,6 +406,7 @@
{
localEntry = s.next();
localEntry.setName(node.getDN());
+
}
if (localEntry == null) {
/* Not enough rights to read the entry or the entry simply does not
@@ -606,7 +607,7 @@
}
else {
SearchResult entry = getDisplayedEntry();
- isLeafNode = (BrowserController.getNumSubOrdinates(entry) == 0);
+ isLeafNode = !BrowserController.getHasSubOrdinates(entry);
}
}
@@ -670,8 +671,8 @@
private boolean isNumSubOrdinatesUsable() throws NamingException {
boolean result;
SearchResult entry = getDisplayedEntry();
- int numSubOrdinates = BrowserController.getNumSubOrdinates(entry);
- if (numSubOrdinates == 0) { // We must check
+ boolean hasSubOrdinates = BrowserController.getHasSubOrdinates(entry);
+ if (!hasSubOrdinates) { // We must check
LDAPURL url = getDisplayedUrl();
if (controller.getNumSubordinateHacker().contains(url)) {
// The numSubOrdinate we have is unreliable.
@@ -699,6 +700,7 @@
InitialLdapContext ctx = null;
BasicNode parentNode = getNode();
parentNode.setSizeLimitReached(false);
+
try {
// Send an LDAP search
SearchControls ctls = controller.getBasicSearchControls();
--
Gitblit v1.10.0