From a091e85ec925fdb878303144f7b4f5e302e7c35f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 21 Sep 2007 17:31:33 +0000
Subject: [PATCH] Fix for issues 2314 and 2238.
---
opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java b/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
index 3450f60..77f1d55 100644
--- a/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
+++ b/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
@@ -34,6 +34,7 @@
import java.net.URI;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
@@ -570,6 +571,7 @@
{
INFO_SERVER_STATUS_LABEL.get(),
INFO_CONNECTIONS_LABEL.get(),
+ INFO_HOSTNAME_LABEL.get(),
INFO_ADMINISTRATIVE_USERS_LABEL.get(),
INFO_INSTALLATION_PATH_LABEL.get(),
INFO_OPENDS_VERSION_LABEL.get(),
@@ -589,6 +591,7 @@
title = INFO_SERVER_DETAILS_TITLE.get();
out.println(centerTitle(title));
+ writeHostnameContents(desc, labelWidth);
writeAdministrativeUserContents(desc, labelWidth);
writeInstallPathContents(desc, labelWidth);
writeVersionContents(desc, labelWidth);
@@ -691,9 +694,22 @@
}
/**
+ * Writes the host name contents.
+ * @param desc the ServerStatusDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeHostnameContents(ServerStatusDescriptor desc,
+ int maxLabelWidth)
+ {
+ writeLabelValue(INFO_HOSTNAME_LABEL.get(),
+ Message.raw(desc.getHostname()),
+ maxLabelWidth);
+ }
+ /**
* Writes the administrative user contents displaying with what is specified
* in the provided ServerStatusDescriptor object.
* @param desc the ServerStatusDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
*/
private void writeAdministrativeUserContents(ServerStatusDescriptor desc,
int maxLabelWidth)
@@ -748,6 +764,7 @@
* Writes the install path contents displaying with what is specified in the
* provided ServerStatusDescriptor object.
* @param desc the ServerStatusDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
*/
private void writeInstallPathContents(ServerStatusDescriptor desc,
int maxLabelWidth)
@@ -778,6 +795,7 @@
* the provided ServerStatusDescriptor object.
* This method must be called from the event thread.
* @param desc the ServerStatusDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
*/
private void writeJavaVersionContents(ServerStatusDescriptor desc,
int maxLabelWidth)
@@ -815,7 +833,16 @@
Message title = INFO_LISTENERS_TITLE.get();
out.println(centerTitle(title));
- Set<ListenerDescriptor> listeners = desc.getListeners();
+ Set<ListenerDescriptor> allListeners = desc.getListeners();
+
+ Set<ListenerDescriptor> listeners = new LinkedHashSet<ListenerDescriptor>();
+ for (ListenerDescriptor listener: allListeners)
+ {
+ if (listener.getProtocol() != ListenerDescriptor.Protocol.LDIF)
+ {
+ listeners.add(listener);
+ }
+ }
if (listeners.size() == 0)
{
@@ -839,7 +866,7 @@
else
{
ListenersTableModel listenersTableModel = new ListenersTableModel();
- listenersTableModel.setData(desc.getListeners());
+ listenersTableModel.setData(listeners);
writeTableModel(listenersTableModel, desc);
}
}
--
Gitblit v1.10.0