From bb96ac6156a17994bcf38c09ead082e63baa79fe Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 03 Sep 2007 07:41:30 +0000
Subject: [PATCH] Fix for issue 2159.
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
index dd7ebe6..1d97efc 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
@@ -51,6 +51,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.installer.AuthenticationData;
import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.ui.GuiApplication;
import org.opends.quicksetup.ui.LabelFieldDescriptor;
@@ -74,6 +75,10 @@
private JPanel fieldsPanel;
private TreeSet<ServerDescriptor> orderedServers =
new TreeSet<ServerDescriptor>(this);
+ //The display of the server the user provided in the replication options
+ // panel
+ private String serverToConnectDisplay = null;
+
/**
* Constructor of the panel.
* @param application Application represented by this panel and used to
@@ -203,8 +208,21 @@
{
TreeSet<ServerDescriptor> array = orderServers(
data.getRemoteWithNoReplicationPort().keySet());
- if (!array.equals(orderedServers))
+ AuthenticationData authData =
+ data.getReplicationOptions().getAuthenticationData();
+ String newServerDisplay;
+ if (data != null)
{
+ newServerDisplay = authData.getHostName()+":"+authData.getPort();
+ }
+ else
+ {
+ newServerDisplay = "";
+ }
+ if (!array.equals(orderedServers) ||
+ !newServerDisplay.equals(serverToConnectDisplay))
+ {
+ serverToConnectDisplay = newServerDisplay;
/**
* Adds the required focus listeners to the fields.
*/
@@ -231,8 +249,17 @@
hmLabels.clear();
for (ServerDescriptor server : orderedServers)
{
+ String serverDisplay;
+ if (server.getHostPort(false).equalsIgnoreCase(serverToConnectDisplay))
+ {
+ serverDisplay = serverToConnectDisplay;
+ }
+ else
+ {
+ serverDisplay = server.getHostPort(true);
+ }
LabelFieldDescriptor desc = new LabelFieldDescriptor(
- Message.raw(server.getHostPort(true)),
+ Message.raw(serverDisplay),
INFO_REPLICATION_PORT_TOOLTIP.get(),
LabelFieldDescriptor.FieldType.TEXTFIELD,
LabelFieldDescriptor.LabelType.PRIMARY,
--
Gitblit v1.10.0