From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java b/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
index 10d71f9..684a49d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
@@ -240,9 +240,9 @@
if (isPortField)
{
JLabel l =
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- getPortHelpMessage(),
- UIFactory.TextStyle.SECONDARY_FIELD_VALID);
+ UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
+ getPortHelpMessage(),
+ UIFactory.TextStyle.SECONDARY_FIELD_VALID);
gbc.gridwidth = GridBagConstraints.RELATIVE;
gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD;
auxPanel.add(l, gbc);
@@ -261,7 +261,14 @@
*/
protected String getInstructions()
{
- return getMsg("server-settings-panel-instructions");
+ if (Utils.isWebStart())
+ {
+ return getMsg("server-settings-panel-instructions-webstart");
+ }
+ else
+ {
+ return getMsg("server-settings-panel-instructions");
+ }
}
/**
@@ -471,7 +478,14 @@
tf.addFocusListener(l);
}
getBrowseButton().addFocusListener(l);
- lastFocusComponent = getField(FieldName.SERVER_LOCATION);
+ if (Utils.isWebStart())
+ {
+ lastFocusComponent = tfServerLocationRelativePath;
+ }
+ else
+ {
+ lastFocusComponent = getField(FieldName.DIRECTORY_MANAGER_PWD);
+ }
}
/**
@@ -483,15 +497,9 @@
private String getPortHelpMessage()
{
String s = "";
- if (defaultUserData.getServerPort() <= 0)
+ if (defaultUserData.getServerPort() != 389)
{
- if (Utils.isUnix())
- {
- s = getMsg("cannot-find-default-port-unix");
- } else
- {
- s = getMsg("cannot-find-default-port-windows");
- }
+ s = getMsg("cannot-use-default-port");
}
return s;
}
--
Gitblit v1.10.0