From d65316c746990cbe4c2b433b007afe00e9492c36 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 30 Jul 2007 15:53:44 +0000
Subject: [PATCH] The following modifications are done in order to be able to handle properly secure connections in both the status command-line and the status panel. Some options to specify a keystore, a trustore, etc. have been added to the status command-line so that is consistent with the other command-lines that use LDAP. As for these command-lines if the user does not specify to use Start TLS or LDAPS, the command-line will try to use LDAP to connect. But if there is no LDAP port enabled, the command-line will try to connect to the LDAPS port.
---
opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
index 513869d..e7ab611 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
@@ -101,7 +101,7 @@
pack();
if (getPreferredSize().width > parent.getWidth())
{
- setPreferredSize(new Dimension(parent.getWidth() - 20,
+ setPreferredSize(new Dimension(Math.max(parent.getWidth() - 20, 400),
getPreferredSize().height));
}
pack();
@@ -204,9 +204,18 @@
topPanel.add(Box.createHorizontalStrut(
certificateDetails.getPreferredSize().width), gbc);
gbc.insets.top = 0;
- gbc.insets.bottom = UIFactory.TOP_INSET_INPUT_SUBPANEL;
gbc.weighty = 1.0;
- topPanel.add(certificateDetails, gbc);
+ JPanel auxPanel = new JPanel(new GridBagLayout());
+ gbc.weightx = 0.0;
+ gbc.insets = UIFactory.getEmptyInsets();
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ auxPanel.add(Box.createVerticalStrut(100), gbc);
+ gbc.weightx = 1.0;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ auxPanel.add(certificateDetails, gbc);
+ gbc.insets = UIFactory.getCurrentStepPanelInsets();
+ gbc.insets.bottom = UIFactory.TOP_INSET_INPUT_SUBPANEL;
+ topPanel.add(auxPanel, gbc);
certificateDetails.setVisible(false);
gbc.weighty = 0.2;
gbc.insets = UIFactory.getEmptyInsets();
--
Gitblit v1.10.0