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/LocalOrRemotePanel.java | 84 ++++++++++++++----------------------------
1 files changed, 28 insertions(+), 56 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 2e746c4..af9e7c1 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.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.awt.event.ActionEvent;
@@ -82,9 +77,13 @@
import org.opends.server.util.DynamicConstants;
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 LocalOrRemotePanel extends StatusGenericPanel
{
@@ -120,18 +119,14 @@
createLayout();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_LOCAL_OR_REMOTE_PANEL_TITLE.get();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public GenericDialog.ButtonType getButtonType()
{
@@ -153,16 +148,14 @@
*/
public int getPort()
{
- int port = -1;
try
{
- port = new Integer(this.port.getText().trim());
+ return Integer.valueOf(this.port.getText().trim());
}
- catch (Exception ex)
+ catch (Exception ignored)
{
- // Ignore
+ return -1;
}
- return port;
}
/**
@@ -407,9 +400,7 @@
addBottomGlue(gbc);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Component getPreferredFocusComponent()
{
@@ -417,23 +408,16 @@
{
return pwd;
}
- else
- {
- return combo;
- }
+ return combo;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void toBeDisplayed(boolean visible)
{
@@ -485,9 +469,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void okClicked()
{
@@ -540,7 +522,7 @@
try
{
int p = Integer.parseInt(port.getText());
- if ((p <= 0) || (p > 65535))
+ if (p <= 0 || p > 65535)
{
errors.add(INFO_INVALID_REMOTE_SERVER_PORT.get(0, 65535));
}
@@ -560,9 +542,7 @@
BackgroundTask<InitialLdapContext> worker =
new BackgroundTask<InitialLdapContext>()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public InitialLdapContext processBackgroundTask() throws Throwable
{
@@ -639,15 +619,12 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void backgroundTaskCompleted(InitialLdapContext ctx,
Throwable throwable)
{
boolean handleCertificateException = false;
-
boolean localServerErrorConnecting = false;
if (throwable != null)
@@ -658,7 +635,7 @@
{
errors.add(((OpenDsException)throwable).getMessageObject());
}
- else if (Utils.isCertificateException(throwable))
+ else if (isCertificateException(throwable))
{
ApplicationTrustManager.Cause cause =
getInfo().getTrustManager().getLastRefusedCause();
@@ -739,7 +716,7 @@
hostName.getText().trim(),
new Integer(port.getText().trim()));
NamingException ne = (NamingException)throwable;
- errors.add(Utils.getMessageForException(ne, hostPort));
+ errors.add(getMessageForException(ne, hostPort));
setPrimaryInvalid(portLabel);
}
setPrimaryInvalid(dnLabel);
@@ -820,9 +797,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void cancelClicked()
{
@@ -852,7 +827,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);
@@ -997,16 +972,13 @@
msg = ERR_NOT_SAME_PRODUCT_IN_REMOTE_SERVER_NOT_FOUND.get(hostName,
productName, DynamicConstants.PRODUCT_NAME);
}
- else
+ else if (!String.valueOf(DynamicConstants.MAJOR_VERSION).equals(major)
+ || !String.valueOf(DynamicConstants.MINOR_VERSION).equals(minor)
+ || !String.valueOf(DynamicConstants.POINT_VERSION).equals(point))
{
- if (!String.valueOf(DynamicConstants.MAJOR_VERSION).equals(major) ||
- !String.valueOf(DynamicConstants.MINOR_VERSION).equals(minor) ||
- !String.valueOf(DynamicConstants.POINT_VERSION).equals(point))
- {
- msg = ERR_INCOMPATIBLE_VERSION_IN_REMOTE_SERVER.get(hostName,
- major, minor, point, DynamicConstants.MAJOR_VERSION,
- DynamicConstants.MINOR_VERSION, DynamicConstants.POINT_VERSION);
- }
+ msg = ERR_INCOMPATIBLE_VERSION_IN_REMOTE_SERVER.get(hostName,
+ major, minor, point, DynamicConstants.MAJOR_VERSION,
+ DynamicConstants.MINOR_VERSION, DynamicConstants.POINT_VERSION);
}
}
catch (Throwable t)
--
Gitblit v1.10.0