From cd0daf51edd2805cdaef032ab5e96553fb672165 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 06 Jan 2010 22:39:35 +0000
Subject: [PATCH] Fix for issue 4417 (control panel manage tasks not showing tasks log message) Display the log messages of the selected task. Improve how the panel handle the modification in the contents of the task and when the user modifies the displayed attributes in the table. Before this changes the selection of the table was always lost, with this changes the previously selected task(s) are still selected. Improve some labeling in the 'View' menu.
---
opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 14a0578..35df024 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.util;
@@ -820,14 +820,15 @@
{
LdapName jndiName = new LdapName("cn=monitor");
- NamingEnumeration monitorEntries = ctx.search(jndiName, filter, ctls);
+ NamingEnumeration<SearchResult> monitorEntries =
+ ctx.search(jndiName, filter, ctls);
javaVersion = null;
numberConnections = -1;
while (monitorEntries.hasMore())
{
- SearchResult sr = (SearchResult)monitorEntries.next();
+ SearchResult sr = monitorEntries.next();
handleMonitoringSearchResult(sr, "cn=monitor");
}
}
@@ -854,11 +855,12 @@
{
LdapName jndiName = new LdapName(ConfigConstants.DN_TASK_ROOT);
- NamingEnumeration taskEntries = ctx.search(jndiName, filter, ctls);
+ NamingEnumeration<SearchResult> taskEntries =
+ ctx.search(jndiName, filter, ctls);
while (taskEntries.hasMore())
{
- SearchResult sr = (SearchResult)taskEntries.next();
+ SearchResult sr = taskEntries.next();
handleTaskSearchResult(sr, ConfigConstants.DN_TASK_ROOT, ts);
}
}
@@ -1022,7 +1024,7 @@
DN parent = dn.getParent();
if ((parent != null) && parent.equals(monitorDN))
{
- Set vs = csr.getAttributeValues("cn");
+ List<?> vs = csr.getAttributeValues("cn");
if ((vs != null) && !vs.isEmpty())
{
String cn = (String)vs.iterator().next();
@@ -1039,7 +1041,7 @@
private boolean isTaskEntry(CustomSearchResult csr) throws OpenDsException
{
boolean isTaskEntry = false;
- Set<Object> vs = csr.getAttributeValues("objectclass");
+ List<Object> vs = csr.getAttributeValues("objectclass");
if ((vs != null) && !vs.isEmpty())
{
for (Object oc : vs)
--
Gitblit v1.10.0