From f45aad28ca76ce859bfae6aa9cff650b9a34b85e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 15:41:31 +0000
Subject: [PATCH] Used StaticUtils.close().
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 34ab47d..1af49b1 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
@@ -42,9 +42,6 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
@@ -59,6 +56,8 @@
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
@@ -321,6 +320,7 @@
ActionListener actionListener = new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ev)
{
updateComponentState();
@@ -424,6 +424,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
}
@@ -569,6 +570,7 @@
// At least load the local information.
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
displayMessage(
@@ -615,6 +617,7 @@
}
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
displayMessage(
@@ -629,16 +632,7 @@
return ctx;
} catch (Throwable t)
{
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t1)
- {
- }
- }
+ StaticUtils.close(ctx);
throw t;
}
}
@@ -863,6 +857,7 @@
/* Simulate a click on the OK by calling in the okClicked method. */
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
okClicked();
@@ -931,6 +926,7 @@
// sleep the pooling period before calling it.
Thread t = new Thread(new Runnable()
{
+ @Override
public void run()
{
try
--
Gitblit v1.10.0