From 382b9cfecc5f1d44ae1ade68cae766ada69d9890 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 23 Oct 2014 15:07:11 +0000
Subject: [PATCH] Removed duplicate methods between org.opends.quicksetup.util.Utils and com.forgerock.opendj.cli.Utils. Code cleanup.
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
index b6f9b74..ecf73f0 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -27,11 +27,6 @@
package org.opends.guitools.controlpanel.ui;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.cli.Utils.isDN;
-import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
-
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.net.URI;
@@ -60,9 +55,13 @@
import org.opends.server.types.DN;
import org.opends.server.util.StaticUtils;
+import static com.forgerock.opendj.cli.Utils.*;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+
/**
* The panel that appears when the user is asked to provide authentication.
- *
*/
public class LoginPanel extends StatusGenericPanel
{
@@ -85,9 +84,7 @@
createLayout();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getTitle()
{
@@ -136,26 +133,20 @@
addBottomGlue(gbc);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Component getPreferredFocusComponent()
{
return pwd;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void toBeDisplayed(boolean visible)
{
@@ -166,9 +157,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void okClicked()
{
@@ -214,9 +203,7 @@
BackgroundTask<InitialLdapContext> worker =
new BackgroundTask<InitialLdapContext>()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public InitialLdapContext processBackgroundTask() throws Throwable
{
@@ -274,9 +261,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void backgroundTaskCompleted(InitialLdapContext ctx,
Throwable throwable)
@@ -286,7 +271,7 @@
{
logger.info(LocalizableMessage.raw("Error connecting: " + throwable, throwable));
- if (Utils.isCertificateException(throwable))
+ if (isCertificateException(throwable))
{
ApplicationTrustManager.Cause cause =
getInfo().getTrustManager().getLastRefusedCause();
@@ -409,9 +394,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void cancelClicked()
{
@@ -440,7 +423,7 @@
String authType = ce.getAuthType();
String host = ce.getHost();
- if ((chain != null) && (authType != null) && (host != null))
+ if (chain != null && authType != null && host != null)
{
logger.info(LocalizableMessage.raw("Accepting certificate presented by host "+host));
getInfo().getTrustManager().acceptCertificate(chain, authType, host);
--
Gitblit v1.10.0