From 0fabfff657119b98965bdae1f279bcdd9d31ad64 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.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 23 +++++++++++
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 30 ++++++++++++++-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java | 31 ++++++++++++++-
3 files changed, 79 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index b6a99bb..d4cfe80 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -34,6 +34,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.installer.AuthenticationData;
import org.opends.quicksetup.installer.DataReplicationOptions;
import org.opends.quicksetup.installer.NewSuffixOptions;
import org.opends.quicksetup.installer.SuffixesToReplicateOptions;
@@ -360,15 +361,35 @@
SuffixesToReplicateOptions.Type.REPLICATE_WITH_EXISTING_SUFFIXES) &&
remotePorts.size() > 0)
{
+ String serverToConnectDisplay;
+ AuthenticationData authData =
+ userInstallData.getReplicationOptions().getAuthenticationData();
+ if (userInstallData != null)
+ {
+ serverToConnectDisplay = authData.getHostName()+":"+authData.getPort();
+ }
+ else
+ {
+ serverToConnectDisplay = "";
+ }
buf.append(String.valueOf(
userInstallData.getReplicationOptions()
.getReplicationPort()));
TreeSet<Message> remoteServerLines = new TreeSet<Message>();
for (ServerDescriptor server : remotePorts.keySet())
{
+ String serverDisplay;
+ if (server.getHostPort(false).equalsIgnoreCase(serverToConnectDisplay))
+ {
+ serverDisplay = serverToConnectDisplay;
+ }
+ else
+ {
+ serverDisplay = server.getHostPort(true);
+ }
remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(
String.valueOf(remotePorts.get(server)),
- server.getHostPort(true)));
+ serverDisplay));
}
for (Message line : remoteServerLines)
{
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
index dd7ebe6..1d97efc 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
+++ b/opendj-sdk/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,
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index dd30b40..788ed46 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -59,6 +59,7 @@
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.event.ButtonEvent;
+import org.opends.quicksetup.installer.AuthenticationData;
import org.opends.quicksetup.installer.SuffixesToReplicateOptions;
import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.ui.GuiApplication;
@@ -85,6 +86,10 @@
private HashMap<String, JCheckBox> hmCheckBoxes =
new HashMap<String, JCheckBox>();
private Set<JEditorPane> suffixLabels = new HashSet<JEditorPane>();
+ // The display of the server the user provided in the replication options
+ // panel
+ private String serverToConnectDisplay = null;
+
private JRadioButton rbCreateNewSuffix;
private JRadioButton rbReplicate;
@@ -252,8 +257,21 @@
TreeSet<SuffixDescriptor> array = orderSuffixes(
data.getSuffixesToReplicateOptions().getAvailableSuffixes());
- if (!array.equals(orderedSuffixes))
+ AuthenticationData authData =
+ data.getReplicationOptions().getAuthenticationData();
+ String newServerDisplay;
+ if (data != null)
{
+ newServerDisplay = authData.getHostName()+":"+authData.getPort();
+ }
+ else
+ {
+ newServerDisplay = "";
+ }
+ if (!array.equals(orderedSuffixes) ||
+ !newServerDisplay.equals(serverToConnectDisplay))
+ {
+ serverToConnectDisplay = newServerDisplay;
HashMap<String, Boolean> hmOldValues = new HashMap<String, Boolean>();
for (String id : hmCheckBoxes.keySet())
{
@@ -452,7 +470,15 @@
ServerDescriptor server = replica.getServer();
- String serverDisplay = server.getHostPort(true);
+ String serverDisplay;
+ if (server.getHostPort(false).equalsIgnoreCase(serverToConnectDisplay))
+ {
+ serverDisplay = serverToConnectDisplay;
+ }
+ else
+ {
+ serverDisplay = server.getHostPort(true);
+ }
int nEntries = replica.getEntries();
--
Gitblit v1.10.0