From ea55147a2ea1994c28702db6f0225ffd1f790cbb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 24 May 2007 16:00:57 +0000
Subject: [PATCH] Add some classes to the ads package so that the code is complete for it being us ed by the QuickSetup to both read data from registered servers and to configure ADS.
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 49 +------------------------------------------------
1 files changed, 1 insertions(+), 48 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index 63420ab..063bc26 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -51,7 +51,6 @@
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
-import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ReplicaDescriptor;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
@@ -442,53 +441,7 @@
//TODO: only handles server that have ADSProperties.
private String getServerDisplay(ServerDescriptor server)
{
- String display;
- String hostName = (String)server.getAdsProperties().get(
- ADSContext.ServerProperty.HOSTNAME);
- boolean secure = false;
- int port = -1;
-
- if (hostName == null)
- {
- hostName = getMsg("suffix-list-unknown-label");
- }
-
- if (!"true".equalsIgnoreCase((String)server.getAdsProperties().get(
- ADSContext.ServerProperty.LDAP_ENABLED)))
- {
- if ("true".equalsIgnoreCase((String)server.getAdsProperties().get(
- ADSContext.ServerProperty.LDAPS_ENABLED)))
- {
- secure = true;
- }
- }
-
- try
- {
- if (secure)
- {
- port = Integer.parseInt((String)server.getAdsProperties().get(
- ADSContext.ServerProperty.SECURE_PORT));
- }
- else
- {
- port = Integer.parseInt((String)server.getAdsProperties().get(
- ADSContext.ServerProperty.PORT));
- }
- }
- catch (Throwable t)
- {
- }
-
- if (port == -1)
- {
- display = hostName+":"+getMsg("suffix-list-unknown-label");
- }
- else
- {
- display = hostName+":"+port;
- }
- return display;
+ return server.getHostPort(true);
}
private TreeSet<SuffixDescriptor> orderSuffixes(
--
Gitblit v1.10.0